From fc4bce4cc15580514a853e2d0666b64955972337 Mon Sep 17 00:00:00 2001 From: paduin Date: Mon, 14 Jul 2025 17:36:27 +0200 Subject: [PATCH 01/15] test --- pom.xml | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/pom.xml b/pom.xml index 0d6a8b8..4abe55c 100644 --- a/pom.xml +++ b/pom.xml @@ -157,9 +157,53 @@ + + + sonatype-nexus + https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/ + + + sonatype-nexus + https://ossrh-staging-api.central.sonatype.com/content/repositories/snapshots + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + ${nexus.staging.maven.plugin.version} + true + + sonatype-nexus-staging + https://ossrh-staging-api.central.sonatype.com + true + + + + maven-deploy-plugin + 3.1.4 + + + default-deploy + deploy + + deploy + + + + + com.google.cloud.tools jib-maven-plugin From b5fe379af9f3102c87371a300d040703bb49e4d3 Mon Sep 17 00:00:00 2001 From: paduin Date: Mon, 14 Jul 2025 17:38:24 +0200 Subject: [PATCH 02/15] test --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 4abe55c..f173e9c 100644 --- a/pom.xml +++ b/pom.xml @@ -39,6 +39,7 @@ 2.17.1 1.1.9 3.1.0 + true From 2b6e269024bc300d60e2a38618da0f5e4dfdd41b Mon Sep 17 00:00:00 2001 From: paduin Date: Mon, 14 Jul 2025 17:39:32 +0200 Subject: [PATCH 03/15] test --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f173e9c..68d22f5 100644 --- a/pom.xml +++ b/pom.xml @@ -165,7 +165,7 @@ sonatype-nexus - https://ossrh-staging-api.central.sonatype.com/content/repositories/snapshots + https://ossrh-staging-api.central.sonatype.com/content/repositories/snapshots/ From d405f056d6f2dd9817cf98fe4cb792531c94b701 Mon Sep 17 00:00:00 2001 From: paduin Date: Mon, 14 Jul 2025 17:46:57 +0200 Subject: [PATCH 04/15] test --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 68d22f5..9bc4dca 100644 --- a/pom.xml +++ b/pom.xml @@ -165,7 +165,7 @@ sonatype-nexus - https://ossrh-staging-api.central.sonatype.com/content/repositories/snapshots/ + https://central.sonatype.com/repository/maven-snapshots/ @@ -178,7 +178,7 @@ ${nexus.staging.maven.plugin.version} true - sonatype-nexus-staging + sonatype-nexus https://ossrh-staging-api.central.sonatype.com true From 5a492a848eb4f1353ae8dbf2f1155fbe7d0afb0d Mon Sep 17 00:00:00 2001 From: paduin Date: Tue, 15 Jul 2025 09:25:33 +0200 Subject: [PATCH 05/15] testing --- .github/workflows/build.yml | 4 ++-- pom.xml | 48 ++++++++++++++++++------------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f330a30..675a279 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: distribution: 'adopt' java-version: '8' java-package: jdk - server-id: sonatype-nexus-snapshots # Value of the distributionManagement/repository/id field of the pom.xml + server-id: central # Value of the distributionManagement/repository/id field of the pom.xml server-username: SONATYPE_USERNAME # env variable for username in deploy server-password: SONATYPE_PASSWORD # env variable for token in deploy # only signed artifacts will be released to maven central. this sets up things for the maven-gpg-plugin @@ -33,7 +33,7 @@ jobs: settings-path: ${{ github.workspace }} - name: Run Maven Targets - run: mvn deploy jacoco:report checkstyle:checkstyle spotbugs:spotbugs --settings $GITHUB_WORKSPACE/settings.xml --batch-mode --show-version --no-transfer-progress --activate-profiles sonatype-oss-release-github-actions + run: mvn deploy jacoco:report checkstyle:checkstyle spotbugs:spotbugs --settings $GITHUB_WORKSPACE/settings.xml --batch-mode --show-version --no-transfer-progress --activate-profiles sonatype-oss-release-github-actions env: SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} diff --git a/pom.xml b/pom.xml index 9bc4dca..ab73fdf 100644 --- a/pom.xml +++ b/pom.xml @@ -158,31 +158,31 @@ - - - sonatype-nexus - https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/ - - - sonatype-nexus - https://central.sonatype.com/repository/maven-snapshots/ - - + + + + + + + + + + - - org.sonatype.plugins - nexus-staging-maven-plugin - ${nexus.staging.maven.plugin.version} - true - - sonatype-nexus - https://ossrh-staging-api.central.sonatype.com - true - - + + + + + + + + + + + maven-deploy-plugin 3.1.4 @@ -196,15 +196,15 @@ - + com.google.cloud.tools jib-maven-plugin From 4c03820e5f3a7e73213790785801d742280e88f1 Mon Sep 17 00:00:00 2001 From: paduin Date: Tue, 15 Jul 2025 09:32:58 +0200 Subject: [PATCH 06/15] testing --- pom.xml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index ab73fdf..daf8a66 100644 --- a/pom.xml +++ b/pom.xml @@ -183,19 +183,19 @@ - - maven-deploy-plugin - 3.1.4 - - - default-deploy - deploy - - deploy - - - - + + + + + + + + + + + + + org.sonatype.central central-publishing-maven-plugin From 876896611e92bd4d124cd7f30441f8df24e5ebe8 Mon Sep 17 00:00:00 2001 From: paduin Date: Tue, 15 Jul 2025 10:15:27 +0200 Subject: [PATCH 07/15] overwriting parent --- parent/pom.xml | 621 +++++++++++++++++++++++++++++++++++++++++++++++++ pom.xml | 27 ++- 2 files changed, 637 insertions(+), 11 deletions(-) create mode 100644 parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml new file mode 100644 index 0000000..07318cb --- /dev/null +++ b/parent/pom.xml @@ -0,0 +1,621 @@ + + 4.0.0 + + com.expediagroup + eg-oss-parent + 2.4.2-SNAPSHOT + Parent POM for Expedia Group open source projects + pom + https://github.com/ExpediaGroup/eg-oss-parent + 2019 + Expedia Group Open Source Parent + + + scm:git:https://${GIT_USERNAME}:${GIT_PASSWORD}@github.com/ExpediaGroup/${project.artifactId}.git + scm:git:https://${GIT_USERNAME}:${GIT_PASSWORD}@github.com/ExpediaGroup/${project.artifactId}.git + https://github.com/ExpediaGroup/eg-oss-parent + HEAD + + + + Expedia Group + http://expediagroup.com + + + + + Expedia Group Committers + Expedia Group + https://expediagroup.com + + + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + + + + UTF-8 + + 1.8 + + 1.4 + 4.3.0 + 1.2.0 + 3.0.0-M5 + 0.8.6 + 8 + false + 3.0 + 1.0.0 + 3.1.1 + 3.8.1 + 3.1.2 + 1.6 + 3.2.0 + 3.2.0 + 3.9.1 + 3.2.0 + 4.0.4 + 3.0.0-M5 + 3.0.0-M1 + 1.6.8 + 2.4.1 + 4.0.3 + 2.7.1 + + expediagroup + docker.io + + openjdk + 8u181-jdk-slim-stretch + ${docker.from.image}:${docker.from.tag} + + ${project.artifactId} + ${project.version} + ${dockerhub.url}/${docker.registry}/${docker.to.image}:${docker.to.tag} + 8080 + + + ${project.build.directory}/plugin-config/checkstyle/eg-checkstyle.xml + ${project.build.directory}/plugin-config/mycila/APACHE-2.txt + ${project.build.directory}/plugin-config/mycila/eg-definitions.xml + ${project.build.directory}/plugin-config/spotbugs/eg-spotbugs-exclude.xml + \#java,\#javax,\#org,\#,\#com,\#com.expedia,\#com.expediagroup,\#com.hotels,java,javax,org,,com,com.expedia,com.expediagroup,com.hotels + false + + + + + + + + + + + + + + + + + com.diffplug.spotless + spotless-maven-plugin + ${spotless.maven.plugin.version} + + + process-sources + + apply + + + + + + + + ${spotless.config.import.order.def} + + + ${spotless.config.execution.skip} + + + + com.github.spotbugs + spotbugs-maven-plugin + ${maven.spotbugs.plugin.version} + + ${project.build.sourceEncoding} + true + Max + Low + ${spotbugs.config} + + + + + org.apache.maven.plugins + maven-dependency-plugin + ${maven.dependency.plugin.version} + + + unpack + validate + + unpack + + + + + com.expediagroup + eg-oss-plugin-config + ${eg.oss.plugin.config.version} + jar + false + ${project.build.directory}/plugin-config + + + + + + + + com.mycila + license-maven-plugin + ${license.maven.plugin.version} + + + com.expediagroup + eg-oss-plugin-config + ${eg.oss.plugin.config.version} + + + com.mycila + license-maven-plugin-git + ${license.maven.plugin.version} + + + +
${mycila.config.header}
+ + ${mycila.config.header.def} + + + Expedia, Inc. + ${current.year} + + + src/main/java/** + src/main/resources/*.xml + src/test/java/** + src/test/resources/*.xml + +
+ + + validate + + format + + + +
+ + org.apache.maven.plugins + maven-compiler-plugin + ${maven.compiler.plugin.version} + + ${jdk.version} + ${jdk.version} + ${project.build.sourceEncoding} + true + true + + + + org.apache.maven.plugins + maven-checkstyle-plugin + ${maven.checkstyle.plugin.version} + + ${checkstyle.config} + + + + org.apache.maven.plugins + maven-jar-plugin + ${maven.jar.plugin.version} + + + + ${project.version} + ${maven.build.timestamp} + ${project.groupId} + ${project.artifactId} + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven.javadoc.plugin.version} + + ${project.build.sourceEncoding} + ${javadoc.source.version} + ${javadoc.source.detect.java.api.link} + + + + aggregate + + aggregate + + site + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-release-plugin + ${maven.release.plugin.version} + + true + false + sonatype-oss-release + deploy + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven.surefire.plugin.version} + + + + org.codehaus.mojo + buildnumber-maven-plugin + ${buildnumber.maven.plugin.version} + + + validate + + create-timestamp + + + + + yyyy + current.year + + + + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + + + jacoco-initialize + + prepare-agent + + + + jacoco-site + package + + report + + + + + + + + + + + + + + + +
+ + + + + org.apache.maven.plugins + maven-site-plugin + ${maven.site.plugin.version} + + + org.codehaus.mojo + failsafe-maven-plugin + ${failsafe.maven.plugin.version} + + + integration-test + + integration-test + + + + verify + + verify + + + + + + pl.project13.maven + git-commit-id-plugin + ${git.commit.id.maven.plugin.version} + + + get-git-info + initialize + + revision + + + + + false + yyyy-MM-dd'T'HH:mm:ss'Z' + GMT + + ^git.commit.time$ + + + + + com.google.cloud.tools + jib-maven-plugin + ${jib.maven.plugin.version} + + + deploy + deploy + + build + + + + package + package + + dockerBuild + + + + + + ${docker.from.reference} + + + ${docker.to.reference} + + ${DOCKERHUB_USERNAME} + ${DOCKERHUB_PASSWORD} + + + + ${git.commit.time} + ${git.commit.time} + + ${docker.container.port} + + + + + + +
+ + + + doclint-java8-disable + + [1.8,) + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + none + + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + none + + + + + + + surefire-configuration + + + test.arguments + + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven.surefire.plugin.version} + + @{argLine} ${test.arguments} + + + + + + + + sonatype-oss-release + + + + org.apache.maven.plugins + maven-gpg-plugin + ${maven.gpg.plugin.version} + + + sign-artifacts + verify + + sign + + + + + + org.apache.maven.plugins + maven-source-plugin + ${maven.source.plugin.version} + + + attach-sources + + jar-no-fork + + + + + + + + + sonatype-oss-release-github-actions + + + + org.apache.maven.plugins + maven-gpg-plugin + ${maven.gpg.plugin.version} + + + sign-artifacts + verify + + sign + + + + + --pinentry-mode + loopback + + + + + + + org.apache.maven.plugins + maven-source-plugin + ${maven.source.plugin.version} + + + attach-sources + + jar-no-fork + + + + + + + + + coveralls + + + + org.eluder.coveralls + coveralls-maven-plugin + ${coveralls.maven.plugin.version} + + + + javax.xml.bind + jaxb-api + 2.2.3 + + + + + + + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + ${maven.checkstyle.plugin.version} + + ${checkstyle.config} + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven.javadoc.plugin.version} + + ${project.build.sourceEncoding} + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + ${maven.project.info.reports.plugin.version} + + + + index + dependencies + + + + + + org.apache.maven.plugins + maven-site-plugin + ${maven.site.plugin.version} + + UTF-8 + + + + + +
diff --git a/pom.xml b/pom.xml index daf8a66..2c4c1af 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,8 @@ com.expediagroup eg-oss-parent - 2.4.1 + 2.4.2-SNAPSHOT + parent/pom.xml drone-fly-parent @@ -170,6 +171,19 @@ + + + org.sonatype.central + central-publishing-maven-plugin + 0.8.0 + true + + central + + + + + @@ -195,16 +209,7 @@ - - - org.sonatype.central - central-publishing-maven-plugin - 0.8.0 - true - - central - - + com.google.cloud.tools jib-maven-plugin From cead6f3fd99ab83d0c7b86aeba578720ccb934e5 Mon Sep 17 00:00:00 2001 From: paduin Date: Tue, 15 Jul 2025 11:35:10 +0200 Subject: [PATCH 08/15] cleanup --- parent/pom.xml | 73 ++++++++------------------------------------------ pom.xml | 50 +--------------------------------- 2 files changed, 12 insertions(+), 111 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 07318cb..437a286 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -88,17 +88,6 @@ false - - - - - - - - - - - @@ -318,17 +307,6 @@ - - - - - - - - - - - @@ -472,50 +450,21 @@ - - - sonatype-oss-release - - - - org.apache.maven.plugins - maven-gpg-plugin - ${maven.gpg.plugin.version} - - - sign-artifacts - verify - - sign - - - - - - org.apache.maven.plugins - maven-source-plugin - ${maven.source.plugin.version} - - - attach-sources - - jar-no-fork - - - - - - - sonatype-oss-release-github-actions + + org.sonatype.central + central-publishing-maven-plugin + 0.8.0 + true + + central + true + published + + org.apache.maven.plugins maven-gpg-plugin diff --git a/pom.xml b/pom.xml index 2c4c1af..b60d0a5 100644 --- a/pom.xml +++ b/pom.xml @@ -158,58 +158,10 @@ test - - - - - - - - - - - - - - org.sonatype.central - central-publishing-maven-plugin - 0.8.0 - true - - central - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + com.google.cloud.tools jib-maven-plugin From e366e11551a577c4acb179a1794684f630a0604d Mon Sep 17 00:00:00 2001 From: paduin Date: Tue, 15 Jul 2025 11:37:11 +0200 Subject: [PATCH 09/15] switching to central --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c8ebb14..7a85b0c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,7 +26,7 @@ jobs: distribution: 'adopt' java-version: '8' java-package: jdk - server-id: sonatype-nexus-staging # Value of the distributionManagement/repository/id field of the pom.xml + server-id: central # Value of the distributionManagement/repository/id field of the pom.xml server-username: SONATYPE_USERNAME # env variable for username in deploy server-password: SONATYPE_PASSWORD # env variable for token in deploy # only signed artifacts will be released to maven central. This sets up things for the maven-gpg-plugin From f3b67b987980781ca8a1d1b66673a985830f1b08 Mon Sep 17 00:00:00 2001 From: paduin Date: Tue, 15 Jul 2025 11:44:12 +0200 Subject: [PATCH 10/15] switching to central --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 675a279..86e0744 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,7 @@ jobs: settings-path: ${{ github.workspace }} - name: Run Maven Targets - run: mvn deploy jacoco:report checkstyle:checkstyle spotbugs:spotbugs --settings $GITHUB_WORKSPACE/settings.xml --batch-mode --show-version --no-transfer-progress --activate-profiles sonatype-oss-release-github-actions + run: mvn deploy jacoco:report checkstyle:checkstyle spotbugs:spotbugs --settings $GITHUB_WORKSPACE/settings.xml --batch-mode --show-version --no-transfer-progress --activate-profiles sonatype-oss-release-github-actions env: SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} From 9230ba854addc90688e998159e1828d19c73ebe9 Mon Sep 17 00:00:00 2001 From: paduin Date: Tue, 15 Jul 2025 11:45:11 +0200 Subject: [PATCH 11/15] switching to central --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index b60d0a5..ad102b1 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,6 @@ 2.17.1 1.1.9 3.1.0 - true From 8d516b63cc68fa87ee7ec798898e6c8a793d1984 Mon Sep 17 00:00:00 2001 From: paduin Date: Wed, 16 Jul 2025 15:27:58 +0200 Subject: [PATCH 12/15] switch to shared parent --- parent/pom.xml | 570 ------------------------------------------------- pom.xml | 3 +- 2 files changed, 1 insertion(+), 572 deletions(-) delete mode 100644 parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml deleted file mode 100644 index 437a286..0000000 --- a/parent/pom.xml +++ /dev/null @@ -1,570 +0,0 @@ - - 4.0.0 - - com.expediagroup - eg-oss-parent - 2.4.2-SNAPSHOT - Parent POM for Expedia Group open source projects - pom - https://github.com/ExpediaGroup/eg-oss-parent - 2019 - Expedia Group Open Source Parent - - - scm:git:https://${GIT_USERNAME}:${GIT_PASSWORD}@github.com/ExpediaGroup/${project.artifactId}.git - scm:git:https://${GIT_USERNAME}:${GIT_PASSWORD}@github.com/ExpediaGroup/${project.artifactId}.git - https://github.com/ExpediaGroup/eg-oss-parent - HEAD - - - - Expedia Group - http://expediagroup.com - - - - - Expedia Group Committers - Expedia Group - https://expediagroup.com - - - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - - - - UTF-8 - - 1.8 - - 1.4 - 4.3.0 - 1.2.0 - 3.0.0-M5 - 0.8.6 - 8 - false - 3.0 - 1.0.0 - 3.1.1 - 3.8.1 - 3.1.2 - 1.6 - 3.2.0 - 3.2.0 - 3.9.1 - 3.2.0 - 4.0.4 - 3.0.0-M5 - 3.0.0-M1 - 1.6.8 - 2.4.1 - 4.0.3 - 2.7.1 - - expediagroup - docker.io - - openjdk - 8u181-jdk-slim-stretch - ${docker.from.image}:${docker.from.tag} - - ${project.artifactId} - ${project.version} - ${dockerhub.url}/${docker.registry}/${docker.to.image}:${docker.to.tag} - 8080 - - - ${project.build.directory}/plugin-config/checkstyle/eg-checkstyle.xml - ${project.build.directory}/plugin-config/mycila/APACHE-2.txt - ${project.build.directory}/plugin-config/mycila/eg-definitions.xml - ${project.build.directory}/plugin-config/spotbugs/eg-spotbugs-exclude.xml - \#java,\#javax,\#org,\#,\#com,\#com.expedia,\#com.expediagroup,\#com.hotels,java,javax,org,,com,com.expedia,com.expediagroup,com.hotels - false - - - - - - com.diffplug.spotless - spotless-maven-plugin - ${spotless.maven.plugin.version} - - - process-sources - - apply - - - - - - - - ${spotless.config.import.order.def} - - - ${spotless.config.execution.skip} - - - - com.github.spotbugs - spotbugs-maven-plugin - ${maven.spotbugs.plugin.version} - - ${project.build.sourceEncoding} - true - Max - Low - ${spotbugs.config} - - - - - org.apache.maven.plugins - maven-dependency-plugin - ${maven.dependency.plugin.version} - - - unpack - validate - - unpack - - - - - com.expediagroup - eg-oss-plugin-config - ${eg.oss.plugin.config.version} - jar - false - ${project.build.directory}/plugin-config - - - - - - - - com.mycila - license-maven-plugin - ${license.maven.plugin.version} - - - com.expediagroup - eg-oss-plugin-config - ${eg.oss.plugin.config.version} - - - com.mycila - license-maven-plugin-git - ${license.maven.plugin.version} - - - -
${mycila.config.header}
- - ${mycila.config.header.def} - - - Expedia, Inc. - ${current.year} - - - src/main/java/** - src/main/resources/*.xml - src/test/java/** - src/test/resources/*.xml - -
- - - validate - - format - - - -
- - org.apache.maven.plugins - maven-compiler-plugin - ${maven.compiler.plugin.version} - - ${jdk.version} - ${jdk.version} - ${project.build.sourceEncoding} - true - true - - - - org.apache.maven.plugins - maven-checkstyle-plugin - ${maven.checkstyle.plugin.version} - - ${checkstyle.config} - - - - org.apache.maven.plugins - maven-jar-plugin - ${maven.jar.plugin.version} - - - - ${project.version} - ${maven.build.timestamp} - ${project.groupId} - ${project.artifactId} - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven.javadoc.plugin.version} - - ${project.build.sourceEncoding} - ${javadoc.source.version} - ${javadoc.source.detect.java.api.link} - - - - aggregate - - aggregate - - site - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-release-plugin - ${maven.release.plugin.version} - - true - false - sonatype-oss-release - deploy - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven.surefire.plugin.version} - - - - org.codehaus.mojo - buildnumber-maven-plugin - ${buildnumber.maven.plugin.version} - - - validate - - create-timestamp - - - - - yyyy - current.year - - - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} - - - jacoco-initialize - - prepare-agent - - - - jacoco-site - package - - report - - - - -
- - - - - org.apache.maven.plugins - maven-site-plugin - ${maven.site.plugin.version} - - - org.codehaus.mojo - failsafe-maven-plugin - ${failsafe.maven.plugin.version} - - - integration-test - - integration-test - - - - verify - - verify - - - - - - pl.project13.maven - git-commit-id-plugin - ${git.commit.id.maven.plugin.version} - - - get-git-info - initialize - - revision - - - - - false - yyyy-MM-dd'T'HH:mm:ss'Z' - GMT - - ^git.commit.time$ - - - - - com.google.cloud.tools - jib-maven-plugin - ${jib.maven.plugin.version} - - - deploy - deploy - - build - - - - package - package - - dockerBuild - - - - - - ${docker.from.reference} - - - ${docker.to.reference} - - ${DOCKERHUB_USERNAME} - ${DOCKERHUB_PASSWORD} - - - - ${git.commit.time} - ${git.commit.time} - - ${docker.container.port} - - - - - - -
- - - - doclint-java8-disable - - [1.8,) - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - none - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - none - - - - - - - surefire-configuration - - - test.arguments - - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven.surefire.plugin.version} - - @{argLine} ${test.arguments} - - - - - - - sonatype-oss-release-github-actions - - - - org.sonatype.central - central-publishing-maven-plugin - 0.8.0 - true - - central - true - published - - - - org.apache.maven.plugins - maven-gpg-plugin - ${maven.gpg.plugin.version} - - - sign-artifacts - verify - - sign - - - - - --pinentry-mode - loopback - - - - - - - org.apache.maven.plugins - maven-source-plugin - ${maven.source.plugin.version} - - - attach-sources - - jar-no-fork - - - - - - - - - coveralls - - - - org.eluder.coveralls - coveralls-maven-plugin - ${coveralls.maven.plugin.version} - - - - javax.xml.bind - jaxb-api - 2.2.3 - - - - - - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - ${maven.checkstyle.plugin.version} - - ${checkstyle.config} - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven.javadoc.plugin.version} - - ${project.build.sourceEncoding} - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - ${maven.project.info.reports.plugin.version} - - - - index - dependencies - - - - - - org.apache.maven.plugins - maven-site-plugin - ${maven.site.plugin.version} - - UTF-8 - - - - - -
diff --git a/pom.xml b/pom.xml index ad102b1..5c57a9e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,8 +4,7 @@ com.expediagroup eg-oss-parent - 2.4.2-SNAPSHOT - parent/pom.xml + 3.0.0-SNAPSHOT drone-fly-parent From 465ea5245e967e563e30d4039a1f86aa803882cd Mon Sep 17 00:00:00 2001 From: paduin Date: Wed, 16 Jul 2025 16:36:21 +0200 Subject: [PATCH 13/15] Added release --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5c57a9e..de41153 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.expediagroup eg-oss-parent - 3.0.0-SNAPSHOT + 3.0.0 drone-fly-parent From 329dfc6ed38c048bbac19f136a250bf8de304735 Mon Sep 17 00:00:00 2001 From: paduin Date: Wed, 16 Jul 2025 16:37:16 +0200 Subject: [PATCH 14/15] changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e98091..f5913a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [1.1.1] - 2025-07-16 +### +* Upgrade parent pom to accomodate for new sonatype deployment. + ## [1.1.0] - 2025-05-21 ### Changed * Upgrade `hive` version from `2.3.7` to `2.3.9`. From da7f698f304438ab8d4e4c69dc230c2d3de00a9d Mon Sep 17 00:00:00 2001 From: paduin Date: Wed, 16 Jul 2025 16:38:33 +0200 Subject: [PATCH 15/15] changelog --- .../expediagroup/dataplatform/dronefly/app/DroneFlyRunner.java | 2 +- .../dataplatform/dronefly/app/context/CommonBeans.java | 2 +- .../dataplatform/dronefly/app/DroneFlyRunnerTest.java | 2 +- .../dronefly/core/integration/DroneFlyIntegrationTest.java | 2 +- .../dataplatform/dronefly/core/integration/DummyListener.java | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drone-fly-app/src/main/java/com/expediagroup/dataplatform/dronefly/app/DroneFlyRunner.java b/drone-fly-app/src/main/java/com/expediagroup/dataplatform/dronefly/app/DroneFlyRunner.java index 325ff83..f291c26 100644 --- a/drone-fly-app/src/main/java/com/expediagroup/dataplatform/dronefly/app/DroneFlyRunner.java +++ b/drone-fly-app/src/main/java/com/expediagroup/dataplatform/dronefly/app/DroneFlyRunner.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2020 Expedia, Inc. + * Copyright (C) 2020-2025 Expedia, Inc. * * 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/drone-fly-app/src/main/java/com/expediagroup/dataplatform/dronefly/app/context/CommonBeans.java b/drone-fly-app/src/main/java/com/expediagroup/dataplatform/dronefly/app/context/CommonBeans.java index abb049e..bc0df3e 100644 --- a/drone-fly-app/src/main/java/com/expediagroup/dataplatform/dronefly/app/context/CommonBeans.java +++ b/drone-fly-app/src/main/java/com/expediagroup/dataplatform/dronefly/app/context/CommonBeans.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2020 Expedia, Inc. + * Copyright (C) 2020-2025 Expedia, Inc. * * 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/drone-fly-app/src/test/java/com/expediagroup/dataplatform/dronefly/app/DroneFlyRunnerTest.java b/drone-fly-app/src/test/java/com/expediagroup/dataplatform/dronefly/app/DroneFlyRunnerTest.java index f490287..1f5f19e 100644 --- a/drone-fly-app/src/test/java/com/expediagroup/dataplatform/dronefly/app/DroneFlyRunnerTest.java +++ b/drone-fly-app/src/test/java/com/expediagroup/dataplatform/dronefly/app/DroneFlyRunnerTest.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2020 Expedia, Inc. + * Copyright (C) 2020-2025 Expedia, Inc. * * 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/drone-fly-integration-tests/src/test/java/com/expediagroup/dataplatform/dronefly/core/integration/DroneFlyIntegrationTest.java b/drone-fly-integration-tests/src/test/java/com/expediagroup/dataplatform/dronefly/core/integration/DroneFlyIntegrationTest.java index 5c5acf4..8cffcba 100644 --- a/drone-fly-integration-tests/src/test/java/com/expediagroup/dataplatform/dronefly/core/integration/DroneFlyIntegrationTest.java +++ b/drone-fly-integration-tests/src/test/java/com/expediagroup/dataplatform/dronefly/core/integration/DroneFlyIntegrationTest.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2020 Expedia, Inc. + * Copyright (C) 2020-2025 Expedia, Inc. * * 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/drone-fly-integration-tests/src/test/java/com/expediagroup/dataplatform/dronefly/core/integration/DummyListener.java b/drone-fly-integration-tests/src/test/java/com/expediagroup/dataplatform/dronefly/core/integration/DummyListener.java index 1ff92bd..dbb9590 100644 --- a/drone-fly-integration-tests/src/test/java/com/expediagroup/dataplatform/dronefly/core/integration/DummyListener.java +++ b/drone-fly-integration-tests/src/test/java/com/expediagroup/dataplatform/dronefly/core/integration/DummyListener.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2020 Expedia, Inc. + * Copyright (C) 2020-2025 Expedia, Inc. * * 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/pom.xml b/pom.xml index de41153..3e9cbf8 100644 --- a/pom.xml +++ b/pom.xml @@ -159,7 +159,7 @@ - + com.google.cloud.tools jib-maven-plugin