From 6355d3877cb10222385eea62fefe93b4a5a44d61 Mon Sep 17 00:00:00 2001 From: fvandaalen <12496349+fvandaalen@users.noreply.github.com> Date: Mon, 13 Feb 2023 13:45:11 +0100 Subject: [PATCH 01/21] Create buildMavenProject.yml --- workflows/buildMavenProject.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 workflows/buildMavenProject.yml diff --git a/workflows/buildMavenProject.yml b/workflows/buildMavenProject.yml new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/workflows/buildMavenProject.yml @@ -0,0 +1 @@ + From bf49989d24b138b51bac47bcf98ce6486985678c Mon Sep 17 00:00:00 2001 From: fvandaalen <12496349+fvandaalen@users.noreply.github.com> Date: Mon, 13 Feb 2023 13:46:13 +0100 Subject: [PATCH 02/21] Update buildMavenProject.yml --- workflows/buildMavenProject.yml | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/workflows/buildMavenProject.yml b/workflows/buildMavenProject.yml index 8b13789..a0aac78 100644 --- a/workflows/buildMavenProject.yml +++ b/workflows/buildMavenProject.yml @@ -1 +1,22 @@ - +name: Publish package to the Maven Central Repository +on: + release: + types: [created] +jobs: + publish: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Set up Maven Central Repository + uses: actions/setup-java@v3 + with: + java-version: '11' + distribution: 'adopt' + server-id: ossrh + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD + - name: Publish package + run: mvn --batch-mode deploy + env: + MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} From 5d1907f0734b691ab51379d13f44fbfd7a17a4b3 Mon Sep 17 00:00:00 2001 From: fvandaalen <12496349+fvandaalen@users.noreply.github.com> Date: Mon, 13 Feb 2023 13:48:56 +0100 Subject: [PATCH 03/21] Create buildMavenProject.yml --- .github/workflows/buildMavenProject.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/buildMavenProject.yml diff --git a/.github/workflows/buildMavenProject.yml b/.github/workflows/buildMavenProject.yml new file mode 100644 index 0000000..a0aac78 --- /dev/null +++ b/.github/workflows/buildMavenProject.yml @@ -0,0 +1,22 @@ +name: Publish package to the Maven Central Repository +on: + release: + types: [created] +jobs: + publish: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Set up Maven Central Repository + uses: actions/setup-java@v3 + with: + java-version: '11' + distribution: 'adopt' + server-id: ossrh + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD + - name: Publish package + run: mvn --batch-mode deploy + env: + MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} From a5ba09aab57ee21bd1a27e906d1c4c39174e1199 Mon Sep 17 00:00:00 2001 From: fvandaalen <12496349+fvandaalen@users.noreply.github.com> Date: Mon, 13 Feb 2023 13:50:55 +0100 Subject: [PATCH 04/21] Update pom.xml --- java/pom.xml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/java/pom.xml b/java/pom.xml index 965725d..d5f7daf 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -199,5 +199,12 @@ - - \ No newline at end of file + + + + ossrh + Central Repository OSSRH + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + From 23c45f161f851572b2a09f7e9cba04e6ae97c478 Mon Sep 17 00:00:00 2001 From: fvandaalen <12496349+fvandaalen@users.noreply.github.com> Date: Mon, 13 Feb 2023 13:55:55 +0100 Subject: [PATCH 05/21] Update pom.xml --- java/pom.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/java/pom.xml b/java/pom.xml index d5f7daf..dc6dc85 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -13,7 +13,13 @@ spring-boot-starter-parent 2.5.6 - + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + 15 15 From 24ca80d481bb2fdc989a15d36dd950066bb10a1c Mon Sep 17 00:00:00 2001 From: fvandaalen <12496349+fvandaalen@users.noreply.github.com> Date: Mon, 13 Feb 2023 13:57:04 +0100 Subject: [PATCH 06/21] Update pom.xml --- java/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/java/pom.xml b/java/pom.xml index dc6dc85..a1760ee 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -206,11 +206,11 @@ - + - ossrh - Central Repository OSSRH - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + github + GitHub Packages + https://maven.pkg.github.com/octocat/hello-world From 3975372a2a6fdb67bfca2fd78917a3163088370b Mon Sep 17 00:00:00 2001 From: fvandaalen <12496349+fvandaalen@users.noreply.github.com> Date: Mon, 13 Feb 2023 13:59:02 +0100 Subject: [PATCH 07/21] Update buildMavenProject.yml --- .github/workflows/buildMavenProject.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/buildMavenProject.yml b/.github/workflows/buildMavenProject.yml index a0aac78..2b51dda 100644 --- a/.github/workflows/buildMavenProject.yml +++ b/.github/workflows/buildMavenProject.yml @@ -1,22 +1,20 @@ -name: Publish package to the Maven Central Repository +name: Publish package to GitHub Packages on: release: types: [created] jobs: publish: runs-on: ubuntu-latest + permissions: + contents: read + packages: write steps: - uses: actions/checkout@v3 - - name: Set up Maven Central Repository - uses: actions/setup-java@v3 + - uses: actions/setup-java@v3 with: java-version: '11' distribution: 'adopt' - server-id: ossrh - server-username: MAVEN_USERNAME - server-password: MAVEN_PASSWORD - name: Publish package run: mvn --batch-mode deploy env: - MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 0ab734834abae7f83440e4e04b8afecf311d5ac7 Mon Sep 17 00:00:00 2001 From: fvandaalen <12496349+fvandaalen@users.noreply.github.com> Date: Mon, 13 Feb 2023 14:06:42 +0100 Subject: [PATCH 08/21] Update buildMavenProject.yml --- .github/workflows/buildMavenProject.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/buildMavenProject.yml b/.github/workflows/buildMavenProject.yml index 2b51dda..bdaf161 100644 --- a/.github/workflows/buildMavenProject.yml +++ b/.github/workflows/buildMavenProject.yml @@ -15,6 +15,7 @@ jobs: java-version: '11' distribution: 'adopt' - name: Publish package + working-directory: ./java run: mvn --batch-mode deploy env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 0a5211b3b139494a9b97eff70a770ba2f204abd3 Mon Sep 17 00:00:00 2001 From: fvandaalen <12496349+fvandaalen@users.noreply.github.com> Date: Mon, 13 Feb 2023 14:16:48 +0100 Subject: [PATCH 09/21] Update buildMavenProject.yml --- .github/workflows/buildMavenProject.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buildMavenProject.yml b/.github/workflows/buildMavenProject.yml index bdaf161..9cd6b83 100644 --- a/.github/workflows/buildMavenProject.yml +++ b/.github/workflows/buildMavenProject.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '15' distribution: 'adopt' - name: Publish package working-directory: ./java From 071df5edeafbd6e951a4117b4020d9797a8ded84 Mon Sep 17 00:00:00 2001 From: fvandaalen <12496349+fvandaalen@users.noreply.github.com> Date: Mon, 13 Feb 2023 14:22:23 +0100 Subject: [PATCH 10/21] Update buildMavenProject.yml --- .github/workflows/buildMavenProject.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/buildMavenProject.yml b/.github/workflows/buildMavenProject.yml index 9cd6b83..e9c1068 100644 --- a/.github/workflows/buildMavenProject.yml +++ b/.github/workflows/buildMavenProject.yml @@ -14,6 +14,9 @@ jobs: with: java-version: '15' distribution: 'adopt' + - name: version + working-directory: ./java + run: mvn -v - name: Publish package working-directory: ./java run: mvn --batch-mode deploy From 2e9dc5296c8d0ca3aed4836d03c37f7bd1027069 Mon Sep 17 00:00:00 2001 From: fvandaalen <12496349+fvandaalen@users.noreply.github.com> Date: Mon, 13 Feb 2023 14:26:53 +0100 Subject: [PATCH 11/21] Update buildMavenProject.yml --- .github/workflows/buildMavenProject.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buildMavenProject.yml b/.github/workflows/buildMavenProject.yml index e9c1068..d613da1 100644 --- a/.github/workflows/buildMavenProject.yml +++ b/.github/workflows/buildMavenProject.yml @@ -10,7 +10,7 @@ jobs: packages: write steps: - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v3.10.0 with: java-version: '15' distribution: 'adopt' From 905446dfd6eb481cbc269fbaa25463ec84e55f5f Mon Sep 17 00:00:00 2001 From: fvandaalen <12496349+fvandaalen@users.noreply.github.com> Date: Mon, 13 Feb 2023 14:28:26 +0100 Subject: [PATCH 12/21] Update buildMavenProject.yml --- .github/workflows/buildMavenProject.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/buildMavenProject.yml b/.github/workflows/buildMavenProject.yml index d613da1..b05bfd6 100644 --- a/.github/workflows/buildMavenProject.yml +++ b/.github/workflows/buildMavenProject.yml @@ -14,9 +14,6 @@ jobs: with: java-version: '15' distribution: 'adopt' - - name: version - working-directory: ./java - run: mvn -v - name: Publish package working-directory: ./java run: mvn --batch-mode deploy From edba2fc55b6c56c68ec8746b8ce5d5b8bd08f66f Mon Sep 17 00:00:00 2001 From: fvandaalen <12496349+fvandaalen@users.noreply.github.com> Date: Mon, 13 Feb 2023 14:38:26 +0100 Subject: [PATCH 13/21] Update buildMavenProject.yml --- .github/workflows/buildMavenProject.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/buildMavenProject.yml b/.github/workflows/buildMavenProject.yml index b05bfd6..ca978eb 100644 --- a/.github/workflows/buildMavenProject.yml +++ b/.github/workflows/buildMavenProject.yml @@ -2,6 +2,9 @@ name: Publish package to GitHub Packages on: release: types: [created] +defaults: + run: + working-directory: java jobs: publish: runs-on: ubuntu-latest @@ -15,7 +18,6 @@ jobs: java-version: '15' distribution: 'adopt' - name: Publish package - working-directory: ./java run: mvn --batch-mode deploy env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 0f93e7a166389dda7dc8e95c948c882d9be9449c Mon Sep 17 00:00:00 2001 From: fvandaalen <12496349+fvandaalen@users.noreply.github.com> Date: Mon, 13 Feb 2023 14:41:21 +0100 Subject: [PATCH 14/21] Update buildMavenProject.yml --- .github/workflows/buildMavenProject.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/buildMavenProject.yml b/.github/workflows/buildMavenProject.yml index ca978eb..37e2a9b 100644 --- a/.github/workflows/buildMavenProject.yml +++ b/.github/workflows/buildMavenProject.yml @@ -13,9 +13,9 @@ jobs: packages: write steps: - uses: actions/checkout@v3 - - uses: actions/setup-java@v3.10.0 + - uses: actions/setup-java@v3 with: - java-version: '15' + java-version: '17' distribution: 'adopt' - name: Publish package run: mvn --batch-mode deploy From 894e8482cd4204f691ed29f5ea7557ce6592077a Mon Sep 17 00:00:00 2001 From: Florian Date: Mon, 13 Feb 2023 14:46:10 +0100 Subject: [PATCH 15/21] workflow --- .github/workflows/buildMavenProject.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/buildMavenProject.yml b/.github/workflows/buildMavenProject.yml index 37e2a9b..4d5316c 100644 --- a/.github/workflows/buildMavenProject.yml +++ b/.github/workflows/buildMavenProject.yml @@ -1,7 +1,6 @@ name: Publish package to GitHub Packages on: - release: - types: [created] + push: defaults: run: working-directory: java @@ -15,7 +14,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: - java-version: '17' + java-version: '15' distribution: 'adopt' - name: Publish package run: mvn --batch-mode deploy From b8c2b46af2815ec2abe018eb146336fc2d5b6661 Mon Sep 17 00:00:00 2001 From: Florian Date: Mon, 13 Feb 2023 14:50:50 +0100 Subject: [PATCH 16/21] corrected pom --- java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/pom.xml b/java/pom.xml index a1760ee..1951741 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -210,7 +210,7 @@ github GitHub Packages - https://maven.pkg.github.com/octocat/hello-world + https://maven.pkg.github.com/ From dd52a350c439dddb4075c54db9cead4dfe5d7fca Mon Sep 17 00:00:00 2001 From: Florian Date: Mon, 13 Feb 2023 15:09:52 +0100 Subject: [PATCH 17/21] github packages --- java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/pom.xml b/java/pom.xml index 1951741..3c11d94 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -210,7 +210,7 @@ github GitHub Packages - https://maven.pkg.github.com/ + https://maven.pkg.github.com/n-scalar-product-protocol From a57739640bc68adabc84bd7eb17558e4b486942c Mon Sep 17 00:00:00 2001 From: Florian Date: Mon, 13 Feb 2023 15:14:01 +0100 Subject: [PATCH 18/21] correcting pom --- java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/pom.xml b/java/pom.xml index 3c11d94..95b5651 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -210,7 +210,7 @@ github GitHub Packages - https://maven.pkg.github.com/n-scalar-product-protocol + https://maven.pkg.github.com/com/florian/n-scalar-product-protocol From 7b8d5a014a11bc60ed1ca8ce79632839d781cef6 Mon Sep 17 00:00:00 2001 From: Florian Date: Mon, 13 Feb 2023 15:19:33 +0100 Subject: [PATCH 19/21] pom fix --- java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/pom.xml b/java/pom.xml index 95b5651..ebdbf0a 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -210,7 +210,7 @@ github GitHub Packages - https://maven.pkg.github.com/com/florian/n-scalar-product-protocol + https://maven.pkg.github.com/florian/n-scalar-product-protocol From dc75cf6509921d4ab87f6039b56ff794e3aecf80 Mon Sep 17 00:00:00 2001 From: Florian Date: Mon, 13 Feb 2023 15:32:25 +0100 Subject: [PATCH 20/21] correcting pom --- java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/pom.xml b/java/pom.xml index ebdbf0a..a83cb2c 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -210,7 +210,7 @@ github GitHub Packages - https://maven.pkg.github.com/florian/n-scalar-product-protocol + https://maven.pkg.github.com/MaastrichtU-CDS/n-scalar-product-protocol From b0ec1fb672d3d3415de150bdfb2fd0a1d173b7a6 Mon Sep 17 00:00:00 2001 From: Florian Date: Mon, 13 Feb 2023 15:42:22 +0100 Subject: [PATCH 21/21] updated workflow --- .github/workflows/buildMavenProject.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/buildMavenProject.yml b/.github/workflows/buildMavenProject.yml index 4d5316c..1a5f592 100644 --- a/.github/workflows/buildMavenProject.yml +++ b/.github/workflows/buildMavenProject.yml @@ -1,6 +1,7 @@ name: Publish package to GitHub Packages on: - push: + release: + types: [created] defaults: run: working-directory: java