Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion appengine-api-1.0-sdk/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.6.1</version>
<version>3.6.0</version>
<configuration>
<argLine>${surefire.unsafe.arg}</argLine>
<systemPropertyVariables>
Expand Down
2 changes: 1 addition & 1 deletion applications/guestbook/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.6.1</version>
<version>3.6.0</version>
<configuration>
<argLine>
-Xshare:off
Expand Down
2 changes: 1 addition & 1 deletion applications/guestbook_jakarta/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.6.1</version>
<version>3.6.0</version>
<configuration>
<argLine>
-Xshare:off
Expand Down
2 changes: 1 addition & 1 deletion applications/jaxrs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.6.1</version>
<version>3.6.0</version>
<configuration>
<argLine>
-Xshare:off
Expand Down
10 changes: 5 additions & 5 deletions applications/proberapp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<DB_REGION>us-central1</DB_REGION>
<DB_USER>prober-user</DB_USER>
<DB_PASSOWRD>prober_connectivity_test_database</DB_PASSOWRD>
<gax.version>2.88.0</gax.version>
<gax.version>2.87.0</gax.version>
<appengine.target.version>${project.version}</appengine.target.version>
<appengine.runtime.location>target/${project.artifactId}-${project.version}</appengine.runtime.location>
</properties>
Expand All @@ -59,7 +59,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-spanner</artifactId>
<version>6.125.0</version>
<version>6.124.0</version>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
Expand Down Expand Up @@ -100,12 +100,12 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigquery</artifactId>
<version>2.74.0</version>
<version>2.73.0</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-core</artifactId>
<version>2.78.0</version>
<version>2.77.0</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
Expand All @@ -119,7 +119,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-storage</artifactId>
<version>2.76.0</version>
<version>2.75.0</version>
</dependency>
<dependency>
<groupId>com.google.cloud.sql</groupId>
Expand Down
16 changes: 8 additions & 8 deletions applications/proberapp_jakarta/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<DB_REGION>us-central1</DB_REGION>
<DB_USER>prober-user</DB_USER>
<DB_PASSOWRD>prober_connectivity_test_database</DB_PASSOWRD>
<gax.version>2.88.0</gax.version>
<gax.version>2.87.0</gax.version>
<appengine.target.version>${project.version}</appengine.target.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<appengine.runtime.location>target/${project.artifactId}-${project.version}</appengine.runtime.location>
Expand All @@ -60,7 +60,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-spanner</artifactId>
<version>6.125.0</version>
<version>6.124.0</version>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
Expand Down Expand Up @@ -101,22 +101,22 @@
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-oauth2-http</artifactId>
<version>1.55.0</version>
<version>1.54.0</version>
</dependency>
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-credentials</artifactId>
<version>1.55.0</version>
<version>1.54.0</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigquery</artifactId>
<version>2.74.0</version>
<version>2.73.0</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-core</artifactId>
<version>2.78.0</version>
<version>2.77.0</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
Expand All @@ -130,12 +130,12 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-storage</artifactId>
<version>2.76.0</version>
<version>2.75.0</version>
</dependency>
<dependency>
<groupId>com.google.cloud.sql</groupId>
<artifactId>mysql-socket-factory-connector-j-8</artifactId>
<version>1.30.2</version>
<version>1.30.1</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
Expand Down
24 changes: 22 additions & 2 deletions kokoro/gcp_ubuntu/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -129,13 +129,33 @@ if [[ "${DRY_RUN}" == "true" ]]; then
echo "DRY_RUN is true, only calling release:prepare."
./mvnw release:prepare ${MVN_COMMON_OPTIONS}
else
echo "Calling release:prepare and release:perform."
echo "Cleaning up stale releases from OSS Exit Gate staging repo..."
packages=$(gcloud artifacts packages list \
--project="oss-exit-gate-prod" \
--location="us" \
--repository="appengine-java--mavencentral" \
--format="value(name)" 2>/dev/null || true)
echo "${packages}" | xargs -r -I {} sh -c '
package_name=$(basename "{}")
echo "Deleting package: $package_name..."
gcloud artifacts packages delete "{}" \
--project="oss-exit-gate-prod" \
--location="us" \
--repository="appengine-java--mavencentral" \
--quiet
'

echo "Calling release:prepare and release:perform via OSS Exit Gate staging..."
# Force usage of the aoss profile to point to google artifacts repository to be MOSS compliant.
MVN_EXIT_CODE=0
./mvnw release:prepare release:perform -B -q --settings=../settings.xml -Paoss -DskipTests -Darguments=-DskipTests -Dgpg.homedir=${GNUPGHOME} -Dgpg.passphrase=${GPG_PASSPHRASE} -l /tmp/mvn_log.txt || MVN_EXIT_CODE=$?
./mvnw release:prepare release:perform -B -q --settings=../settings.xml -Paoss,oss-exit-gate -DskipTests -Darguments="-Psonatype-release,oss-exit-gate -DskipTests" -Dgpg.homedir=${GNUPGHOME} -Dgpg.passphrase=${GPG_PASSPHRASE} -l /tmp/mvn_log.txt || MVN_EXIT_CODE=$?
grep -v "Using Usertoken auth" /tmp/mvn_log.txt
if [[ ${MVN_EXIT_CODE} -ne 0 ]]; then exit ${MVN_EXIT_CODE}; fi

