From cd85c2f8a262ba2bb8145f226e28a0bfe45050b3 Mon Sep 17 00:00:00 2001 From: Yordan Pavlov Date: Fri, 15 Dec 2023 14:23:42 +0200 Subject: [PATCH] Revert "[CI/CD] Release - Adds maven-gpg-plugin (#4)" (#5) --- .github/workflows/release-maven.yml | 28 ------- .../{release-github.yml => release.yml} | 8 +- .../annotation-processor-api/pom.xml | 6 +- .../annotation-processor-core/pom.xml | 14 ++-- .../annotation-processor-ref/pom.xml | 14 ++-- .../annotation-processor-web/pom.xml | 8 +- odata2-annotation-processor/pom.xml | 6 +- odata2-dist/janos/pom.xml | 14 ++-- odata2-dist/javadoc/pom.xml | 4 +- odata2-dist/jpa/pom.xml | 14 ++-- odata2-dist/lib/pom.xml | 10 +-- odata2-dist/pom.xml | 4 +- odata2-dist/ref/pom.xml | 20 ++--- odata2-jpa-processor/jpa-api/pom.xml | 6 +- odata2-jpa-processor/jpa-core/pom.xml | 12 +-- odata2-jpa-processor/jpa-ref/pom.xml | 8 +- odata2-jpa-processor/jpa-web/pom.xml | 14 ++-- odata2-jpa-processor/pom.xml | 6 +- odata2-lib/odata-annotation/pom.xml | 4 +- odata2-lib/odata-api/pom.xml | 4 +- odata2-lib/odata-client-api/pom.xml | 6 +- odata2-lib/odata-client-core/pom.xml | 10 +-- odata2-lib/odata-core/pom.xml | 10 +-- odata2-lib/odata-fit/pom.xml | 16 ++-- odata2-lib/odata-ref/pom.xml | 10 +-- odata2-lib/odata-testutil/pom.xml | 8 +- odata2-lib/odata-web/pom.xml | 8 +- odata2-lib/pom.xml | 6 +- .../cars-annotation-archetype/pom.xml | 8 +- .../resources/archetype-resources/pom.xml | 10 +-- odata2-sample/cars-jpa-archetype/pom.xml | 4 +- .../resources/archetype-resources/pom.xml | 10 +-- odata2-sample/cars-service-archetype/pom.xml | 8 +- .../resources/archetype-resources/pom.xml | 2 +- odata2-sample/pom.xml | 4 +- odata2-spring/pom.xml | 4 +- pom.xml | 76 ++++--------------- 37 files changed, 164 insertions(+), 240 deletions(-) delete mode 100644 .github/workflows/release-maven.yml rename .github/workflows/{release-github.yml => release.yml} (95%) diff --git a/.github/workflows/release-maven.yml b/.github/workflows/release-maven.yml deleted file mode 100644 index 537c1b43b..000000000 --- a/.github/workflows/release-maven.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: Release - Maven - -on: - workflow_dispatch: - inputs: - release-version: - description: Release Version - required: true - default: 3.1.1 - snapshot-version: - description: Snapshot Version - required: true - default: 4.0.0-SNAPSHOT - -run-name: 'version set to ${{ inputs.release-version }} for release' - -jobs: - main: - uses: codbex/codbex-infra/.github/workflows/platform-release.yaml@main - with: - platform-name: olingo-odata2 - release-version: ${{ inputs.release-version }} - snapshot-version: ${{ inputs.snapshot-version }} - maven-release: true - docker-release: false - release-content: | - ## olingo-odata2 - ${{ inputs.release-version }} - secrets: inherit diff --git a/.github/workflows/release-github.yml b/.github/workflows/release.yml similarity index 95% rename from .github/workflows/release-github.yml rename to .github/workflows/release.yml index 8cc24a4bd..c579644c2 100644 --- a/.github/workflows/release-github.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,4 @@ -name: Release GitHub +name: Release on: workflow_dispatch: @@ -6,11 +6,11 @@ on: releaseVersion: description: Release Version required: true - default: 3.1.1 + default: 3.0.0 snapshotVersion: description: Snapshot Version required: true - default: 3.1.2-SNAPSHOT + default: 3.0.1-SNAPSHOT run-name: 'version set to ${{ github.event.inputs.releaseVersion }} for release' @@ -67,7 +67,7 @@ jobs: run: mvn deploy env: GITHUB_USERNAME: x-access-token - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }} BUILD_ENV: 'github-actions' - name: "Git: Commit Release Version" diff --git a/odata2-annotation-processor/annotation-processor-api/pom.xml b/odata2-annotation-processor/annotation-processor-api/pom.xml index 967669b77..35d54917f 100644 --- a/odata2-annotation-processor/annotation-processor-api/pom.xml +++ b/odata2-annotation-processor/annotation-processor-api/pom.xml @@ -23,9 +23,9 @@ 4.0.0 - com.codbex.olingo + org.apache.olingo olingo-odata2-annotation-processor - 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT .. @@ -76,7 +76,7 @@ - com.codbex.olingo + org.apache.olingo olingo-odata2-api ${project.version} diff --git a/odata2-annotation-processor/annotation-processor-core/pom.xml b/odata2-annotation-processor/annotation-processor-core/pom.xml index e43b112cc..7361ba348 100644 --- a/odata2-annotation-processor/annotation-processor-core/pom.xml +++ b/odata2-annotation-processor/annotation-processor-core/pom.xml @@ -18,9 +18,9 @@ ${project.artifactId} - com.codbex.olingo + org.apache.olingo olingo-odata2-annotation-processor - 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT .. @@ -66,29 +66,29 @@ - com.codbex.olingo + org.apache.olingo olingo-odata2-annotation-processor-api ${project.version} - com.codbex.olingo + org.apache.olingo olingo-odata2-api-annotation ${project.version} - com.codbex.olingo + org.apache.olingo olingo-odata2-api ${project.version} - com.codbex.olingo + org.apache.olingo olingo-odata2-core ${project.version} test - com.codbex.olingo + org.apache.olingo olingo-odata2-testutil ${project.version} test diff --git a/odata2-annotation-processor/annotation-processor-ref/pom.xml b/odata2-annotation-processor/annotation-processor-ref/pom.xml index 957178df0..827c66123 100644 --- a/odata2-annotation-processor/annotation-processor-ref/pom.xml +++ b/odata2-annotation-processor/annotation-processor-ref/pom.xml @@ -18,9 +18,9 @@ ${project.artifactId} - com.codbex.olingo + org.apache.olingo olingo-odata2-annotation-processor - 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT .. @@ -68,22 +68,22 @@ - com.codbex.olingo + org.apache.olingo olingo-odata2-api ${project.version} - com.codbex.olingo + org.apache.olingo olingo-odata2-core ${project.version} - com.codbex.olingo + org.apache.olingo olingo-odata2-annotation-processor-api ${project.version} - com.codbex.olingo + org.apache.olingo olingo-odata2-annotation-processor-core ${project.version} @@ -93,7 +93,7 @@ - com.codbex.olingo + org.apache.olingo olingo-odata2-testutil ${project.version} test diff --git a/odata2-annotation-processor/annotation-processor-web/pom.xml b/odata2-annotation-processor/annotation-processor-web/pom.xml index 829a4d1e0..6b7facb0a 100644 --- a/odata2-annotation-processor/annotation-processor-web/pom.xml +++ b/odata2-annotation-processor/annotation-processor-web/pom.xml @@ -18,9 +18,9 @@ ${project.artifactId} - com.codbex.olingo + org.apache.olingo olingo-odata2-annotation-processor - 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT .. @@ -63,12 +63,12 @@ ${cxf.version} - com.codbex.olingo + org.apache.olingo olingo-odata2-annotation-processor-ref ${project.version} - com.codbex.olingo + org.apache.olingo olingo-odata2-core ${project.version} diff --git a/odata2-annotation-processor/pom.xml b/odata2-annotation-processor/pom.xml index 8beba3af3..d2c75df6f 100644 --- a/odata2-annotation-processor/pom.xml +++ b/odata2-annotation-processor/pom.xml @@ -10,15 +10,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.codbex.olingo + org.apache.olingo olingo-odata2-annotation-processor pom ${project.artifactId} - com.codbex.olingo + org.apache.olingo olingo-odata2-parent - 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT .. diff --git a/odata2-dist/janos/pom.xml b/odata2-dist/janos/pom.xml index 9a8dece3d..fdf0758c6 100644 --- a/odata2-dist/janos/pom.xml +++ b/odata2-dist/janos/pom.xml @@ -15,9 +15,9 @@ ${project.artifactId} - com.codbex.olingo + org.apache.olingo olingo-odata2-dist - 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT .. @@ -70,31 +70,31 @@ - com.codbex.olingo + org.apache.olingo olingo-odata2-api-annotation ${project.version} compile - com.codbex.olingo + org.apache.olingo olingo-odata2-api ${project.version} compile - com.codbex.olingo + org.apache.olingo olingo-odata2-core ${project.version} compile - com.codbex.olingo + org.apache.olingo olingo-odata2-annotation-processor-api ${project.version} compile - com.codbex.olingo + org.apache.olingo olingo-odata2-annotation-processor-core ${project.version} compile diff --git a/odata2-dist/javadoc/pom.xml b/odata2-dist/javadoc/pom.xml index bfdb97406..90659ae99 100644 --- a/odata2-dist/javadoc/pom.xml +++ b/odata2-dist/javadoc/pom.xml @@ -15,9 +15,9 @@ ${project.artifactId} - com.codbex.olingo + org.apache.olingo olingo-odata2-dist - 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT .. diff --git a/odata2-dist/jpa/pom.xml b/odata2-dist/jpa/pom.xml index 1c1e35504..5c09d7d55 100644 --- a/odata2-dist/jpa/pom.xml +++ b/odata2-dist/jpa/pom.xml @@ -15,9 +15,9 @@ ${project.artifactId} - com.codbex.olingo + org.apache.olingo olingo-odata2-dist - 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT .. @@ -70,31 +70,31 @@ - com.codbex.olingo + org.apache.olingo olingo-odata2-api-annotation ${project.version} compile - com.codbex.olingo + org.apache.olingo olingo-odata2-api ${project.version} compile - com.codbex.olingo + org.apache.olingo olingo-odata2-core ${project.version} compile - com.codbex.olingo + org.apache.olingo olingo-odata2-jpa-processor-api ${project.version} compile - com.codbex.olingo + org.apache.olingo olingo-odata2-jpa-processor-core ${project.version} compile diff --git a/odata2-dist/lib/pom.xml b/odata2-dist/lib/pom.xml index bb0595e50..78a6410c6 100644 --- a/odata2-dist/lib/pom.xml +++ b/odata2-dist/lib/pom.xml @@ -15,9 +15,9 @@ ${project.artifactId} - com.codbex.olingo + org.apache.olingo olingo-odata2-dist - 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT .. @@ -70,19 +70,19 @@ - com.codbex.olingo + org.apache.olingo olingo-odata2-api-annotation ${project.version} compile - com.codbex.olingo + org.apache.olingo olingo-odata2-api ${project.version} compile - com.codbex.olingo + org.apache.olingo olingo-odata2-core ${project.version} compile diff --git a/odata2-dist/pom.xml b/odata2-dist/pom.xml index fdacd9194..a0ddde17c 100644 --- a/odata2-dist/pom.xml +++ b/odata2-dist/pom.xml @@ -15,9 +15,9 @@ ${project.artifactId} - com.codbex.olingo + org.apache.olingo olingo-odata2-parent - 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT .. diff --git a/odata2-dist/ref/pom.xml b/odata2-dist/ref/pom.xml index de9bfcbec..1258702ef 100644 --- a/odata2-dist/ref/pom.xml +++ b/odata2-dist/ref/pom.xml @@ -15,9 +15,9 @@ ${project.artifactId} - com.codbex.olingo + org.apache.olingo olingo-odata2-dist - 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT .. @@ -75,42 +75,42 @@ ${cxf.version} - com.codbex.olingo + org.apache.olingo olingo-odata2-core ${project.version} - com.codbex.olingo + org.apache.olingo olingo-odata2-api ${project.version} - com.codbex.olingo + org.apache.olingo olingo-odata2-jpa-processor-api ${project.version} - com.codbex.olingo + org.apache.olingo olingo-odata2-jpa-processor-core ${project.version} - com.codbex.olingo + org.apache.olingo olingo-odata2-jpa-processor-ref ${project.version} - com.codbex.olingo + org.apache.olingo olingo-odata2-annotation-processor-api ${project.version} - com.codbex.olingo + org.apache.olingo olingo-odata2-annotation-processor-core ${project.version} - com.codbex.olingo + org.apache.olingo olingo-odata2-annotation-processor-ref ${project.version} diff --git a/odata2-jpa-processor/jpa-api/pom.xml b/odata2-jpa-processor/jpa-api/pom.xml index a2c6b692b..1524cc877 100644 --- a/odata2-jpa-processor/jpa-api/pom.xml +++ b/odata2-jpa-processor/jpa-api/pom.xml @@ -23,9 +23,9 @@ 4.0.0 - com.codbex.olingo + org.apache.olingo olingo-odata2-jpa-processor - 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT ../ @@ -88,7 +88,7 @@ - com.codbex.olingo + org.apache.olingo olingo-odata2-api ${project.version} diff --git a/odata2-jpa-processor/jpa-core/pom.xml b/odata2-jpa-processor/jpa-core/pom.xml index 4e6132fe5..d183bf56e 100644 --- a/odata2-jpa-processor/jpa-core/pom.xml +++ b/odata2-jpa-processor/jpa-core/pom.xml @@ -22,9 +22,9 @@ 4.0.0 - com.codbex.olingo + org.apache.olingo olingo-odata2-jpa-processor - 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT ../ @@ -78,7 +78,7 @@ - com.codbex.olingo + org.apache.olingo olingo-odata2-api-annotation ${project.version} @@ -95,12 +95,12 @@ - com.codbex.olingo + org.apache.olingo olingo-odata2-api ${project.version} - com.codbex.olingo + org.apache.olingo olingo-odata2-core ${project.version} @@ -109,7 +109,7 @@ - com.codbex.olingo + org.apache.olingo olingo-odata2-jpa-processor-api ${project.version} diff --git a/odata2-jpa-processor/jpa-ref/pom.xml b/odata2-jpa-processor/jpa-ref/pom.xml index eb08710d4..c5bc3cee3 100644 --- a/odata2-jpa-processor/jpa-ref/pom.xml +++ b/odata2-jpa-processor/jpa-ref/pom.xml @@ -15,9 +15,9 @@ 4.0.0 - com.codbex.olingo + org.apache.olingo olingo-odata2-jpa-processor - 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT .. @@ -83,14 +83,14 @@ - com.codbex.olingo + org.apache.olingo olingo-odata2-api-annotation ${project.version} - com.codbex.olingo + org.apache.olingo olingo-odata2-jpa-processor-api ${project.version} diff --git a/odata2-jpa-processor/jpa-web/pom.xml b/odata2-jpa-processor/jpa-web/pom.xml index 508250db9..7796f2975 100644 --- a/odata2-jpa-processor/jpa-web/pom.xml +++ b/odata2-jpa-processor/jpa-web/pom.xml @@ -19,9 +19,9 @@ ${project.artifactId} - com.codbex.olingo + org.apache.olingo olingo-odata2-jpa-processor - 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT .. @@ -72,27 +72,27 @@ ${cxf.version} - com.codbex.olingo + org.apache.olingo olingo-odata2-core ${project.version} - com.codbex.olingo + org.apache.olingo olingo-odata2-api ${project.version} - com.codbex.olingo + org.apache.olingo olingo-odata2-jpa-processor-api ${project.version} - com.codbex.olingo + org.apache.olingo olingo-odata2-jpa-processor-core ${project.version} - com.codbex.olingo + org.apache.olingo olingo-odata2-jpa-processor-ref ${project.version} diff --git a/odata2-jpa-processor/pom.xml b/odata2-jpa-processor/pom.xml index fe2a6e7c9..645d01f05 100644 --- a/odata2-jpa-processor/pom.xml +++ b/odata2-jpa-processor/pom.xml @@ -10,15 +10,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.codbex.olingo + org.apache.olingo olingo-odata2-jpa-processor pom ${project.artifactId} - com.codbex.olingo + org.apache.olingo olingo-odata2-parent - 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT .. diff --git a/odata2-lib/odata-annotation/pom.xml b/odata2-lib/odata-annotation/pom.xml index c90e9beec..e23d3e826 100644 --- a/odata2-lib/odata-annotation/pom.xml +++ b/odata2-lib/odata-annotation/pom.xml @@ -15,9 +15,9 @@ 4.0.0 - com.codbex.olingo + org.apache.olingo olingo-odata2-lib - 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT .. diff --git a/odata2-lib/odata-api/pom.xml b/odata2-lib/odata-api/pom.xml index 99f681c69..7d507fa0a 100644 --- a/odata2-lib/odata-api/pom.xml +++ b/odata2-lib/odata-api/pom.xml @@ -26,9 +26,9 @@ ${project.artifactId} - com.codbex.olingo + org.apache.olingo olingo-odata2-lib - 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT .. diff --git a/odata2-lib/odata-client-api/pom.xml b/odata2-lib/odata-client-api/pom.xml index f7cd8e608..f235d02df 100644 --- a/odata2-lib/odata-client-api/pom.xml +++ b/odata2-lib/odata-client-api/pom.xml @@ -11,9 +11,9 @@ 4.0.0 - com.codbex.olingo + org.apache.olingo olingo-odata2-lib - 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT .. olingo-odata2-client-api @@ -27,7 +27,7 @@ - com.codbex.olingo + org.apache.olingo olingo-odata2-api ${project.version} diff --git a/odata2-lib/odata-client-core/pom.xml b/odata2-lib/odata-client-core/pom.xml index 181eeff41..9761446ce 100644 --- a/odata2-lib/odata-client-core/pom.xml +++ b/odata2-lib/odata-client-core/pom.xml @@ -11,9 +11,9 @@ 4.0.0 - com.codbex.olingo + org.apache.olingo olingo-odata2-lib - 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT .. @@ -28,17 +28,17 @@ junit - com.codbex.olingo + org.apache.olingo olingo-odata2-client-api ${project.version} - com.codbex.olingo + org.apache.olingo olingo-odata2-core ${project.version} - com.codbex.olingo + org.apache.olingo olingo-odata2-testutil ${project.version} test diff --git a/odata2-lib/odata-core/pom.xml b/odata2-lib/odata-core/pom.xml index 4df470559..baf9563b3 100644 --- a/odata2-lib/odata-core/pom.xml +++ b/odata2-lib/odata-core/pom.xml @@ -27,9 +27,9 @@ ${project.artifactId} - com.codbex.olingo + org.apache.olingo olingo-odata2-lib - 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT .. @@ -117,7 +117,7 @@ - com.codbex.olingo + org.apache.olingo org.apache.olingo.odata2.api ${project.version} @@ -176,7 +176,7 @@ - com.codbex.olingo + org.apache.olingo olingo-odata2-api ${project.version} @@ -191,7 +191,7 @@ - com.codbex.olingo + org.apache.olingo olingo-odata2-testutil ${project.version} test diff --git a/odata2-lib/odata-fit/pom.xml b/odata2-lib/odata-fit/pom.xml index 848933ccf..3e270dd95 100644 --- a/odata2-lib/odata-fit/pom.xml +++ b/odata2-lib/odata-fit/pom.xml @@ -27,9 +27,9 @@ ${project.artifactId} - com.codbex.olingo + org.apache.olingo olingo-odata2-lib - 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT .. @@ -83,7 +83,7 @@ - com.codbex.olingo + org.apache.olingo olingo-odata2-api ${project.version} @@ -102,7 +102,7 @@ - com.codbex.olingo + org.apache.olingo olingo-odata2-core ${project.version} @@ -121,7 +121,7 @@ - com.codbex.olingo + org.apache.olingo olingo-odata2-ref ${project.version} @@ -195,17 +195,17 @@ - com.codbex.olingo + org.apache.olingo olingo-odata2-core ${project.version} - com.codbex.olingo + org.apache.olingo olingo-odata2-ref ${project.version} - com.codbex.olingo + org.apache.olingo olingo-odata2-testutil ${project.version} test diff --git a/odata2-lib/odata-ref/pom.xml b/odata2-lib/odata-ref/pom.xml index bce5629b7..ee0a4ffd5 100644 --- a/odata2-lib/odata-ref/pom.xml +++ b/odata2-lib/odata-ref/pom.xml @@ -26,9 +26,9 @@ ${project.artifactId} - com.codbex.olingo + org.apache.olingo olingo-odata2-lib - 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT .. @@ -75,7 +75,7 @@ - com.codbex.olingo + org.apache.olingo olingo-odata2-api ${project.version} @@ -85,13 +85,13 @@ - com.codbex.olingo + org.apache.olingo olingo-odata2-core ${project.version} test - com.codbex.olingo + org.apache.olingo olingo-odata2-testutil ${project.version} test diff --git a/odata2-lib/odata-testutil/pom.xml b/odata2-lib/odata-testutil/pom.xml index 6ec198a33..f8bcb5255 100644 --- a/odata2-lib/odata-testutil/pom.xml +++ b/odata2-lib/odata-testutil/pom.xml @@ -18,9 +18,9 @@ ${project.artifactId} - com.codbex.olingo + org.apache.olingo olingo-odata2-lib - 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT .. @@ -52,12 +52,12 @@ - com.codbex.olingo + org.apache.olingo olingo-odata2-api ${project.version} - com.codbex.olingo + org.apache.olingo olingo-odata2-api-annotation ${project.version} diff --git a/odata2-lib/odata-web/pom.xml b/odata2-lib/odata-web/pom.xml index 4cab6842a..8714b9de8 100644 --- a/odata2-lib/odata-web/pom.xml +++ b/odata2-lib/odata-web/pom.xml @@ -15,9 +15,9 @@ ${project.artifactId} - com.codbex.olingo + org.apache.olingo olingo-odata2-lib - 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT .. @@ -53,12 +53,12 @@ ${cxf.version} - com.codbex.olingo + org.apache.olingo olingo-odata2-ref ${project.version} - com.codbex.olingo + org.apache.olingo olingo-odata2-core ${project.version} diff --git a/odata2-lib/pom.xml b/odata2-lib/pom.xml index 04c7f18bc..6ffc6a26a 100644 --- a/odata2-lib/pom.xml +++ b/odata2-lib/pom.xml @@ -10,15 +10,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.codbex.olingo + org.apache.olingo olingo-odata2-lib pom ${project.artifactId} - com.codbex.olingo + org.apache.olingo olingo-odata2-parent - 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT .. diff --git a/odata2-sample/cars-annotation-archetype/pom.xml b/odata2-sample/cars-annotation-archetype/pom.xml index f6b6c906e..1f41f584d 100644 --- a/odata2-sample/cars-annotation-archetype/pom.xml +++ b/odata2-sample/cars-annotation-archetype/pom.xml @@ -13,16 +13,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.codbex.olingo + org.apache.olingo olingo-odata2-sample-cars-annotation-archetype ${project.artifactId} - 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT maven-archetype - com.codbex.olingo + org.apache.olingo olingo-odata2-sample - 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT .. diff --git a/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml b/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml index d210036bc..919d43efd 100644 --- a/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml +++ b/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml @@ -93,29 +93,29 @@ - com.codbex.olingo + org.apache.olingo olingo-odata2-api ${version.olingo} olingo-odata2-api-annotation - com.codbex.olingo + org.apache.olingo jar ${version.olingo} - com.codbex.olingo + org.apache.olingo olingo-odata2-core ${version.olingo} - com.codbex.olingo + org.apache.olingo olingo-odata2-annotation-processor-api ${version.olingo} - com.codbex.olingo + org.apache.olingo olingo-odata2-annotation-processor-core ${version.olingo} diff --git a/odata2-sample/cars-jpa-archetype/pom.xml b/odata2-sample/cars-jpa-archetype/pom.xml index bc6beb737..f2f488aa8 100644 --- a/odata2-sample/cars-jpa-archetype/pom.xml +++ b/odata2-sample/cars-jpa-archetype/pom.xml @@ -21,9 +21,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.codbex.olingo + org.apache.olingo olingo-odata2-sample - 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT .. diff --git a/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/pom.xml b/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/pom.xml index da268c160..3eb3b8cda 100644 --- a/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/pom.xml +++ b/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/pom.xml @@ -29,31 +29,31 @@ - com.codbex.olingo + org.apache.olingo olingo-odata2-api-annotation ${version.olingo} - com.codbex.olingo + org.apache.olingo olingo-odata2-api ${version.olingo} - com.codbex.olingo + org.apache.olingo olingo-odata2-core ${version.olingo} - com.codbex.olingo + org.apache.olingo olingo-odata2-jpa-processor-api ${version.olingo} - com.codbex.olingo + org.apache.olingo olingo-odata2-jpa-processor-core ${version.olingo} diff --git a/odata2-sample/cars-service-archetype/pom.xml b/odata2-sample/cars-service-archetype/pom.xml index aa6389955..be574b124 100644 --- a/odata2-sample/cars-service-archetype/pom.xml +++ b/odata2-sample/cars-service-archetype/pom.xml @@ -21,17 +21,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.codbex.olingo + org.apache.olingo olingo-odata2-sample-cars-service-archetype ${project.artifactId} - 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT maven-archetype - com.codbex.olingo + org.apache.olingo olingo-odata2-sample - 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT .. diff --git a/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml b/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml index e64c64fdc..7320df85a 100644 --- a/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml +++ b/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml @@ -71,7 +71,7 @@ - com.codbex.olingo + org.apache.olingo olingo-odata2-core ${version.olingo} diff --git a/odata2-sample/pom.xml b/odata2-sample/pom.xml index 0b7eaf5fc..2c1685341 100644 --- a/odata2-sample/pom.xml +++ b/odata2-sample/pom.xml @@ -13,9 +13,9 @@ ${project.artifactId} - com.codbex.olingo + org.apache.olingo olingo-odata2-parent - 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT .. diff --git a/odata2-spring/pom.xml b/odata2-spring/pom.xml index f376e65b7..4ce105fa5 100755 --- a/odata2-spring/pom.xml +++ b/odata2-spring/pom.xml @@ -16,9 +16,9 @@ ${project.artifactId} - com.codbex.olingo + org.apache.olingo olingo-odata2-parent - 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index 30ccf5d4f..60abfe42d 100644 --- a/pom.xml +++ b/pom.xml @@ -17,9 +17,9 @@ governing permissions and limitations under xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.codbex.olingo + org.apache.olingo olingo-odata2-parent - 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT pom ${project.artifactId} @@ -390,7 +390,7 @@ governing permissions and limitations under - release + apache-release @@ -416,13 +416,8 @@ governing permissions and limitations under org.apache.olingo.odata2.core:org.apache.olingo.odata2.core.*:org.apache.olingo.odata2.jpa.processor.core:org.apache.olingo.odata2.jpa.processor.core.*:org.apache.olingo.odata2.annotation.processor.core:org.apache.olingo.odata2.annotation.processor.core.*:org.apache.olingo.odata2.testutil:org.apache.olingo.odata2.testutil.* - -Xdoclint:none - -Xdoclint:none -quiet - -Xdoclint:none - -Xdoclint:all - -Xdoclint:-missing @@ -461,58 +456,18 @@ governing permissions and limitations under - - org.apache.maven.plugins - maven-gpg-plugin - 3.1.0 - - - sign-artifacts - verify - - sign - - - - - --pinentry-mode - loopback - - - - - - - mvnrepository - https://repo1.maven.org/maven2 - - false - - - true - - - - - - - sonatype-public-repository - https://s01.oss.sonatype.org/content/groups/public - - false - - - true - - - + + oss.sonatype.org + OSS Sonatype Staging + https://oss.sonatype.org/content/groups/staging + + @@ -562,13 +517,10 @@ governing permissions and limitations under - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2 - + + github + GitHub Apache Maven Packages + https://maven.pkg.github.com/dirigiblelabs/olingo-odata2 +