Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/0.2.1 #33

Merged
merged 5 commits into from
Feb 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions docs/DEVELOPMENT-PROCESS.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,15 @@
## Creating a new release

1. Create a release branch `release/0.1.4` and push the branch to the origin
2. Update the java packages using `mvn -DnewVersion=0.1.4 -DgenerateBackupPoms=false versions:set`
3. Commit the changed pom.xml files in an `E Update versions` commit.
2. Update the java packages using `mvn -DgenerateBackupPoms=false versions:set -DnewVersion=0.1.4`
3. Commit the changed pom.xml files in an `E Update versions` commit.
4. Update the package versions using `npm run prepare-release` and choose version `0.1.4`
5. Wait for the Github Action [Create release and publish](https://github.com/quatico-solutions/magellan/actions/workflows/release-and-publish.yml) to finish.
6. Merge the release back into develop.
7. Prepare Java for the next release: `mvn -DnewVersion=0.1.1-SNAPSHOT -DgenerateBackupPoms=false versions:set` and commit as `E Start next release`
7. Prepare Java for the next release: `mvn -DgenerateBackupPoms=false versions:set -DnewVersion=0.1.5-SNAPSHOT` and commit as `E Start next release`

## FAQ

### 1. Problems updating the maven version

Using `mvn -U -B verify`, you can identify a large variety of possible problems.
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"npmClient": "yarn",
"useWorkspaces": true,
"version": "0.2.0"
"version": "0.2.1"
}
8 changes: 4 additions & 4 deletions packages/addons/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@quatico/magellan-addons",
"version": "0.2.0",
"version": "0.2.1",
"description": "A example library for the websmith compiler",
"author": "Quatico Solutions AG",
"license": "SEE LICENSE IN LICENSE",
Expand Down Expand Up @@ -54,9 +54,9 @@
"ts-jest": "^29.0.3"
},
"dependencies": {
"@quatico/magellan-client": "^0.2.0",
"@quatico/magellan-server": "^0.2.0",
"@quatico/websmith-api": "0.3.4",
"@quatico/magellan-client": "^0.2.1",
"@quatico/magellan-server": "^0.2.1",
"@quatico/websmith-api": "0.3.5",
"typescript": "4.7.x"
},
"engines": {
Expand Down
12 changes: 6 additions & 6 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@quatico/magellan-cli",
"description": "CLI for the Magellan project",
"version": "0.2.0",
"version": "0.2.1",
"author": "Quatico Solutions AG",
"license": "SEE LICENSE IN LICENSE",
"main": "lib/index.js",
Expand Down Expand Up @@ -41,11 +41,11 @@
"publish-npm": "npm publish --access public"
},
"dependencies": {
"@quatico/magellan-client": "^0.2.0",
"@quatico/magellan-server": "^0.2.0",
"@quatico/websmith-api": "0.3.4",
"@quatico/websmith-compiler": "0.3.4",
"@quatico/websmith-core": "0.3.4",
"@quatico/magellan-client": "^0.2.1",
"@quatico/magellan-server": "^0.2.1",
"@quatico/websmith-api": "0.3.5",
"@quatico/websmith-compiler": "0.3.5",
"@quatico/websmith-core": "0.3.5",
"commander": "^9.4.1",
"minimist": "1.2.7",
"ts-node": "^10.9.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/client/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@quatico/magellan-client",
"description": "Client library for proxies generated with @quatico/websmith-compiler",
"version": "0.2.0",
"version": "0.2.1",
"author": "Quatico Solutions AG",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down Expand Up @@ -34,7 +34,7 @@
"publish-npm": "npm publish --access public"
},
"dependencies": {
"@quatico/magellan-shared": "^0.2.0"
"@quatico/magellan-shared": "^0.2.1"
},
"devDependencies": {
"@swc/core": "^1.3.16",
Expand Down
4 changes: 2 additions & 2 deletions packages/java/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@quatico/magellan-java",
"description": "",
"version": "0.2.0",
"version": "0.2.1",
"keywords": [
"typescript",
"java",
Expand All @@ -27,6 +27,6 @@
"install": "mvn dependency:tree"
},
"devDependencies": {
"@quatico/magellan-shared": "^0.2.0"
"@quatico/magellan-shared": "^0.2.1"
}
}
4 changes: 2 additions & 2 deletions packages/java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<parent>
<groupId>com.quatico.magellan</groupId>
<artifactId>magellan-oss-ci-root</artifactId>
<version>0.2.1-SNAPSHOT</version>
<version>0.2.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<groupId>com.quatico.magellan</groupId>
<artifactId>java</artifactId>
<version>0.2.1-SNAPSHOT</version>
<version>0.2.2-SNAPSHOT</version>
<name>${project.organization.name} :: Magellan OSS Java Dependencies</name>
<description>The magellan core project</description>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion packages/java/serialization/.flattened-pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.quatico.magellan</groupId>
<artifactId>serialization</artifactId>
<version>0.1.5-SNAPSHOT</version>
<version>0.2.2-SNAPSHOT</version>
<name>Quatico Solutions AG :: Magellan Serialization</name>
<description>Magellan Serialization Module representing the Java Counterpart confirming to the same JSON input/output as the Magellan TypeScript packages.</description>
<url>https://github.com/quatico-solutions/magellan/packages/java/serialization</url>
Expand Down
4 changes: 2 additions & 2 deletions packages/java/serialization/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<parent>
<groupId>com.quatico.magellan</groupId>
<artifactId>java</artifactId>
<version>0.2.1-SNAPSHOT</version>
<version>0.2.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<version>0.2.1-SNAPSHOT</version>
<version>0.2.2-SNAPSHOT</version>
<packaging>jar</packaging>
<groupId>com.quatico.magellan</groupId>
<artifactId>serialization</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions packages/server/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@quatico/magellan-server",
"description": "Middleware for remote service execution with the @quatico/websmith-compiler",
"version": "0.2.0",
"version": "0.2.1",
"author": "Quatico Solutions AG",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down Expand Up @@ -35,7 +35,7 @@
"publish-npm": "npm publish --access public"
},
"dependencies": {
"@quatico/magellan-shared": "^0.2.0",
"@quatico/magellan-shared": "^0.2.1",
"ajv": "8.9.0",
"cookie-parser": "1.4.x",
"cors": "2.8.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@quatico/magellan-shared",
"description": "Shared functionality for server/client communication",
"version": "0.2.0",
"version": "0.2.1",
"author": "Quatico Solutions AG",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down
10 changes: 5 additions & 5 deletions packages/test/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@quatico/magellan-test",
"description": "End to end tests for magellan suite",
"version": "0.2.0",
"version": "0.2.1",
"author": "Quatico Solutions AG",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand All @@ -28,10 +28,10 @@
},
"devDependencies": {
"@cucumber/cucumber": "^8.7.0",
"@quatico/magellan-cli": "^0.2.0",
"@quatico/magellan-client": "^0.2.0",
"@quatico/magellan-server": "^0.2.0",
"@quatico/magellan-shared": "^0.2.0",
"@quatico/magellan-cli": "^0.2.1",
"@quatico/magellan-client": "^0.2.1",
"@quatico/magellan-server": "^0.2.1",
"@quatico/magellan-shared": "^0.2.1",
"@types/node": "^16.0.0",
"@typescript-eslint/eslint-plugin": "^5.42.1",
"@typescript-eslint/parser": "^5.42.1",
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.quatico.magellan</groupId>
<artifactId>magellan-oss-ci-root</artifactId>
<version>0.2.1-SNAPSHOT</version>
<version>0.2.2-SNAPSHOT</version>
<name>${project.organization.name} :: Magellan OSS CI root</name>
<description>Maven pipeline root module</description>
<url>https://github.com/quatico-solutions/magellan</url>
Expand Down
29 changes: 15 additions & 14 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1766,31 +1766,32 @@
dependencies:
esquery "^1.0.1"

"@quatico/[email protected].4", "@quatico/websmith-api@^0.3.4":
version "0.3.4"
resolved "https://registry.npmjs.org/@quatico/websmith-api/-/websmith-api-0.3.4.tgz#1037ae0cccb4df8cc8881c2ef7e4ec9b4df43189"
integrity sha512-v/iqWpnQywHRxdVQ058XtanrwhWjWntuJsS69AEuLQPdvzX/ND7nd/YCCqkiDsm3Z65sh19AYWFuURawlBm72A==
"@quatico/[email protected].5", "@quatico/websmith-api@^0.3.5":
version "0.3.5"
resolved "https://registry.npmjs.org/@quatico/websmith-api/-/websmith-api-0.3.5.tgz#a54f5fc86ff5c65a482125c850a53d6c17b450e9"
integrity sha512-CF5h6+ImN5Yu7kwowXG+iFfEHbIep+H0Y/UOCJy44fssojJVsRm3L8YAWz12sIC3XQrRH6EhxRLkRg2VcLuCJA==
dependencies:
typescript "~4.6.4"

"@quatico/[email protected].4":
version "0.3.4"
resolved "https://registry.npmjs.org/@quatico/websmith-compiler/-/websmith-compiler-0.3.4.tgz#0eb2c448fbdc64ba9fc17358b9691f0f06d7ef5e"
integrity sha512-95fT5SzIzUnOqU5BvWGQu4BP/GBPgdxTha8IPyuAt5J/qhzGvHefAiGUp9j0QpfP/UdZQdJVAt3CVKgKvZqg4g==
"@quatico/[email protected].5":
version "0.3.5"
resolved "https://registry.npmjs.org/@quatico/websmith-compiler/-/websmith-compiler-0.3.5.tgz#b3494713ee23f42ee0ae27e0278c65ed2e6c8c41"
integrity sha512-jg5pVtkMBwoO9dZvQLul/T2zovQqzGunnfKUuXXjaq/iz+I5ALiXdfpvdFzl9qAy9ui51Tc62gXT22g+Sl/Gng==
dependencies:
"@quatico/websmith-api" "^0.3.4"
"@quatico/websmith-api" "^0.3.5"
"@quatico/websmith-core" "^0.3.5"
commander "^9.4.1"
minimist "^1.2.6"
ts-node "^10.9.1"
tslib "2.4.1"
typescript "~4.6.4"

"@quatico/[email protected].4", "@quatico/websmith-core@^0.3.4":
version "0.3.4"
resolved "https://registry.npmjs.org/@quatico/websmith-core/-/websmith-core-0.3.4.tgz#a730de346512428f76f3a085edf4212e870c5bd8"
integrity sha512-yaP6pNI445Fsko9Pt8d+epxGMpdRgir9JSnq1qMUOA6Uk5L+gPoDFjJyuPTkO/j7V+l73k2JcLj2oPQsameXBQ==
"@quatico/[email protected].5", "@quatico/websmith-core@^0.3.5":
version "0.3.5"
resolved "https://registry.npmjs.org/@quatico/websmith-core/-/websmith-core-0.3.5.tgz#99fb6682e375f0e19bc64679278dff86ad0a1324"
integrity sha512-KKA+ItijuBWWgKGDWoesqUlNF3dJQmnrhiq8X/bmnTVonvGgrMZxNgp4oeoW7ryQNcFuFVJIBPtSTudkH9FXIQ==
dependencies:
"@quatico/websmith-api" "^0.3.4"
"@quatico/websmith-api" "^0.3.5"
create-hash "1.2.0"
lodash "^4.17.21"
path "0.12.7"
Expand Down