From e7a881f51512a8eb1601121290109ba6f0e99209 Mon Sep 17 00:00:00 2001 From: Gang Li Date: Wed, 6 Sep 2023 20:46:13 +0800 Subject: [PATCH 01/13] Add github actions --- .github/workflows/merge-build.yml | 60 +++++++++++++++++++++++++++++++ .github/workflows/pr-build.yml | 44 +++++++++++++++++++++++ 2 files changed, 104 insertions(+) create mode 100644 .github/workflows/merge-build.yml create mode 100644 .github/workflows/pr-build.yml diff --git a/.github/workflows/merge-build.yml b/.github/workflows/merge-build.yml new file mode 100644 index 0000000..da5b4bf --- /dev/null +++ b/.github/workflows/merge-build.yml @@ -0,0 +1,60 @@ +# +# Copyright (C) 2020 Red Hat, Inc. (nos-devel@redhat.com) +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This workflow will build a Java project with Maven +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven + +name: Merge / Push Build + +on: [push] + +jobs: + publish-snapshot: + + runs-on: ubuntu-latest + + permissions: + contents: read + packages: write + + steps: + - uses: actions/checkout@v2 + + - name: Set up JDK + uses: actions/setup-java@v2 + with: + java-version: '11' + distribution: 'adopt' + # server-id: sonatype + # server-username: SONATYPE_BOT_USERNAME + # server-password: SONATYPE_BOT_TOKEN + + - name: maven-settings-xml-action + uses: whelk-io/maven-settings-xml-action@v14 + if: ${{ github.event.repository.fork == false }} + with: + repositories: '[{ "id": "sonatype", "url": "https://oss.sonatype.org/content/repositories/snapshots/", "releases": {"enabled": "false"}, "snapshots": {"enabled": "true" }}]' + servers: '[{ "id": "sonatype", "username": "${{ secrets.SONATYPE_BOT_USERNAME}}", "password": "${{ secrets.SONATYPE_BOT_TOKEN}}" }]' + + - name: "Maven Build & Deploy Snapshot to Sonatype OSSRH" + if: ${{ github.event.repository.fork == false }} + + run: mvn -B -e deploy -DaltDeploymentRepository=sonatype::default::https://oss.sonatype.org/content/repositories/snapshots/ + + - name: "Maven Build" + if: ${{ github.event.repository.fork == true }} + + run: mvn -B -e verify diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml new file mode 100644 index 0000000..917351a --- /dev/null +++ b/.github/workflows/pr-build.yml @@ -0,0 +1,44 @@ +# +# Copyright (C) 2020 Red Hat, Inc. (nos-devel@redhat.com) +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This workflow will build a Java project with Maven +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven + +name: PR Build + +on: [pull_request] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Set up JDK + uses: actions/setup-java@v2 + with: + java-version: '11' + distribution: 'adopt' + + - name: maven-settings-xml-action + uses: whelk-io/maven-settings-xml-action@v14 + with: + repositories: '[{ "id": "sonatype", "url": "https://oss.sonatype.org/content/repositories/snapshots/", "releases": {"enabled": "false"}, "snapshots": {"enabled": "true" }}]' + + - name: Build with Maven + run: mvn -B -e verify From d37a0368110a2175066b35b33d41bb8648ccb50f Mon Sep 17 00:00:00 2001 From: Gang Li Date: Wed, 6 Sep 2023 20:58:51 +0800 Subject: [PATCH 02/13] Update license header --- .github/workflows/merge-build.yml | 2 +- .github/workflows/pr-build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge-build.yml b/.github/workflows/merge-build.yml index da5b4bf..77f1fe3 100644 --- a/.github/workflows/merge-build.yml +++ b/.github/workflows/merge-build.yml @@ -1,5 +1,5 @@ # -# Copyright (C) 2020 Red Hat, Inc. (nos-devel@redhat.com) +# Copyright (C) 2023 Red Hat, Inc. (https://github.com/Commonjava/indy-client) # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index 917351a..84e30bb 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -1,5 +1,5 @@ # -# Copyright (C) 2020 Red Hat, Inc. (nos-devel@redhat.com) +# Copyright (C) 2023 Red Hat, Inc. (https://github.com/Commonjava/indy-client) # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. From 1644672f29d7188962ed2add9d3a5a38d5042420 Mon Sep 17 00:00:00 2001 From: Gang Li Date: Sat, 16 Sep 2023 14:40:36 +0800 Subject: [PATCH 03/13] Bump deps versions * httpclient -> 4.5.13 * jackson -> 2.15.2 * logback -> 1.2.12 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index f6882d9..5f26324 100644 --- a/pom.xml +++ b/pom.xml @@ -56,14 +56,14 @@ 1.1.1 1.9.1-SNAPSHOT - 4.5.9 + 4.5.13 1.7.36 2.11.0 1.6.6 1.3.2 - 2.13.3 + 2.15.2 1.4 - 1.2.9 + 1.2.12 From 7b8182b7e3d79f593c7f4054f9cab6d97965f4e3 Mon Sep 17 00:00:00 2001 From: Gang Li Date: Tue, 26 Sep 2023 17:34:31 +0800 Subject: [PATCH 04/13] Update o11yphant to 1.9.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5f26324..7a81899 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ 1.12 1.1.1 - 1.9.1-SNAPSHOT + 1.9.1 4.5.13 1.7.36 2.11.0 @@ -242,4 +242,4 @@ test - \ No newline at end of file + From 41f350c9a3dc5f736edd4d347b3413c68a62c672 Mon Sep 17 00:00:00 2001 From: yma Date: Wed, 18 Oct 2023 16:33:42 +0800 Subject: [PATCH 05/13] Upgrade indy-model to 1.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7a81899..40ca3a5 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ org.commonjava.indy.service indy-model-core-java - 1.3-SNAPSHOT + 1.3 org.commonjava.indy.service From fd271542d0947a041bd70363f5e470b775bd532c Mon Sep 17 00:00:00 2001 From: yma Date: Wed, 18 Oct 2023 16:41:54 +0800 Subject: [PATCH 06/13] Upgrade indy-folo-model-java to 1.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 40ca3a5..2686f2a 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ org.commonjava.indy.service indy-folo-model-java - 1.3-SNAPSHOT + 1.3 org.commonjava.indy From 9bcb3a01600cdfd29e902444f232857b8dc38ddf Mon Sep 17 00:00:00 2001 From: commonjava-bot Date: Wed, 18 Oct 2023 08:48:16 +0000 Subject: [PATCH 07/13] [maven-release-plugin] prepare release indy-clients-parent-3.3.0 --- addons-client/content-browse/client-java/pom.xml | 2 +- addons-client/content-browse/model-java/pom.xml | 2 +- addons-client/content-browse/pom.xml | 6 ++---- addons-client/diagnostics/client-java/pom.xml | 6 ++---- addons-client/diagnostics/pom.xml | 6 ++---- addons-client/folo/client-java/pom.xml | 6 ++---- addons-client/folo/pom.xml | 6 ++---- addons-client/koji/client-java/pom.xml | 6 ++---- addons-client/koji/model-java/pom.xml | 6 ++---- addons-client/koji/pom.xml | 6 ++---- addons-client/pom.xml | 6 ++---- addons-client/promote/client-java/pom.xml | 6 ++---- addons-client/promote/model-java/pom.xml | 6 ++---- addons-client/promote/pom.xml | 6 ++---- core-java/pom.xml | 6 ++---- pom.xml | 16 +++++++--------- 16 files changed, 35 insertions(+), 63 deletions(-) diff --git a/addons-client/content-browse/client-java/pom.xml b/addons-client/content-browse/client-java/pom.xml index 9c93126..9101c13 100644 --- a/addons-client/content-browse/client-java/pom.xml +++ b/addons-client/content-browse/client-java/pom.xml @@ -20,7 +20,7 @@ indy-content-browse-client-parent org.commonjava.indy - 3.3.0-SNAPSHOT + 3.3.0 4.0.0 diff --git a/addons-client/content-browse/model-java/pom.xml b/addons-client/content-browse/model-java/pom.xml index 7c36923..8a5428f 100644 --- a/addons-client/content-browse/model-java/pom.xml +++ b/addons-client/content-browse/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-content-browse-client-parent - 3.3.0-SNAPSHOT + 3.3.0 indy-content-browse-model-java diff --git a/addons-client/content-browse/pom.xml b/addons-client/content-browse/pom.xml index b7feb0c..0157a34 100644 --- a/addons-client/content-browse/pom.xml +++ b/addons-client/content-browse/pom.xml @@ -16,14 +16,12 @@ limitations under the License. --> - + 4.0.0 org.commonjava.indy indy-addons-client - 3.3.0-SNAPSHOT + 3.3.0 indy-content-browse-client-parent diff --git a/addons-client/diagnostics/client-java/pom.xml b/addons-client/diagnostics/client-java/pom.xml index d11bf7e..72744c7 100644 --- a/addons-client/diagnostics/client-java/pom.xml +++ b/addons-client/diagnostics/client-java/pom.xml @@ -16,14 +16,12 @@ limitations under the License. --> - + 4.0.0 org.commonjava.indy indy-diagnostics-client-parent - 3.3.0-SNAPSHOT + 3.3.0 indy-diagnostics-client-java diff --git a/addons-client/diagnostics/pom.xml b/addons-client/diagnostics/pom.xml index fd200d7..37466ee 100644 --- a/addons-client/diagnostics/pom.xml +++ b/addons-client/diagnostics/pom.xml @@ -16,14 +16,12 @@ limitations under the License. --> - + 4.0.0 org.commonjava.indy indy-addons-client - 3.3.0-SNAPSHOT + 3.3.0 indy-diagnostics-client-parent diff --git a/addons-client/folo/client-java/pom.xml b/addons-client/folo/client-java/pom.xml index 7fefc89..9753d23 100644 --- a/addons-client/folo/client-java/pom.xml +++ b/addons-client/folo/client-java/pom.xml @@ -16,13 +16,11 @@ limitations under the License. --> - + indy-folo-client-parent org.commonjava.indy - 3.3.0-SNAPSHOT + 3.3.0 4.0.0 diff --git a/addons-client/folo/pom.xml b/addons-client/folo/pom.xml index a211e3f..38e067b 100644 --- a/addons-client/folo/pom.xml +++ b/addons-client/folo/pom.xml @@ -16,14 +16,12 @@ limitations under the License. --> - + 4.0.0 org.commonjava.indy indy-addons-client - 3.3.0-SNAPSHOT + 3.3.0 indy-folo-client-parent diff --git a/addons-client/koji/client-java/pom.xml b/addons-client/koji/client-java/pom.xml index b914e21..3f1d0aa 100644 --- a/addons-client/koji/client-java/pom.xml +++ b/addons-client/koji/client-java/pom.xml @@ -16,14 +16,12 @@ limitations under the License. --> - + 4.0.0 org.commonjava.indy indy-koji-client-parent - 3.3.0-SNAPSHOT + 3.3.0 indy-koji-client-java Indy :: Add-Ons :: Koji Integration :: Java Client diff --git a/addons-client/koji/model-java/pom.xml b/addons-client/koji/model-java/pom.xml index c260f4d..6cb7f7e 100644 --- a/addons-client/koji/model-java/pom.xml +++ b/addons-client/koji/model-java/pom.xml @@ -16,14 +16,12 @@ limitations under the License. --> - + 4.0.0 org.commonjava.indy indy-koji-client-parent - 3.3.0-SNAPSHOT + 3.3.0 indy-koji-model-java Indy :: Add-Ons :: Koji Integration :: Java Domain Model diff --git a/addons-client/koji/pom.xml b/addons-client/koji/pom.xml index 963f9d9..89bca6c 100644 --- a/addons-client/koji/pom.xml +++ b/addons-client/koji/pom.xml @@ -16,14 +16,12 @@ limitations under the License. --> - + 4.0.0 org.commonjava.indy indy-addons-client - 3.3.0-SNAPSHOT + 3.3.0 indy-koji-client-parent diff --git a/addons-client/pom.xml b/addons-client/pom.xml index 8eca3e9..f86eb54 100644 --- a/addons-client/pom.xml +++ b/addons-client/pom.xml @@ -16,14 +16,12 @@ limitations under the License. --> - + 4.0.0 org.commonjava.indy indy-clients-parent - 3.3.0-SNAPSHOT + 3.3.0 indy-addons-client diff --git a/addons-client/promote/client-java/pom.xml b/addons-client/promote/client-java/pom.xml index 6cedc3d..127a358 100644 --- a/addons-client/promote/client-java/pom.xml +++ b/addons-client/promote/client-java/pom.xml @@ -16,14 +16,12 @@ limitations under the License. --> - + 4.0.0 org.commonjava.indy indy-promote-client-parent - 3.3.0-SNAPSHOT + 3.3.0 indy-promote-client-java Indy :: Add-Ons :: Artifact Promotion :: Java Client diff --git a/addons-client/promote/model-java/pom.xml b/addons-client/promote/model-java/pom.xml index a22b410..c19ae18 100644 --- a/addons-client/promote/model-java/pom.xml +++ b/addons-client/promote/model-java/pom.xml @@ -16,14 +16,12 @@ limitations under the License. --> - + 4.0.0 org.commonjava.indy indy-promote-client-parent - 3.3.0-SNAPSHOT + 3.3.0 indy-promote-model-java diff --git a/addons-client/promote/pom.xml b/addons-client/promote/pom.xml index 6a412f3..691c64b 100644 --- a/addons-client/promote/pom.xml +++ b/addons-client/promote/pom.xml @@ -16,14 +16,12 @@ limitations under the License. --> - + 4.0.0 org.commonjava.indy indy-addons-client - 3.3.0-SNAPSHOT + 3.3.0 indy-promote-client-parent diff --git a/core-java/pom.xml b/core-java/pom.xml index 2295528..60cbdee 100644 --- a/core-java/pom.xml +++ b/core-java/pom.xml @@ -16,14 +16,12 @@ limitations under the License. --> - + 4.0.0 org.commonjava.indy indy-clients-parent - 3.3.0-SNAPSHOT + 3.3.0 indy-client-core-java diff --git a/pom.xml b/pom.xml index 2686f2a..226a209 100644 --- a/pom.xml +++ b/pom.xml @@ -16,9 +16,7 @@ limitations under the License. --> - + 4.0.0 @@ -30,7 +28,7 @@ org.commonjava.indy indy-clients-parent pom - 3.3.0-SNAPSHOT + 3.3.0 Indy :: Client APIs :: Parent 2023 @@ -44,7 +42,7 @@ scm:git:https://github.com/commonjava/indy-client scm:git:https://github.com/commonjava/indy-client http://github.com/Commonjava/indy-client - HEAD + indy-clients-parent-3.3.0 @@ -81,23 +79,23 @@ org.commonjava.indy indy-promote-model-java - 3.3.0-SNAPSHOT + 3.3.0 org.commonjava.indy indy-koji-model-java - 3.3.0-SNAPSHOT + 3.3.0 org.commonjava.indy indy-content-browse-model-java - 3.3.0-SNAPSHOT + 3.3.0 org.commonjava.indy indy-client-core-java - 3.3.0-SNAPSHOT + 3.3.0 org.commonjava.indy From 3ca8155886e9f2f4b0495f909c241ad5d9703f1c Mon Sep 17 00:00:00 2001 From: commonjava-bot Date: Wed, 18 Oct 2023 08:48:18 +0000 Subject: [PATCH 08/13] [maven-release-plugin] prepare for next development iteration --- addons-client/content-browse/client-java/pom.xml | 2 +- addons-client/content-browse/model-java/pom.xml | 2 +- addons-client/content-browse/pom.xml | 2 +- addons-client/diagnostics/client-java/pom.xml | 2 +- addons-client/diagnostics/pom.xml | 2 +- addons-client/folo/client-java/pom.xml | 2 +- addons-client/folo/pom.xml | 2 +- addons-client/koji/client-java/pom.xml | 2 +- addons-client/koji/model-java/pom.xml | 2 +- addons-client/koji/pom.xml | 2 +- addons-client/pom.xml | 2 +- addons-client/promote/client-java/pom.xml | 2 +- addons-client/promote/model-java/pom.xml | 2 +- addons-client/promote/pom.xml | 2 +- core-java/pom.xml | 2 +- pom.xml | 12 ++++++------ 16 files changed, 21 insertions(+), 21 deletions(-) diff --git a/addons-client/content-browse/client-java/pom.xml b/addons-client/content-browse/client-java/pom.xml index 9101c13..6fe3026 100644 --- a/addons-client/content-browse/client-java/pom.xml +++ b/addons-client/content-browse/client-java/pom.xml @@ -20,7 +20,7 @@ indy-content-browse-client-parent org.commonjava.indy - 3.3.0 + 3.3.1-SNAPSHOT 4.0.0 diff --git a/addons-client/content-browse/model-java/pom.xml b/addons-client/content-browse/model-java/pom.xml index 8a5428f..6d8dd3c 100644 --- a/addons-client/content-browse/model-java/pom.xml +++ b/addons-client/content-browse/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-content-browse-client-parent - 3.3.0 + 3.3.1-SNAPSHOT indy-content-browse-model-java diff --git a/addons-client/content-browse/pom.xml b/addons-client/content-browse/pom.xml index 0157a34..6cc6206 100644 --- a/addons-client/content-browse/pom.xml +++ b/addons-client/content-browse/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons-client - 3.3.0 + 3.3.1-SNAPSHOT indy-content-browse-client-parent diff --git a/addons-client/diagnostics/client-java/pom.xml b/addons-client/diagnostics/client-java/pom.xml index 72744c7..ca4a486 100644 --- a/addons-client/diagnostics/client-java/pom.xml +++ b/addons-client/diagnostics/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics-client-parent - 3.3.0 + 3.3.1-SNAPSHOT indy-diagnostics-client-java diff --git a/addons-client/diagnostics/pom.xml b/addons-client/diagnostics/pom.xml index 37466ee..881301f 100644 --- a/addons-client/diagnostics/pom.xml +++ b/addons-client/diagnostics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons-client - 3.3.0 + 3.3.1-SNAPSHOT indy-diagnostics-client-parent diff --git a/addons-client/folo/client-java/pom.xml b/addons-client/folo/client-java/pom.xml index 9753d23..5d1eb41 100644 --- a/addons-client/folo/client-java/pom.xml +++ b/addons-client/folo/client-java/pom.xml @@ -20,7 +20,7 @@ indy-folo-client-parent org.commonjava.indy - 3.3.0 + 3.3.1-SNAPSHOT 4.0.0 diff --git a/addons-client/folo/pom.xml b/addons-client/folo/pom.xml index 38e067b..45c6c22 100644 --- a/addons-client/folo/pom.xml +++ b/addons-client/folo/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons-client - 3.3.0 + 3.3.1-SNAPSHOT indy-folo-client-parent diff --git a/addons-client/koji/client-java/pom.xml b/addons-client/koji/client-java/pom.xml index 3f1d0aa..2384a0b 100644 --- a/addons-client/koji/client-java/pom.xml +++ b/addons-client/koji/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji-client-parent - 3.3.0 + 3.3.1-SNAPSHOT indy-koji-client-java Indy :: Add-Ons :: Koji Integration :: Java Client diff --git a/addons-client/koji/model-java/pom.xml b/addons-client/koji/model-java/pom.xml index 6cb7f7e..6a6202d 100644 --- a/addons-client/koji/model-java/pom.xml +++ b/addons-client/koji/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji-client-parent - 3.3.0 + 3.3.1-SNAPSHOT indy-koji-model-java Indy :: Add-Ons :: Koji Integration :: Java Domain Model diff --git a/addons-client/koji/pom.xml b/addons-client/koji/pom.xml index 89bca6c..f45986c 100644 --- a/addons-client/koji/pom.xml +++ b/addons-client/koji/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons-client - 3.3.0 + 3.3.1-SNAPSHOT indy-koji-client-parent diff --git a/addons-client/pom.xml b/addons-client/pom.xml index f86eb54..489bc7d 100644 --- a/addons-client/pom.xml +++ b/addons-client/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-clients-parent - 3.3.0 + 3.3.1-SNAPSHOT indy-addons-client diff --git a/addons-client/promote/client-java/pom.xml b/addons-client/promote/client-java/pom.xml index 127a358..e3ad456 100644 --- a/addons-client/promote/client-java/pom.xml +++ b/addons-client/promote/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote-client-parent - 3.3.0 + 3.3.1-SNAPSHOT indy-promote-client-java Indy :: Add-Ons :: Artifact Promotion :: Java Client diff --git a/addons-client/promote/model-java/pom.xml b/addons-client/promote/model-java/pom.xml index c19ae18..ccadbad 100644 --- a/addons-client/promote/model-java/pom.xml +++ b/addons-client/promote/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote-client-parent - 3.3.0 + 3.3.1-SNAPSHOT indy-promote-model-java diff --git a/addons-client/promote/pom.xml b/addons-client/promote/pom.xml index 691c64b..860ba4d 100644 --- a/addons-client/promote/pom.xml +++ b/addons-client/promote/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons-client - 3.3.0 + 3.3.1-SNAPSHOT indy-promote-client-parent diff --git a/core-java/pom.xml b/core-java/pom.xml index 60cbdee..d1652cf 100644 --- a/core-java/pom.xml +++ b/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-clients-parent - 3.3.0 + 3.3.1-SNAPSHOT indy-client-core-java diff --git a/pom.xml b/pom.xml index 226a209..6ce7ebc 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.commonjava.indy indy-clients-parent pom - 3.3.0 + 3.3.1-SNAPSHOT Indy :: Client APIs :: Parent 2023 @@ -42,7 +42,7 @@ scm:git:https://github.com/commonjava/indy-client scm:git:https://github.com/commonjava/indy-client http://github.com/Commonjava/indy-client - indy-clients-parent-3.3.0 + HEAD @@ -79,23 +79,23 @@ org.commonjava.indy indy-promote-model-java - 3.3.0 + 3.3.1-SNAPSHOT org.commonjava.indy indy-koji-model-java - 3.3.0 + 3.3.1-SNAPSHOT org.commonjava.indy indy-content-browse-model-java - 3.3.0 + 3.3.1-SNAPSHOT org.commonjava.indy indy-client-core-java - 3.3.0 + 3.3.1-SNAPSHOT org.commonjava.indy From f93470a06464fc0806fcd567d58bc3b39d01cba8 Mon Sep 17 00:00:00 2001 From: Gang Li Date: Thu, 19 Oct 2023 16:55:20 +0800 Subject: [PATCH 09/13] Some updates * Update indy-model to 1.4-SNAPSHOT for new model usage * Replace content-browse model class usage with indy-model deps * Replace koji model class usage with indy-model deps --- .../content-browse/client-java/pom.xml | 2 +- .../content-browse/model-java/pom.xml | 46 ---- .../browse/model/ContentBrowseResult.java | 191 -------------- addons-client/content-browse/pom.xml | 1 - addons-client/koji/model-java/pom.xml | 45 ---- .../indy/koji/model/IndyKojiConstants.java | 42 --- .../koji/model/KojiMultiRepairResult.java | 36 --- .../indy/koji/model/KojiRepairRequest.java | 76 ------ .../indy/koji/model/KojiRepairResult.java | 239 ------------------ addons-client/koji/pom.xml | 1 - core-java/pom.xml | 9 +- pom.xml | 20 +- 12 files changed, 19 insertions(+), 689 deletions(-) delete mode 100644 addons-client/content-browse/model-java/pom.xml delete mode 100644 addons-client/content-browse/model-java/src/main/java/org/commonjava/indy/content/browse/model/ContentBrowseResult.java delete mode 100644 addons-client/koji/model-java/pom.xml delete mode 100644 addons-client/koji/model-java/src/main/java/org/commonjava/indy/koji/model/IndyKojiConstants.java delete mode 100644 addons-client/koji/model-java/src/main/java/org/commonjava/indy/koji/model/KojiMultiRepairResult.java delete mode 100644 addons-client/koji/model-java/src/main/java/org/commonjava/indy/koji/model/KojiRepairRequest.java delete mode 100644 addons-client/koji/model-java/src/main/java/org/commonjava/indy/koji/model/KojiRepairResult.java diff --git a/addons-client/content-browse/client-java/pom.xml b/addons-client/content-browse/client-java/pom.xml index 6fe3026..ab81fae 100644 --- a/addons-client/content-browse/client-java/pom.xml +++ b/addons-client/content-browse/client-java/pom.xml @@ -33,7 +33,7 @@ indy-client-core-java - org.commonjava.indy + org.commonjava.indy.service indy-content-browse-model-java diff --git a/addons-client/content-browse/model-java/pom.xml b/addons-client/content-browse/model-java/pom.xml deleted file mode 100644 index 6d8dd3c..0000000 --- a/addons-client/content-browse/model-java/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - 4.0.0 - - org.commonjava.indy - indy-content-browse-client-parent - 3.3.1-SNAPSHOT - - - indy-content-browse-model-java - Indy :: Add-Ons :: Directory Content Browse :: Java Domain Model - - - - org.commonjava.indy.service - indy-model-core-java - - - - io.swagger - swagger-annotations - - - commons-io - commons-io - test - - - diff --git a/addons-client/content-browse/model-java/src/main/java/org/commonjava/indy/content/browse/model/ContentBrowseResult.java b/addons-client/content-browse/model-java/src/main/java/org/commonjava/indy/content/browse/model/ContentBrowseResult.java deleted file mode 100644 index 8fcf959..0000000 --- a/addons-client/content-browse/model-java/src/main/java/org/commonjava/indy/content/browse/model/ContentBrowseResult.java +++ /dev/null @@ -1,191 +0,0 @@ -/** - * Copyright (C) 2023 Red Hat, Inc. (https://github.com/Commonjava/indy-client) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.commonjava.indy.content.browse.model; - -import org.commonjava.indy.model.core.StoreKey; - -import java.util.List; -import java.util.Set; - -public class ContentBrowseResult -{ - private StoreKey storeKey; - - private String parentUrl; - - private String parentPath; - - private String path; - - private String storeBrowseUrl; - - private String storeContentUrl; - - private String baseBrowseUrl; - - private String baseContentUrl; - - private List sources; - - private List listingUrls; - - public StoreKey getStoreKey() - { - return storeKey; - } - - public void setStoreKey( StoreKey storeKey ) - { - this.storeKey = storeKey; - } - - public String getParentUrl() - { - return parentUrl; - } - - public void setParentUrl( String parentUrl ) - { - this.parentUrl = parentUrl; - } - - public String getParentPath() - { - return parentPath; - } - - public void setParentPath( String parentPath ) - { - this.parentPath = parentPath; - } - - public String getPath() - { - return path; - } - - public void setPath( String path ) - { - this.path = path; - } - - public String getStoreBrowseUrl() - { - return storeBrowseUrl; - } - - public void setStoreBrowseUrl( String storeBrowseUrl ) - { - this.storeBrowseUrl = storeBrowseUrl; - } - - public String getStoreContentUrl() - { - return storeContentUrl; - } - - public void setStoreContentUrl( String storeContentUrl ) - { - this.storeContentUrl = storeContentUrl; - } - - public String getBaseBrowseUrl() - { - return baseBrowseUrl; - } - - public void setBaseBrowseUrl( String baseBrowseUrl ) - { - this.baseBrowseUrl = baseBrowseUrl; - } - - public String getBaseContentUrl() - { - return baseContentUrl; - } - - public void setBaseContentUrl( String baseContentUrl ) - { - this.baseContentUrl = baseContentUrl; - } - - public List getSources() - { - return sources; - } - - public void setSources( List sources ) - { - this.sources = sources; - } - - public List getListingUrls() - { - return listingUrls; - } - - public void setListingUrls( List listingUrls){ - this.listingUrls = listingUrls; - } - - public static class ListingURLResult - { - private String path; - - private String listingUrl; - - private Set sources; - - public ListingURLResult(){} - - public ListingURLResult( String path, String listingUrl, Set sources ) - { - this.path = path; - this.listingUrl = listingUrl; - this.sources = sources; - } - - public String getPath() - { - return path; - } - - public String getListingUrl() - { - return listingUrl; - } - - public Set getSources() - { - return sources; - } - - public void setPath( String path ) - { - this.path = path; - } - - public void setListingUrl( String listingUrl ) - { - this.listingUrl = listingUrl; - } - - public void setSources( Set sources ) - { - this.sources = sources; - } - } -} diff --git a/addons-client/content-browse/pom.xml b/addons-client/content-browse/pom.xml index 6cc6206..d24b4f9 100644 --- a/addons-client/content-browse/pom.xml +++ b/addons-client/content-browse/pom.xml @@ -30,6 +30,5 @@ client-java - model-java \ No newline at end of file diff --git a/addons-client/koji/model-java/pom.xml b/addons-client/koji/model-java/pom.xml deleted file mode 100644 index 6a6202d..0000000 --- a/addons-client/koji/model-java/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - 4.0.0 - - org.commonjava.indy - indy-koji-client-parent - 3.3.1-SNAPSHOT - - indy-koji-model-java - Indy :: Add-Ons :: Koji Integration :: Java Domain Model - - - - org.commonjava.indy.service - indy-model-core-java - - - io.swagger - swagger-annotations - - - commons-io - commons-io - test - - - - \ No newline at end of file diff --git a/addons-client/koji/model-java/src/main/java/org/commonjava/indy/koji/model/IndyKojiConstants.java b/addons-client/koji/model-java/src/main/java/org/commonjava/indy/koji/model/IndyKojiConstants.java deleted file mode 100644 index ac14369..0000000 --- a/addons-client/koji/model-java/src/main/java/org/commonjava/indy/koji/model/IndyKojiConstants.java +++ /dev/null @@ -1,42 +0,0 @@ -/** - * Copyright (C) 2023 Red Hat, Inc. (https://github.com/Commonjava/indy-client) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.commonjava.indy.koji.model; - -/** - * Created by ruhan on 3/28/18. - */ -public class IndyKojiConstants -{ - public static final String KOJI = "koji"; - - public static final String KOJI_ORIGIN = KOJI; - - public static final String KOJI_ORIGIN_BINARY = "koji-binary"; - - public static final String REPAIR_KOJI = "repair/" + KOJI; - - public static final String VOL = "vol"; - - public static final String REPAIR_KOJI_VOL = REPAIR_KOJI + "/" + VOL; - - public static final String MASK = "mask"; - - public static final String ALL_MASKS = "mask/all"; - - public static final String META_TIMEOUT = "metadata/timeout"; - - public static final String META_TIMEOUT_ALL = META_TIMEOUT + "/all"; -} diff --git a/addons-client/koji/model-java/src/main/java/org/commonjava/indy/koji/model/KojiMultiRepairResult.java b/addons-client/koji/model-java/src/main/java/org/commonjava/indy/koji/model/KojiMultiRepairResult.java deleted file mode 100644 index 7233286..0000000 --- a/addons-client/koji/model-java/src/main/java/org/commonjava/indy/koji/model/KojiMultiRepairResult.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * Copyright (C) 2023 Red Hat, Inc. (https://github.com/Commonjava/indy-client) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.commonjava.indy.koji.model; - -import io.swagger.annotations.ApiModelProperty; - -import java.util.List; - -public class KojiMultiRepairResult -{ - @ApiModelProperty( "Results for all stores where repair was attempted, including failures" ) - private List results; - - public List getResults() - { - return results; - } - - public void setResults( final List results ) - { - this.results = results; - } -} diff --git a/addons-client/koji/model-java/src/main/java/org/commonjava/indy/koji/model/KojiRepairRequest.java b/addons-client/koji/model-java/src/main/java/org/commonjava/indy/koji/model/KojiRepairRequest.java deleted file mode 100644 index ef392bc..0000000 --- a/addons-client/koji/model-java/src/main/java/org/commonjava/indy/koji/model/KojiRepairRequest.java +++ /dev/null @@ -1,76 +0,0 @@ -/** - * Copyright (C) 2023 Red Hat, Inc. (https://github.com/Commonjava/indy-client) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.commonjava.indy.koji.model; - -import io.swagger.annotations.ApiModelProperty; -import org.commonjava.indy.model.core.StoreKey; - -/** - * Request to repair Koji remote stores. If source is a group, all repositories in the group are to be repaired. - * - * @author ruhan - * - */ -public class KojiRepairRequest -{ - @ApiModelProperty( value = "Koji repository key to repair (formatted as: '{maven}:{remote,group}:name')", required = true ) - private StoreKey source; - - @ApiModelProperty( value = "Repair arguments" ) - private String args; - - @ApiModelProperty( value = "Get repair report ONLY, not modify anything." ) - private boolean dryRun; - - public KojiRepairRequest() {} - - public KojiRepairRequest( final StoreKey source, boolean dryRun ) - { - this.source = source; - this.dryRun = dryRun; - } - - public StoreKey getSource() - { - return source; - } - - public void setSource( final StoreKey source ) - { - this.source = source; - } - - public String getArgs() - { - return args; - } - - public void setArgs( String args ) - { - this.args = args; - } - - public boolean isDryRun() - { - return dryRun; - } - - public void setDryRun( final boolean dryRun ) - { - this.dryRun = dryRun; - } - -} diff --git a/addons-client/koji/model-java/src/main/java/org/commonjava/indy/koji/model/KojiRepairResult.java b/addons-client/koji/model-java/src/main/java/org/commonjava/indy/koji/model/KojiRepairResult.java deleted file mode 100644 index bb9ba8f..0000000 --- a/addons-client/koji/model-java/src/main/java/org/commonjava/indy/koji/model/KojiRepairResult.java +++ /dev/null @@ -1,239 +0,0 @@ -/** - * Copyright (C) 2023 Red Hat, Inc. (https://github.com/Commonjava/indy-client) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.commonjava.indy.koji.model; - -import io.swagger.annotations.ApiModelProperty; -import org.commonjava.indy.model.core.StoreKey; - -import java.util.ArrayList; -import java.util.List; - -/** - * Contains the result of a repair attempt. If it is a success, the error will be null. - * - * @author ruhan - * - */ -public class KojiRepairResult -{ - @ApiModelProperty( "Original request" ) - private KojiRepairRequest request; - - @ApiModelProperty( "Error message if failed" ) - private String error; - - @ApiModelProperty( "Exception object if failed because of exception" ) - private Exception exception; - - @ApiModelProperty( "Result entries if succeeded" ) - private List results; - - public KojiRepairResult() {} - - public KojiRepairResult( KojiRepairRequest request ) - { - this.request = request; - this.results = new ArrayList<>(); - } - - public KojiRepairResult withError( String error ) - { - this.error = error; - this.results.clear(); - return this; - } - - public KojiRepairResult withError( String error, Exception e ) - { - this.exception = e; - return withError( error ); - } - - public KojiRepairResult withNoChange( StoreKey storeKey ) - { - results.add( new RepairResult( storeKey ) ); - return this; - } - - public KojiRepairResult withIgnore( StoreKey storeKey ) - { - RepairResult result = new RepairResult( storeKey ); - result.setIgnored( true ); - results.add( result ); - return this; - } - - public KojiRepairResult withResult( RepairResult result ) - { - results.add( result ); - return this; - } - - public boolean succeeded() - { - return error == null; - } - - public String getError() - { - return error; - } - - public KojiRepairRequest getRequest() - { - return request; - } - - public List getResults() - { - return results; - } - - public Exception getException() - { - return exception; - } - - /** - * Repair result object of one store - */ - public static class RepairResult - { - private StoreKey storeKey; - - private List changes; - - private boolean ignored; - - private Exception exception; - - public RepairResult() {} - - public RepairResult( StoreKey storeKey ) - { - this.storeKey = storeKey; - this.changes = new ArrayList<>(); - } - - public RepairResult( StoreKey storeKey, Exception e ) - { - this( storeKey ); - this.exception = e; - } - - public StoreKey getStoreKey() - { - return storeKey; - } - - public List getChanges() - { - return changes; - } - - public boolean isIgnored() - { - return ignored; - } - - public void setIgnored( boolean ignored ) - { - this.ignored = ignored; - } - - public void withPropertyChange( String name, Object originalValue, Object value ) - { - changes.add( new PropertyChange( name, originalValue, value ) ); - } - - public boolean isChanged() - { - return changes != null && !changes.isEmpty(); - } - - public Exception getException() - { - return exception; - } - - @Override - public String toString() - { - return "RepairResult{" + "storeKey=" + storeKey + ", changes=" + changes + ", ignored=" + ignored - + ", exception=" + exception + '}'; - } - } - - public static class PropertyChange - { - private String name; - - private Object originalValue; - - private Object value; - - public PropertyChange() {} - - public PropertyChange( String name ) - { - this.name = name; - } - - public PropertyChange( String name, Object originalValue, Object value ) - { - this.name = name; - this.originalValue = originalValue; - this.value = value; - } - - public String getName() - { - return name; - } - - public boolean isChanged() - { - return (originalValue == null && value != null) || !originalValue.equals( value ); - } - - public Object getOriginalValue() - { - return originalValue; - } - - public void setOriginalValue( Object originalValue ) - { - this.originalValue = originalValue; - } - - public Object getValue() - { - return value; - } - - public void setValue( Object value ) - { - this.value = value; - } - - @Override - public String toString() - { - return "PropertyChange{" + "name='" + name + '\'' + ", originalValue=" + originalValue + ", value=" + value - + '}'; - } - } -} diff --git a/addons-client/koji/pom.xml b/addons-client/koji/pom.xml index f45986c..f19b4f9 100644 --- a/addons-client/koji/pom.xml +++ b/addons-client/koji/pom.xml @@ -30,7 +30,6 @@ client-java - model-java \ No newline at end of file diff --git a/core-java/pom.xml b/core-java/pom.xml index d1652cf..10fbcd5 100644 --- a/core-java/pom.xml +++ b/core-java/pom.xml @@ -32,10 +32,6 @@ org.commonjava.indy.service indy-model-core-java - - org.commonjava.indy - indy-test-fixtures-core - org.commonjava.util jhttpc @@ -68,6 +64,11 @@ commons-io commons-io + + org.commonjava.indy + indy-test-fixtures-core + test + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 6ce7ebc..38817ca 100644 --- a/pom.xml +++ b/pom.xml @@ -53,6 +53,7 @@ 1.12 1.1.1 + 1.4-SNAPSHOT 1.9.1 4.5.13 1.7.36 @@ -69,12 +70,22 @@ org.commonjava.indy.service indy-model-core-java - 1.3 + ${indyModelVersion} org.commonjava.indy.service indy-folo-model-java - 1.3 + ${indyModelVersion} + + + org.commonjava.indy.service + indy-koji-model-java + ${indyModelVersion} + + + org.commonjava.indy.service + indy-content-browse-model-java + ${indyModelVersion} org.commonjava.indy @@ -87,11 +98,6 @@ 3.3.1-SNAPSHOT - - org.commonjava.indy - indy-content-browse-model-java - 3.3.1-SNAPSHOT - org.commonjava.indy indy-client-core-java From 35131c38fa6ecb0596df5a17fe5665a5b1615edf Mon Sep 17 00:00:00 2001 From: Gang Li Date: Thu, 19 Oct 2023 21:47:55 +0800 Subject: [PATCH 10/13] Fix wrong koji-model-java deps --- addons-client/koji/client-java/pom.xml | 2 +- pom.xml | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/addons-client/koji/client-java/pom.xml b/addons-client/koji/client-java/pom.xml index 2384a0b..d53317f 100644 --- a/addons-client/koji/client-java/pom.xml +++ b/addons-client/koji/client-java/pom.xml @@ -32,7 +32,7 @@ indy-client-core-java - org.commonjava.indy + org.commonjava.indy.service indy-koji-model-java diff --git a/pom.xml b/pom.xml index 38817ca..b63848f 100644 --- a/pom.xml +++ b/pom.xml @@ -92,11 +92,6 @@ indy-promote-model-java 3.3.1-SNAPSHOT - - org.commonjava.indy - indy-koji-model-java - 3.3.1-SNAPSHOT - org.commonjava.indy From b8d0446f69cab9cfb8271130bb93b121f24e063c Mon Sep 17 00:00:00 2001 From: Gang Li Date: Fri, 20 Oct 2023 15:04:59 +0800 Subject: [PATCH 11/13] Update indy model to 1.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b63848f..fd41c97 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ 1.12 1.1.1 - 1.4-SNAPSHOT + 1.4 1.9.1 4.5.13 1.7.36 From 6130e771b3ae55a3796dc4b4c7dd6dbf60dfd43b Mon Sep 17 00:00:00 2001 From: commonjava-bot Date: Fri, 20 Oct 2023 07:30:28 +0000 Subject: [PATCH 12/13] [maven-release-plugin] prepare release indy-clients-parent-3.3.1 --- addons-client/content-browse/client-java/pom.xml | 2 +- addons-client/content-browse/pom.xml | 2 +- addons-client/diagnostics/client-java/pom.xml | 2 +- addons-client/diagnostics/pom.xml | 2 +- addons-client/folo/client-java/pom.xml | 2 +- addons-client/folo/pom.xml | 2 +- addons-client/koji/client-java/pom.xml | 2 +- addons-client/koji/pom.xml | 2 +- addons-client/pom.xml | 2 +- addons-client/promote/client-java/pom.xml | 2 +- addons-client/promote/model-java/pom.xml | 2 +- addons-client/promote/pom.xml | 2 +- core-java/pom.xml | 2 +- pom.xml | 8 ++++---- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/addons-client/content-browse/client-java/pom.xml b/addons-client/content-browse/client-java/pom.xml index ab81fae..76c64c8 100644 --- a/addons-client/content-browse/client-java/pom.xml +++ b/addons-client/content-browse/client-java/pom.xml @@ -20,7 +20,7 @@ indy-content-browse-client-parent org.commonjava.indy - 3.3.1-SNAPSHOT + 3.3.1 4.0.0 diff --git a/addons-client/content-browse/pom.xml b/addons-client/content-browse/pom.xml index d24b4f9..58b2b85 100644 --- a/addons-client/content-browse/pom.xml +++ b/addons-client/content-browse/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons-client - 3.3.1-SNAPSHOT + 3.3.1 indy-content-browse-client-parent diff --git a/addons-client/diagnostics/client-java/pom.xml b/addons-client/diagnostics/client-java/pom.xml index ca4a486..9fd0eea 100644 --- a/addons-client/diagnostics/client-java/pom.xml +++ b/addons-client/diagnostics/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics-client-parent - 3.3.1-SNAPSHOT + 3.3.1 indy-diagnostics-client-java diff --git a/addons-client/diagnostics/pom.xml b/addons-client/diagnostics/pom.xml index 881301f..7096a9c 100644 --- a/addons-client/diagnostics/pom.xml +++ b/addons-client/diagnostics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons-client - 3.3.1-SNAPSHOT + 3.3.1 indy-diagnostics-client-parent diff --git a/addons-client/folo/client-java/pom.xml b/addons-client/folo/client-java/pom.xml index 5d1eb41..d764902 100644 --- a/addons-client/folo/client-java/pom.xml +++ b/addons-client/folo/client-java/pom.xml @@ -20,7 +20,7 @@ indy-folo-client-parent org.commonjava.indy - 3.3.1-SNAPSHOT + 3.3.1 4.0.0 diff --git a/addons-client/folo/pom.xml b/addons-client/folo/pom.xml index 45c6c22..24fe67f 100644 --- a/addons-client/folo/pom.xml +++ b/addons-client/folo/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons-client - 3.3.1-SNAPSHOT + 3.3.1 indy-folo-client-parent diff --git a/addons-client/koji/client-java/pom.xml b/addons-client/koji/client-java/pom.xml index d53317f..26b6529 100644 --- a/addons-client/koji/client-java/pom.xml +++ b/addons-client/koji/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji-client-parent - 3.3.1-SNAPSHOT + 3.3.1 indy-koji-client-java Indy :: Add-Ons :: Koji Integration :: Java Client diff --git a/addons-client/koji/pom.xml b/addons-client/koji/pom.xml index f19b4f9..859e0cb 100644 --- a/addons-client/koji/pom.xml +++ b/addons-client/koji/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons-client - 3.3.1-SNAPSHOT + 3.3.1 indy-koji-client-parent diff --git a/addons-client/pom.xml b/addons-client/pom.xml index 489bc7d..38f3af9 100644 --- a/addons-client/pom.xml +++ b/addons-client/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-clients-parent - 3.3.1-SNAPSHOT + 3.3.1 indy-addons-client diff --git a/addons-client/promote/client-java/pom.xml b/addons-client/promote/client-java/pom.xml index e3ad456..b9ff13b 100644 --- a/addons-client/promote/client-java/pom.xml +++ b/addons-client/promote/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote-client-parent - 3.3.1-SNAPSHOT + 3.3.1 indy-promote-client-java Indy :: Add-Ons :: Artifact Promotion :: Java Client diff --git a/addons-client/promote/model-java/pom.xml b/addons-client/promote/model-java/pom.xml index ccadbad..52cf822 100644 --- a/addons-client/promote/model-java/pom.xml +++ b/addons-client/promote/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote-client-parent - 3.3.1-SNAPSHOT + 3.3.1 indy-promote-model-java diff --git a/addons-client/promote/pom.xml b/addons-client/promote/pom.xml index 860ba4d..e1f316c 100644 --- a/addons-client/promote/pom.xml +++ b/addons-client/promote/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons-client - 3.3.1-SNAPSHOT + 3.3.1 indy-promote-client-parent diff --git a/core-java/pom.xml b/core-java/pom.xml index 10fbcd5..15d2390 100644 --- a/core-java/pom.xml +++ b/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-clients-parent - 3.3.1-SNAPSHOT + 3.3.1 indy-client-core-java diff --git a/pom.xml b/pom.xml index fd41c97..8c1e1ea 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.commonjava.indy indy-clients-parent pom - 3.3.1-SNAPSHOT + 3.3.1 Indy :: Client APIs :: Parent 2023 @@ -42,7 +42,7 @@ scm:git:https://github.com/commonjava/indy-client scm:git:https://github.com/commonjava/indy-client http://github.com/Commonjava/indy-client - HEAD + indy-clients-parent-3.3.1 @@ -90,13 +90,13 @@ org.commonjava.indy indy-promote-model-java - 3.3.1-SNAPSHOT + 3.3.1 org.commonjava.indy indy-client-core-java - 3.3.1-SNAPSHOT + 3.3.1 org.commonjava.indy From 87ccba2879067d2847f1625b121630b1741fb6c8 Mon Sep 17 00:00:00 2001 From: commonjava-bot Date: Fri, 20 Oct 2023 07:30:30 +0000 Subject: [PATCH 13/13] [maven-release-plugin] prepare for next development iteration --- addons-client/content-browse/client-java/pom.xml | 2 +- addons-client/content-browse/pom.xml | 2 +- addons-client/diagnostics/client-java/pom.xml | 2 +- addons-client/diagnostics/pom.xml | 2 +- addons-client/folo/client-java/pom.xml | 2 +- addons-client/folo/pom.xml | 2 +- addons-client/koji/client-java/pom.xml | 2 +- addons-client/koji/pom.xml | 2 +- addons-client/pom.xml | 2 +- addons-client/promote/client-java/pom.xml | 2 +- addons-client/promote/model-java/pom.xml | 2 +- addons-client/promote/pom.xml | 2 +- core-java/pom.xml | 2 +- pom.xml | 8 ++++---- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/addons-client/content-browse/client-java/pom.xml b/addons-client/content-browse/client-java/pom.xml index 76c64c8..226f986 100644 --- a/addons-client/content-browse/client-java/pom.xml +++ b/addons-client/content-browse/client-java/pom.xml @@ -20,7 +20,7 @@ indy-content-browse-client-parent org.commonjava.indy - 3.3.1 + 3.3.2-SNAPSHOT 4.0.0 diff --git a/addons-client/content-browse/pom.xml b/addons-client/content-browse/pom.xml index 58b2b85..84cb3db 100644 --- a/addons-client/content-browse/pom.xml +++ b/addons-client/content-browse/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons-client - 3.3.1 + 3.3.2-SNAPSHOT indy-content-browse-client-parent diff --git a/addons-client/diagnostics/client-java/pom.xml b/addons-client/diagnostics/client-java/pom.xml index 9fd0eea..f44053f 100644 --- a/addons-client/diagnostics/client-java/pom.xml +++ b/addons-client/diagnostics/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics-client-parent - 3.3.1 + 3.3.2-SNAPSHOT indy-diagnostics-client-java diff --git a/addons-client/diagnostics/pom.xml b/addons-client/diagnostics/pom.xml index 7096a9c..0731b48 100644 --- a/addons-client/diagnostics/pom.xml +++ b/addons-client/diagnostics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons-client - 3.3.1 + 3.3.2-SNAPSHOT indy-diagnostics-client-parent diff --git a/addons-client/folo/client-java/pom.xml b/addons-client/folo/client-java/pom.xml index d764902..b962e58 100644 --- a/addons-client/folo/client-java/pom.xml +++ b/addons-client/folo/client-java/pom.xml @@ -20,7 +20,7 @@ indy-folo-client-parent org.commonjava.indy - 3.3.1 + 3.3.2-SNAPSHOT 4.0.0 diff --git a/addons-client/folo/pom.xml b/addons-client/folo/pom.xml index 24fe67f..1a1175b 100644 --- a/addons-client/folo/pom.xml +++ b/addons-client/folo/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons-client - 3.3.1 + 3.3.2-SNAPSHOT indy-folo-client-parent diff --git a/addons-client/koji/client-java/pom.xml b/addons-client/koji/client-java/pom.xml index 26b6529..e194782 100644 --- a/addons-client/koji/client-java/pom.xml +++ b/addons-client/koji/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji-client-parent - 3.3.1 + 3.3.2-SNAPSHOT indy-koji-client-java Indy :: Add-Ons :: Koji Integration :: Java Client diff --git a/addons-client/koji/pom.xml b/addons-client/koji/pom.xml index 859e0cb..1a8a657 100644 --- a/addons-client/koji/pom.xml +++ b/addons-client/koji/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons-client - 3.3.1 + 3.3.2-SNAPSHOT indy-koji-client-parent diff --git a/addons-client/pom.xml b/addons-client/pom.xml index 38f3af9..5c1ab74 100644 --- a/addons-client/pom.xml +++ b/addons-client/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-clients-parent - 3.3.1 + 3.3.2-SNAPSHOT indy-addons-client diff --git a/addons-client/promote/client-java/pom.xml b/addons-client/promote/client-java/pom.xml index b9ff13b..9f3daf4 100644 --- a/addons-client/promote/client-java/pom.xml +++ b/addons-client/promote/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote-client-parent - 3.3.1 + 3.3.2-SNAPSHOT indy-promote-client-java Indy :: Add-Ons :: Artifact Promotion :: Java Client diff --git a/addons-client/promote/model-java/pom.xml b/addons-client/promote/model-java/pom.xml index 52cf822..d4ee64b 100644 --- a/addons-client/promote/model-java/pom.xml +++ b/addons-client/promote/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote-client-parent - 3.3.1 + 3.3.2-SNAPSHOT indy-promote-model-java diff --git a/addons-client/promote/pom.xml b/addons-client/promote/pom.xml index e1f316c..c80113e 100644 --- a/addons-client/promote/pom.xml +++ b/addons-client/promote/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons-client - 3.3.1 + 3.3.2-SNAPSHOT indy-promote-client-parent diff --git a/core-java/pom.xml b/core-java/pom.xml index 15d2390..eaa50f5 100644 --- a/core-java/pom.xml +++ b/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-clients-parent - 3.3.1 + 3.3.2-SNAPSHOT indy-client-core-java diff --git a/pom.xml b/pom.xml index 8c1e1ea..54caab4 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.commonjava.indy indy-clients-parent pom - 3.3.1 + 3.3.2-SNAPSHOT Indy :: Client APIs :: Parent 2023 @@ -42,7 +42,7 @@ scm:git:https://github.com/commonjava/indy-client scm:git:https://github.com/commonjava/indy-client http://github.com/Commonjava/indy-client - indy-clients-parent-3.3.1 + HEAD @@ -90,13 +90,13 @@ org.commonjava.indy indy-promote-model-java - 3.3.1 + 3.3.2-SNAPSHOT org.commonjava.indy indy-client-core-java - 3.3.1 + 3.3.2-SNAPSHOT org.commonjava.indy