Skip to content

Commit 8f4ad7e

Browse files
Vincent PotucekGoogle Java Core Libraries
Vincent Potucek
authored and
Google Java Core Libraries
committed
Sort pom.xml contents in conventional order, and add a TODO about central-publishing-maven-plugin versioning.
Fixes #7961 RELNOTES=n/a PiperOrigin-RevId: 804600714
1 parent 030079f commit 8f4ad7e

File tree

9 files changed

+187
-185
lines changed

9 files changed

+187
-185
lines changed

‎android/guava-bom/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@
1616
<url>https://github.com/google/guava</url>
1717
<inceptionYear>2010</inceptionYear>
1818

19-
<issueManagement>
20-
<system>GitHub Issues</system>
21-
<url>https://github.com/google/guava/issues</url>
22-
</issueManagement>
23-
2419
<licenses>
2520
<license>
2621
<name>Apache License, Version 2.0</name>
@@ -29,6 +24,11 @@
2924
</license>
3025
</licenses>
3126

27+
<issueManagement>
28+
<system>GitHub Issues</system>
29+
<url>https://github.com/google/guava/issues</url>
30+
</issueManagement>
31+
3232
<distributionManagement>
3333
<snapshotRepository>
3434
<id>sonatype-nexus-snapshots</id>

‎android/guava-tests/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
<plugin>
9898
<groupId>org.sonatype.central</groupId>
9999
<artifactId>central-publishing-maven-plugin</artifactId>
100+
<!-- TODO(cpovirk): Set a plugin version here, or find a different way to skip publishing for guava-tests. -->
100101
<configuration>
101102
<skipPublishing>true</skipPublishing>
102103
</configuration>

‎android/guava/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
<artifactId>guava</artifactId>
1212
<packaging>bundle</packaging>
1313
<name>Guava: Google Core Libraries for Java</name>
14-
<url>https://github.com/google/guava</url>
1514
<description>
1615
Guava is a suite of core and expanded libraries that include
1716
utility classes, Google's collections, I/O classes, and
1817
much more.
1918
</description>
19+
<url>https://github.com/google/guava</url>
2020
<dependencies>
2121
<dependency>
2222
<groupId>com.google.guava</groupId>

‎android/pom.xml‎

