Make AutoValue releasable again

- Give each pom a parent so all versions can be set accordingly with mvn versions:set - Add the src/it/* modules to the parent pom modules list - But don't release them, just build them - Mark auto-service as provided scope - Fix some javadoc that is causing Maven to barf RELNOTES=n/a ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=189393305
google · Mar 19, 2018 · 3fec796 · 3fec796
1 parent 2b88377
commit 3fec796
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 25 deletions.
diff --git a/value/annotations/pom.xml b/value/annotations/pom.xml
@@ -19,9 +19,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.google.auto</groupId>
-    <artifactId>auto-parent</artifactId>
-    <version>6</version>
+    <groupId>com.google.auto.value</groupId>
+    <artifactId>auto-value-parent</artifactId>
+    <version>HEAD-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.auto.value</groupId>

diff --git a/value/pom.xml b/value/pom.xml
@@ -25,9 +25,9 @@
   </parent>
 
   <groupId>com.google.auto.value</groupId>
-  <artifactId>auto-value-pom-aggregator</artifactId>
+  <artifactId>auto-value-parent</artifactId>
   <version>HEAD-SNAPSHOT</version>
-  <name>AutoValue</name>
+  <name>AutoValue Parent</name>
   <description>
     Immutable value-type code generation for Java 1.6+.
   </description>
@@ -43,15 +43,7 @@
   <modules>
     <module>annotations</module>
     <module>processor</module>
+    <module>src/it/functional</module>
+    <module>src/it/gwtserializer</module>
   </modules>
-
-  <build>
-    <plugins>
-      <plugin>
-        <!-- Used to run the functional tests -->
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-invoker-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/value/processor/pom.xml b/value/processor/pom.xml
@@ -19,9 +19,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.google.auto</groupId>
-    <artifactId>auto-parent</artifactId>
-    <version>6</version>
+    <groupId>com.google.auto.value</groupId>
+    <artifactId>auto-value-parent</artifactId>
+    <version>HEAD-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.auto.value</groupId>
@@ -49,6 +49,7 @@
       <groupId>com.google.auto.service</groupId>
       <artifactId>auto-service</artifactId>
       <version>1.0-rc4</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>

diff --git a/value/src/it/functional/pom.xml b/value/src/it/functional/pom.xml
@@ -18,6 +18,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.google.auto.value</groupId>
+    <artifactId>auto-value-parent</artifactId>
+    <version>HEAD-SNAPSHOT</version>
+  </parent>
+
   <groupId>com.google.auto.value.it.functional</groupId>
   <artifactId>functional</artifactId>
   <version>HEAD-SNAPSHOT</version>
@@ -29,12 +36,12 @@
     <dependency>
       <groupId>com.google.auto.value</groupId>
       <artifactId>auto-value-annotations</artifactId>
-      <version>@project.version@</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.auto.value</groupId>
       <artifactId>auto-value</artifactId>
-      <version>@project.version@</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
@@ -118,6 +125,15 @@
           </testExcludes>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <version>2.7</version>
+        <configuration>
+          <!-- Build/test, but don't deploy -->
+          <skip>true</skip>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 

diff --git a/value/src/it/functional/src/main/java/PackagelessValueType.java b/value/src/it/functional/src/main/java/PackagelessValueType.java
@@ -21,7 +21,6 @@
 /**
  * Simple package-less value type for tests.
  *
- * @see PackagelessValueTypeTest
  * @author [email protected] (Éamonn McManus)
  */
 @AutoValue

diff --git a/value/src/it/functional/src/main/java/com/google/auto/value/SimpleValueType.java b/value/src/it/functional/src/main/java/com/google/auto/value/SimpleValueType.java
@@ -21,7 +21,6 @@
 /**
  * Simple value type for tests.
  *
- * @see SimpleValueTypeTest
  * @author [email protected] (Éamonn McManus)
  */
 @AutoValue
@@ -53,4 +52,4 @@ public static SimpleValueType create(
     // corresponding field.
     return new AutoValue_SimpleValueType(string, integer, map);
   }
-}
+}
diff --git a/value/src/it/gwtserializer/pom.xml b/value/src/it/gwtserializer/pom.xml
@@ -18,6 +18,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.google.auto.value</groupId>
+    <artifactId>auto-value-parent</artifactId>
+    <version>HEAD-SNAPSHOT</version>
+  </parent>
+
   <groupId>com.google.auto.value.it.gwtserializer</groupId>
   <artifactId>gwtserializer</artifactId>
   <version>HEAD-SNAPSHOT</version>
@@ -37,12 +44,12 @@
     <dependency>
       <groupId>com.google.auto.value</groupId>
       <artifactId>auto-value-annotations</artifactId>
-      <version>@project.version@</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.auto.value</groupId>
       <artifactId>auto-value</artifactId>
-      <version>@project.version@</version>
+      <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -135,6 +142,15 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <version>2.7</version>
+        <configuration>
+          <!-- Build/test, but don't deploy -->
+          <skip>true</skip>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>