diff --git a/google-api-client-apache-v5/pom.xml b/google-api-client-apache-v5/pom.xml index 59ffbffe2..189509684 100644 --- a/google-api-client-apache-v5/pom.xml +++ b/google-api-client-apache-v5/pom.xml @@ -54,7 +54,6 @@ org.apache.felix maven-bundle-plugin - 5.1.9 bundle-manifest diff --git a/google-api-client-appengine/pom.xml b/google-api-client-appengine/pom.xml index 4d730f07e..998a9c154 100644 --- a/google-api-client-appengine/pom.xml +++ b/google-api-client-appengine/pom.xml @@ -41,7 +41,6 @@ org.apache.felix maven-bundle-plugin - 5.1.9 bundle-manifest @@ -71,18 +70,6 @@ - - - org.codehaus.mojo - animal-sniffer-maven-plugin - - - org.codehaus.mojo.signature - java17 - 1.0 - - - @@ -128,4 +115,29 @@ test + + + animal-sniffer + + + [1.8,) + + + + + + org.codehaus.mojo + animal-sniffer-maven-plugin + + + org.codehaus.mojo.signature + java17 + 1.0 + + + + + + + diff --git a/google-api-client-bom/pom.xml b/google-api-client-bom/pom.xml index 7092bd5eb..e22ff7e82 100644 --- a/google-api-client-bom/pom.xml +++ b/google-api-client-bom/pom.xml @@ -109,18 +109,22 @@ + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.7.0 + true + + sonatype-nexus-staging + https://google.oss.sonatype.org/ + false + + + + - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 - true - - sonatype-nexus-staging - https://google.oss.sonatype.org/ - false - - org.apache.maven.plugins maven-javadoc-plugin @@ -157,6 +161,48 @@ + + + release-sonatype + + + + !artifact-registry-url + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + + + + + + + release-gcp-artifact-registry + + artifactregistry://please-define-artifact-registry-url-property + + + + gcp-artifact-registry-repository + ${artifact-registry-url} + + + gcp-artifact-registry-repository + ${artifact-registry-url} + + + release-sign-artifacts diff --git a/google-api-client-gson/pom.xml b/google-api-client-gson/pom.xml index 02c444b66..0d7634828 100644 --- a/google-api-client-gson/pom.xml +++ b/google-api-client-gson/pom.xml @@ -39,7 +39,6 @@ org.apache.felix maven-bundle-plugin - 5.1.9 bundle-manifest diff --git a/google-api-client-jackson2/pom.xml b/google-api-client-jackson2/pom.xml index 722cf38a2..82de2cdb2 100644 --- a/google-api-client-jackson2/pom.xml +++ b/google-api-client-jackson2/pom.xml @@ -39,7 +39,6 @@ org.apache.felix maven-bundle-plugin - 5.1.9 bundle-manifest diff --git a/google-api-client-protobuf/pom.xml b/google-api-client-protobuf/pom.xml index 94b65974e..d13411fd7 100644 --- a/google-api-client-protobuf/pom.xml +++ b/google-api-client-protobuf/pom.xml @@ -46,7 +46,6 @@ org.apache.felix maven-bundle-plugin - 5.1.9 bundle-manifest diff --git a/google-api-client-servlet/pom.xml b/google-api-client-servlet/pom.xml index ed3acbe67..1db0a89f7 100644 --- a/google-api-client-servlet/pom.xml +++ b/google-api-client-servlet/pom.xml @@ -40,7 +40,6 @@ org.apache.felix maven-bundle-plugin - 5.1.9 bundle-manifest diff --git a/google-api-client-xml/pom.xml b/google-api-client-xml/pom.xml index 00ba018d2..e1e2de524 100644 --- a/google-api-client-xml/pom.xml +++ b/google-api-client-xml/pom.xml @@ -39,7 +39,6 @@ org.apache.felix maven-bundle-plugin - 5.1.9 bundle-manifest diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml index b0b29921f..9f65fc6c3 100644 --- a/google-api-client/pom.xml +++ b/google-api-client/pom.xml @@ -60,7 +60,6 @@ org.apache.felix maven-bundle-plugin - 5.1.9 bundle-manifest diff --git a/pom.xml b/pom.xml index 8de865c73..1724be08d 100644 --- a/pom.xml +++ b/pom.xml @@ -471,44 +471,6 @@ - - org.codehaus.mojo - clirr-maven-plugin - - 1.27.0 - ${basedir}/../clirr-ignored-differences.xml - true - - - - - check - - - - - - org.codehaus.mojo - animal-sniffer-maven-plugin - - - org.codehaus.mojo.signature - java17 - 1.0 - - - - - - check - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - com.coveo fmt-maven-plugin @@ -525,6 +487,11 @@ + + org.apache.felix + maven-bundle-plugin + 5.1.8 + @@ -555,6 +522,48 @@ + + + release-sonatype + + + + !artifact-registry-url + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + + + + + + + release-gcp-artifact-registry + + artifactregistry://please-define-artifact-registry-url-property + + + + gcp-artifact-registry-repository + ${artifact-registry-url} + + + gcp-artifact-registry-repository + ${artifact-registry-url} + + + release-sign-artifacts @@ -589,6 +598,69 @@ + + clirr-compatibility-check + + + + [1.8,) + + + + + org.codehaus.mojo + clirr-maven-plugin + + 1.27.0 + ${basedir}/../clirr-ignored-differences.xml + true + + + + + check + + + + + + + + + animal-sniffer + + + [1.8,) + + + + + org.codehaus.mojo + animal-sniffer-maven-plugin + + + org.codehaus.mojo.signature + java17 + 1.0 + + + + + + check + + + + + + + root-directory