Lines changed: 76 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,58 @@
1111
<name>Guava Maven Parent</name>
1212
<description>Parent for guava artifacts</description>
1313
<url>https://github.com/google/guava</url>
14+
<inceptionYear>2010</inceptionYear>
15+
<licenses>
16+
<license>
17+
<name>Apache License, Version 2.0</name>
18+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
19+
<distribution>repo</distribution>
20+
</license>
21+
</licenses>
22+
<developers>
23+
<developer>
24+
<id>kevinb9n</id>
25+
<name>Kevin Bourrillion</name>
26+
<email>[email protected]</email>
27+
<organization>Google</organization>
28+
<organizationUrl>http://www.google.com</organizationUrl>
29+
<roles>
30+
<role>owner</role>
31+
<role>developer</role>
32+
</roles>
33+
<timezone>-8</timezone>
34+
</developer>
35+
</developers>
36+
<modules>
37+
<module>guava</module>
38+
<module>guava-bom</module>
39+
<module>guava-testlib</module>
40+
<module>guava-tests</module>
41+
</modules>
42+
<scm>
43+
<connection>scm:git:https://github.com/google/guava.git</connection>
44+
<developerConnection>scm:git:[email protected]:google/guava.git</developerConnection>
45+
<url>https://github.com/google/guava</url>
46+
</scm>
47+
<issueManagement>
48+
<system>GitHub Issues</system>
49+
<url>https://github.com/google/guava/issues</url>
50+
</issueManagement>
51+
<ciManagement>
52+
<system>GitHub Actions</system>
53+
<url>https://github.com/google/guava/actions</url>
54+
</ciManagement>
55+
<distributionManagement>
56+
<snapshotRepository>
57+
<id>sonatype-nexus-snapshots</id>
58+
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
59+
</snapshotRepository>
60+
<site>
61+
<id>guava-site</id>
62+
<name>Guava Documentation Site</name>
63+
<url>scp://dummy.server/dontinstall/usestaging</url>
64+
</site>
65+
</distributionManagement>
1466
<properties>
1567
<!--
1668
When building Guava, you can pass (e.g.) `-Dsurefire.toolchain.version=21` to change which version to run tests under.
@@ -45,47 +97,30 @@
4597
<otherVariant.jvmEnvironment>standard-jvm</otherVariant.jvmEnvironment>
4698
<otherVariant.jvmEnvironmentVariantName>jre</otherVariant.jvmEnvironmentVariantName>
4799
</properties>
48-
<issueManagement>
49-
<system>GitHub Issues</system>
50-
<url>https://github.com/google/guava/issues</url>
51-
</issueManagement>
52-
<inceptionYear>2010</inceptionYear>
53-
<licenses>
54-
<license>
55-
<name>Apache License, Version 2.0</name>
56-
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
57-
<distribution>repo</distribution>
58-
</license>
59-
</licenses>
60-
<scm>
61-
<connection>scm:git:https://github.com/google/guava.git</connection>
62-
<developerConnection>scm:git:[email protected]:google/guava.git</developerConnection>
63-
<url>https://github.com/google/guava</url>
64-
</scm>
65-
<developers>
66-
<developer>
67-
<id>kevinb9n</id>
68-
<name>Kevin Bourrillion</name>
69-
<email>[email protected]</email>
70-
<organization>Google</organization>
71-
<organizationUrl>http://www.google.com</organizationUrl>
72-
<roles>
73-
<role>owner</role>
74-
<role>developer</role>
75-
</roles>
76-
<timezone>-8</timezone>
77-
</developer>
78-
</developers>
79-
<ciManagement>
80-
<system>GitHub Actions</system>
81-
<url>https://github.com/google/guava/actions</url>
82-
</ciManagement>
83-
<modules>
84-
<module>guava</module>
85-
<module>guava-bom</module>
86-
<module>guava-testlib</module>
87-
<module>guava-tests</module>
88-
</modules>
100+
<dependencyManagement>
101+
<dependencies>
102+
<dependency>
103+
<groupId>org.jspecify</groupId>
104+
<artifactId>jspecify</artifactId>
105+
<version>${jspecify.version}</version>
106+
</dependency>
107+
<dependency>
108+
<groupId>com.google.errorprone</groupId>
109+
<artifactId>error_prone_annotations</artifactId>
110+
<version>${errorprone.version}</version>
111+
</dependency>
112+
<dependency>
113+
<groupId>com.google.j2objc</groupId>
114+
<artifactId>j2objc-annotations</artifactId>
115+
<version>${j2objc.version}</version>
116+
</dependency>
117+
<!--
118+
We moved away from using dependencyManagement for test-only deps because of https://github.com/google/guava/issues/6654.
119+
We could probably have resumed it after https://github.com/google/guava/pull/6664.
120+
But it's always weird that published poms reference test-only libraries at all, so I'm not in any rush to do so.
121+
-->
122+
</dependencies>
123+
</dependencyManagement>
89124
<build>
90125
<!-- Handle where Guava deviates from Maven defaults -->
91126
<sourceDirectory>src</sourceDirectory>
@@ -430,41 +465,6 @@
430465
</plugins>
431466
</pluginManagement>
432467
</build>
433-
<distributionManagement>
434-
<snapshotRepository>
435-
<id>sonatype-nexus-snapshots</id>
436-
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
437-
</snapshotRepository>
438-
<site>
439-
<id>guava-site</id>
440-
<name>Guava Documentation Site</name>
441-
<url>scp://dummy.server/dontinstall/usestaging</url>
442-
</site>
443-
</distributionManagement>
444-
<dependencyManagement>
445-
<dependencies>
446-
<dependency>
447-
<groupId>org.jspecify</groupId>
448-
<artifactId>jspecify</artifactId>
449-
<version>${jspecify.version}</version>
450-
</dependency>
451-
<dependency>
452-
<groupId>com.google.errorprone</groupId>
453-
<artifactId>error_prone_annotations</artifactId>
454-
<version>${errorprone.version}</version>
455-
</dependency>
456-
<dependency>
457-
<groupId>com.google.j2objc</groupId>
458-
<artifactId>j2objc-annotations</artifactId>
459-
<version>${j2objc.version}</version>
460-
</dependency>
461-
<!--
462-
We moved away from using dependencyManagement for test-only deps because of https://github.com/google/guava/issues/6654.
463-
We could probably have resumed it after https://github.com/google/guava/pull/6664.
464-
But it's always weird that published poms reference test-only libraries at all, so I'm not in any rush to do so.
465-
-->
466-
</dependencies>
467-
</dependencyManagement>
468468
<profiles>
469469
<profile>
470470
<id>sonatype-oss-release</id>