echo '{"publish_all": true}' > /tmp/oss-exit-gate-manifest.json
gcloud storage cp /tmp/oss-exit-gate-manifest.json \
"gs://oss-exit-gate-prod-projects-bucket/appengine-java/mavencentral/manifests/manifest-${RELEASE_NUMBER}-$(date +%s).json"

git remote set-url origin https://gae-java-bot:${GAE_JAVA_BOT_GITHUB_TOKEN}@github.com/GoogleCloudPlatform/appengine-java-standard
echo "Doing git tag and push."
git tag -a v$RELEASE_NUMBER -m v$RELEASE_NUMBER
Expand Down
74 changes: 60 additions & 14 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,15 @@
<url>${distributionManagement.snapshot.url}</url>
</snapshotRepository>
</distributionManagement>
<build>
<extensions>
<extension>
<groupId>com.google.cloud.artifactregistry</groupId>
<artifactId>artifactregistry-maven-wagon</artifactId>
<version>2.2.5</version>
</extension>
</extensions>
</build>
<profiles>
<profile>
<id>sonatype-release</id>
Expand Down Expand Up @@ -286,6 +295,43 @@
</repository>
</repositories>
</profile>
<!-- OSS Exit Gate publishing profile (mvn deploy -P sonatype-oss-release,oss-exit-gate) -->
<profile>
<id>oss-exit-gate</id>
<build>
<plugins>
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<configuration>
<skipPublishing>true</skipPublishing>
</configuration>
</plugin>
<!-- central-publishing-maven-plugin (extensions=true) disables default-deploy;
this execution restores deploy behaviour when skipPublishing=true. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.1.3</version>
<executions>
<execution>
<id>oss-exit-gate-deploy</id>
<phase>deploy</phase>
<goals>
<goal>deploy</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<distributionManagement>
<repository>
<id>oss-exit-gate</id>
<url>artifactregistry://us-maven.pkg.dev/oss-exit-gate-prod/appengine-java--mavencentral</url>
</repository>
</distributionManagement>
</profile>
</profiles>

<dependencyManagement>
Expand Down Expand Up @@ -427,12 +473,12 @@
<dependency>
<groupId>com.google.api-client</groupId>
<artifactId>google-api-client-appengine</artifactId>
<version>2.9.2</version>
<version>2.9.1</version>
</dependency>
<dependency>
<groupId>com.google.api-client</groupId>
<artifactId>google-api-client</artifactId>
<version>2.9.2</version>
<version>2.9.1</version>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
Expand All @@ -453,7 +499,7 @@
<dependency>
<groupId>com.google.cloud.datastore</groupId>
<artifactId>datastore-v1-proto-client</artifactId>
<version>3.8.0</version>
<version>3.7.0</version>
</dependency>
<dependency>
<groupId>com.google.geometry</groupId>
Expand Down Expand Up @@ -516,12 +562,12 @@
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-datastore-v1</artifactId>
<version>3.8.0</version>
<version>3.7.0</version>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-common-protos</artifactId>
<version>2.79.0</version>
<version>2.78.0</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
Expand All @@ -531,7 +577,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.15.0</version>
<version>2.14.0</version>
</dependency>
<dependency>
<groupId>com.google.flogger</groupId>
Expand All @@ -557,7 +603,7 @@
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
<version>2.51.0</version>
<version>2.50.0</version>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
Expand Down Expand Up @@ -754,12 +800,12 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-logging</artifactId>
<version>3.41.0</version>
<version>3.40.0</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-tasks</artifactId>
<version>2.100.0</version>
<version>2.99.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand All @@ -774,12 +820,12 @@
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-oauth2-http</artifactId>
<version>1.55.0</version>
<version>1.54.0</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-storage</artifactId>
<version>2.76.0</version>
<version>2.75.0</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down Expand Up @@ -811,7 +857,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.6.1</version>
<version>3.6.0</version>
<configuration>
<systemPropertyVariables>
<appengine.runtime.dir>../deployment/target/runtime-deployment-${project.version}</appengine.runtime.dir>
Expand Down Expand Up @@ -849,7 +895,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.7.0</version>
<version>3.6.3</version>
<executions>
<execution>
<id>enforce-maven</id>
Expand Down Expand Up @@ -912,7 +958,7 @@
<configuration>
<useReleaseProfile>false</useReleaseProfile>
<goals>deploy</goals>
<arguments>-Psonatype-release -DskipTests</arguments>
<arguments>-Psonatype-release,oss-exit-gate -DskipTests</arguments>
<preparationGoals>clean install</preparationGoals>
<mavenExecutorId>forked-path</mavenExecutorId>
<pushChanges>false</pushChanges>
Expand Down
2 changes: 1 addition & 1 deletion remoteapi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.6.1</version>
<version>3.6.0</version>
<configuration>
<systemPropertyVariables>
<!-- The shaded jar of this build, so tests don't pick a stale jar left in target/. -->
Expand Down
Loading