Stop relying on repackaged classes.

Modify the way the artifact is pushed to Maven repository.
GoogleCloudPlatform · Sep 14, 2017 · 162f1d6 · 162f1d6
1 parent 17d47d9
commit 162f1d6
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 3 deletions.
diff --git a/java/pom.xml b/java/pom.xml
@@ -38,6 +38,31 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <github.global.server>github</github.global.server>
   </properties>
+      <repositories>
+    <repository>
+            <id>sonatype-google-releases</id>
+            <name>Sonatype Google Releases</name>
+            <url>https://oss.sonatype.org/service/local/repositories/google-releases/content</url>
+        </repository>
+      <repository>
+      <id>gae-staging</id>
+      <url>https://oss.sonatype.org/content/repositories/comgoogleappengine-1394/</url>
+    </repository>
+    </repositories>
+
+    <distributionManagement>
+        <repository>
+            <id>sonatype-nexus-staging</id>
+            <name>Sonatype Nexus Staging</name>
+            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+        </repository>
+        <snapshotRepository>
+            <id>sonatype-nexus-snapshots</id>
+            <name>Sonatype Nexus Snapshots</name>
+            <url>https://oss.sonatype.org/content/repositories/google-snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
+
   <build>
     <plugins>
       <plugin>
@@ -66,7 +91,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>3.4</version>
+        <version>3.6</version>
         <configuration>
           <reportPlugins>
             <plugin>
@@ -93,7 +118,7 @@
       <plugin>
         <groupId>com.github.github</groupId>
         <artifactId>site-maven-plugin</artifactId>
-        <version>0.11</version>
+        <version>0.12</version>
         <configuration>
           <message>Creating site for ${project.artifactId} ${project.version}</message>
         </configuration>
@@ -106,6 +131,18 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-release-plugin</artifactId>
+        <version>2.5.3</version>
+        <configuration>
+          <mavenExecutorId>forked-path</mavenExecutorId>
+          <useReleaseProfile>false</useReleaseProfile>
+          <arguments>-Psonatype-oss-release</arguments>
+          <pushChanges>false</pushChanges>
+          <localCheckout>true</localCheckout>
+        </configuration>
+      </plugin>
     </plugins>
     <resources>
       <resource>
@@ -289,4 +326,32 @@
       <version>3.0</version>
     </dependency>
   </dependencies>
+
+  <profiles>
+    <profile>
+      <id>sonatype-oss-release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-gpg-plugin</artifactId>
+            <version>1.6</version>
+            <executions>
+              <execution>
+                <id>sign-artifacts</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>sign</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>
diff --git a/...va/com/google/appengine/tools/mapreduce/impl/shardedjob/pipeline/FinalizeShardsInfos.java b/...va/com/google/appengine/tools/mapreduce/impl/shardedjob/pipeline/FinalizeShardsInfos.java
@@ -5,7 +5,6 @@
 import com.google.appengine.api.datastore.DatastoreServiceFactory;
 import com.google.appengine.api.datastore.Entity;
 import com.google.appengine.api.datastore.Key;
-import com.google.appengine.repackaged.com.google.common.base.Throwables;
 import com.google.appengine.tools.cloudstorage.RetryHelper;
 import com.google.appengine.tools.mapreduce.impl.shardedjob.IncrementalTask;
 import com.google.appengine.tools.mapreduce.impl.shardedjob.IncrementalTaskState;
@@ -15,6 +14,7 @@
 import com.google.appengine.tools.mapreduce.impl.util.SerializationUtil;
 import com.google.appengine.tools.pipeline.Job0;
 import com.google.appengine.tools.pipeline.Value;
+import com.google.common.base.Throwables;
 
 import java.util.ArrayList;
 import java.util.Iterator;