‎guava-bom/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@
1616
<url>https://github.com/google/guava</url>
1717
<inceptionYear>2010</inceptionYear>
1818

19-
<issueManagement>
20-
<system>GitHub Issues</system>
21-
<url>https://github.com/google/guava/issues</url>
22-
</issueManagement>
23-
2419
<licenses>
2520
<license>
2621
<name>Apache License, Version 2.0</name>
@@ -29,6 +24,11 @@
2924
</license>
3025
</licenses>
3126

27+
<issueManagement>
28+
<system>GitHub Issues</system>
29+
<url>https://github.com/google/guava/issues</url>
30+
</issueManagement>
31+
3232
<distributionManagement>
3333
<snapshotRepository>
3434
<id>sonatype-nexus-snapshots</id>

‎guava-gwt/pom.xml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,26 +21,6 @@
2121
<gwt.plugin.version>2.10.0</gwt.plugin.version>
2222
<gwt.logLevel>WARN</gwt.logLevel>
2323
</properties>
24-
<repositories>
25-
<repository>
26-
<id>sonatype-google-snapshots</id>
27-
<name>sonatype-google-snapshots</name>
28-
<url>https://oss.sonatype.org/content/repositories/google-snapshots/</url>
29-
<snapshots>
30-
<enabled>true</enabled>
31-
</snapshots>
32-
</repository>
33-
</repositories>
34-
<pluginRepositories>
35-
<pluginRepository>
36-
<id>sonatype-snapshots</id>
37-
<name>sonatype-snapshots</name>
38-
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
39-
<snapshots>
40-
<enabled>true</enabled>
41-
</snapshots>
42-
</pluginRepository>
43-
</pluginRepositories>
4424
<dependencies>
4525
<dependency>
4626
<groupId>com.google.guava</groupId>
@@ -123,6 +103,26 @@
123103
</exclusions>
124104
</dependency>
125105
</dependencies>
106+
<repositories>
107+
<repository>
108+
<id>sonatype-google-snapshots</id>
109+
<name>sonatype-google-snapshots</name>
110+
<url>https://oss.sonatype.org/content/repositories/google-snapshots/</url>
111+
<snapshots>
112+
<enabled>true</enabled>
113+
</snapshots>
114+
</repository>
115+
</repositories>
116+
<pluginRepositories>
117+
<pluginRepository>
118+
<id>sonatype-snapshots</id>
119+
<name>sonatype-snapshots</name>
120+
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
121+
<snapshots>
122+
<enabled>true</enabled>
123+
</snapshots>
124+
</pluginRepository>
125+
</pluginRepositories>
126126
<build>
127127
<plugins>
128128
<plugin>

‎guava-tests/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@
103103
<plugin>
104104
<groupId>org.sonatype.central</groupId>
105105
<artifactId>central-publishing-maven-plugin</artifactId>
106+
<!-- TODO(cpovirk): Set a plugin version here, or find a different way to skip publishing for guava-tests. -->
106107
<configuration>
107108
<skipPublishing>true</skipPublishing>
108109
</configuration>

‎guava/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
<artifactId>guava</artifactId>
1212
<packaging>bundle</packaging>
1313
<name>Guava: Google Core Libraries for Java</name>
14-
<url>https://github.com/google/guava</url>
1514
<description>
1615
Guava is a suite of core and expanded libraries that include
1716
utility classes, Google's collections, I/O classes, and
1817
much more.
1918
</description>
19+
<url>https://github.com/google/guava</url>
2020
<dependencies>
2121
<dependency>
2222
<groupId>com.google.guava</groupId>

0 commit comments

Comments
 (0)