Skip to content

Commit 3fec796

Browse files
ronshapiroronshapiro
committed
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
1 parent 2b88377 commit 3fec796

File tree

7 files changed

+48
-25
lines changed

7 files changed

+48
-25
lines changed

‎value/annotations/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
<modelVersion>4.0.0</modelVersion>
2020

2121
<parent>
22-
<groupId>com.google.auto</groupId>
23-
<artifactId>auto-parent</artifactId>
24-
<version>6</version>
22+
<groupId>com.google.auto.value</groupId>
23+
<artifactId>auto-value-parent</artifactId>
24+
<version>HEAD-SNAPSHOT</version>
2525
</parent>
2626

2727
<groupId>com.google.auto.value</groupId>

‎value/pom.xml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
</parent>
2626

2727
<groupId>com.google.auto.value</groupId>
28-
<artifactId>auto-value-pom-aggregator</artifactId>
28+
<artifactId>auto-value-parent</artifactId>
2929
<version>HEAD-SNAPSHOT</version>
30-
<name>AutoValue</name>
30+
<name>AutoValue Parent</name>
3131
<description>
3232
Immutable value-type code generation for Java 1.6+.
3333
</description>
@@ -43,15 +43,7 @@
4343
<modules>
4444
<module>annotations</module>
4545
<module>processor</module>
46+
<module>src/it/functional</module>
47+
<module>src/it/gwtserializer</module>
4648
</modules>
47-
48-
<build>
49-
<plugins>
50-
<plugin>
51-
<!-- Used to run the functional tests -->
52-
<groupId>org.apache.maven.plugins</groupId>
53-
<artifactId>maven-invoker-plugin</artifactId>
54-
</plugin>
55-
</plugins>
56-
</build>
5749
</project>

‎value/processor/pom.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
<modelVersion>4.0.0</modelVersion>
2020

2121
<parent>
22-
<groupId>com.google.auto</groupId>
23-
<artifactId>auto-parent</artifactId>
24-
<version>6</version>
22+
<groupId>com.google.auto.value</groupId>
23+
<artifactId>auto-value-parent</artifactId>
24+
<version>HEAD-SNAPSHOT</version>
2525
</parent>
2626

2727
<groupId>com.google.auto.value</groupId>
@@ -49,6 +49,7 @@
4949
<groupId>com.google.auto.service</groupId>
5050
<artifactId>auto-service</artifactId>
5151
<version>1.0-rc4</version>
52+
<scope>provided</scope>
5253
</dependency>
5354
<dependency>
5455
<groupId>com.google.guava</groupId>

‎value/src/it/functional/pom.xml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@
1818
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1919
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2020
<modelVersion>4.0.0</modelVersion>
21+
22+
<parent>
23+
<groupId>com.google.auto.value</groupId>
24+
<artifactId>auto-value-parent</artifactId>
25+
<version>HEAD-SNAPSHOT</version>
26+
</parent>
27+
2128
<groupId>com.google.auto.value.it.functional</groupId>
2229
<artifactId>functional</artifactId>
2330
<version>HEAD-SNAPSHOT</version>
@@ -29,12 +36,12 @@
2936
<dependency>
3037
<groupId>com.google.auto.value</groupId>
3138
<artifactId>auto-value-annotations</artifactId>
32-
<version>@project.version@</version>
39+
<version>${project.version}</version>
3340
</dependency>
3441
<dependency>
3542
<groupId>com.google.auto.value</groupId>
3643
<artifactId>auto-value</artifactId>
37-
<version>@project.version@</version>
44+
<version>${project.version}</version>
3845
</dependency>
3946
<dependency>
4047
<groupId>com.google.code.findbugs</groupId>
@@ -118,6 +125,15 @@
118125
</testExcludes>
119126
</configuration>
120127
</plugin>
128+
<plugin>
129+
<groupId>org.apache.maven.plugins</groupId>
130+
<artifactId>maven-deploy-plugin</artifactId>
131+
<version>2.7</version>
132+
<configuration>
133+
<!-- Build/test, but don't deploy -->
134+
<skip>true</skip>
135+
</configuration>
136+
</plugin>
121137
</plugins>
122138
</build>
123139

‎value/src/it/functional/src/main/java/PackagelessValueType.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
/**
2222
* Simple package-less value type for tests.
2323
*
24-
* @see PackagelessValueTypeTest
2524
* @author [email protected] (Éamonn McManus)
2625
*/
2726
@AutoValue

‎value/src/it/functional/src/main/java/com/google/auto/value/SimpleValueType.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
/**
2222
* Simple value type for tests.
2323
*
24-
* @see SimpleValueTypeTest
2524
* @author [email protected] (Éamonn McManus)
2625
*/
2726
@AutoValue
@@ -53,4 +52,4 @@ public static SimpleValueType create(
5352
// corresponding field.
5453
return new AutoValue_SimpleValueType(string, integer, map);
5554
}
56-
}
55+
}

‎value/src/it/gwtserializer/pom.xml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@
1818
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1919
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2020
<modelVersion>4.0.0</modelVersion>
21+
22+
<parent>
23+
<groupId>com.google.auto.value</groupId>
24+
<artifactId>auto-value-parent</artifactId>
25+
<version>HEAD-SNAPSHOT</version>
26+
</parent>
27+
2128
<groupId>com.google.auto.value.it.gwtserializer</groupId>
2229
<artifactId>gwtserializer</artifactId>
2330
<version>HEAD-SNAPSHOT</version>
@@ -37,12 +44,12 @@
3744
<dependency>
3845
<groupId>com.google.auto.value</groupId>
3946
<artifactId>auto-value-annotations</artifactId>
40-
<version>@project.version@</version>
47+
<version>${project.version}</version>
4148
</dependency>
4249
<dependency>
4350
<groupId>com.google.auto.value</groupId>
4451
<artifactId>auto-value</artifactId>
45-
<version>@project.version@</version>
52+
<version>${project.version}</version>
4653
<optional>true</optional>
4754
</dependency>
4855
<dependency>
@@ -135,6 +142,15 @@
135142
</execution>
136143
</executions>
137144
</plugin>
145+
<plugin>
146+
<groupId>org.apache.maven.plugins</groupId>
147+
<artifactId>maven-deploy-plugin</artifactId>
148+
<version>2.7</version>
149+
<configuration>
150+
<!-- Build/test, but don't deploy -->
151+
<skip>true</skip>
152+
</configuration>
153+
</plugin>
138154
</plugins>
139155
</build>
140156
</project>

0 commit comments

Comments
 (0)