Skip to content
Closed
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
10 changes: 5 additions & 5 deletions guava-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@
<url>https://github.com/google/guava</url>
<inceptionYear>2010</inceptionYear>

<issueManagement>
<system>GitHub Issues</system>
<url>https://github.com/google/guava/issues</url>
</issueManagement>

<licenses>
<license>
<name>Apache License, Version 2.0</name>
Expand All @@ -29,6 +24,11 @@
</license>
</licenses>

<issueManagement>
<system>GitHub Issues</system>
<url>https://github.com/google/guava/issues</url>
</issueManagement>

<distributionManagement>
<snapshotRepository>
<id>sonatype-nexus-snapshots</id>
Expand Down
78 changes: 50 additions & 28 deletions guava-gwt/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,6 @@
<gwt.plugin.version>2.10.0</gwt.plugin.version>
<gwt.logLevel>WARN</gwt.logLevel>
</properties>
<repositories>
<repository>
<id>sonatype-google-snapshots</id>
<name>sonatype-google-snapshots</name>
<url>https://oss.sonatype.org/content/repositories/google-snapshots/</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>sonatype-snapshots</id>
<name>sonatype-snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
Expand Down Expand Up @@ -123,16 +103,38 @@
</exclusions>
</dependency>
</dependencies>
<repositories>
<repository>
<id>sonatype-google-snapshots</id>
<name>sonatype-google-snapshots</name>
<url>https://oss.sonatype.org/content/repositories/google-snapshots/</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>sonatype-snapshots</id>
<name>sonatype-snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
<build>
<plugins>
<plugin>
<groupId>org.mvnsearch</groupId>
<artifactId>toolchains-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
Expand All @@ -150,6 +152,7 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<excludes>
Expand All @@ -160,6 +163,7 @@
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<configuration>
<excludes>
Expand All @@ -170,6 +174,7 @@
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<sourceFileExcludes>
Expand All @@ -184,18 +189,22 @@
</plugin>
<!-- Disable "normal" testing, which doesn't work for GWT tests. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack-failureaccess-sources</id>
<phase>generate-resources</phase>
<goals><goal>unpack-dependencies</goal></goals>
<goals>
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<includeArtifactIds>failureaccess</includeArtifactIds>
<classifier>sources</classifier>
Expand All @@ -209,7 +218,9 @@
<execution>
<id>unpack-guava-sources</id>
<phase>generate-resources</phase>
<goals><goal>unpack-dependencies</goal></goals>
<goals>
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<includeArtifactIds>guava</includeArtifactIds>
<classifier>sources</classifier>
Expand All @@ -223,7 +234,9 @@
<execution>
<id>unpack-guava-testlib-sources</id>
<phase>generate-resources</phase>
<goals><goal>unpack-dependencies</goal></goals>
<goals>
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<includeArtifactIds>guava-testlib</includeArtifactIds>
<classifier>sources</classifier>
Expand All @@ -237,7 +250,9 @@
<execution>
<id>unpack-guava-testlib-test-sources</id>
<phase>generate-resources</phase>
<goals><goal>unpack-dependencies</goal></goals>
<goals>
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<includeArtifactIds>guava-testlib</includeArtifactIds>
<classifier>test-sources</classifier>
Expand All @@ -251,7 +266,9 @@
<execution>
<id>unpack-guava-test-sources</id>
<phase>generate-resources</phase>
<goals><goal>unpack-dependencies</goal></goals>
<goals>
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<includeArtifactIds>guava-tests</includeArtifactIds>
<classifier>test-sources</classifier>
Expand Down Expand Up @@ -297,12 +314,15 @@
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>copy-gwt-files</id>
<phase>generate-resources</phase>
<goals><goal>run</goal></goals>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target name="copy-gwt-resources">
<delete dir="${project.build.directory}/guava-gwt-sources" quiet="true" />
Expand Down Expand Up @@ -418,8 +438,10 @@
<extraJvmArgs>-Xms3500m -Xmx3500m -Xss1024k</extraJvmArgs>
<sourceLevel>1.8</sourceLevel>
<!-- Keep these timeouts very large because, if we hit the timeout, the tests silently pass :( -->
<testTimeOut>86400 <!-- seconds --></testTimeOut>
<testMethodTimeout>1440 <!-- minutes --></testMethodTimeout>
<testTimeOut>86400
<!-- seconds --></testTimeOut>
<testMethodTimeout>1440
<!-- minutes --></testMethodTimeout>
<!-- Presumably we want watchFileChanges=false here, since we want it for compile: -->
<extraJvmArgs>-Dgwt.watchFileChanges=false</extraJvmArgs>
</configuration>
Expand Down
6 changes: 6 additions & 0 deletions guava-testlib/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,11 @@
<artifactId>toolchains-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
Expand Down Expand Up @@ -112,6 +114,7 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
Expand All @@ -122,6 +125,7 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
Expand All @@ -135,9 +139,11 @@
<artifactId>animal-sniffer-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
</plugins>
Expand Down
6 changes: 6 additions & 0 deletions guava-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,15 @@
<artifactId>toolchains-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
Expand All @@ -89,9 +92,11 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
Expand All @@ -103,6 +108,7 @@
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>0.8.0</version>
<configuration>
<skipPublishing>true</skipPublishing>
</configuration>
Expand Down
11 changes: 9 additions & 2 deletions guava/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
<artifactId>guava</artifactId>
<packaging>bundle</packaging>
<name>Guava: Google Core Libraries for Java</name>
<url>https://github.com/google/guava</url>
<description>
Guava is a suite of core and expanded libraries that include
utility classes, Google's collections, I/O classes, and
much more.
</description>
<url>https://github.com/google/guava</url>
<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
Expand Down Expand Up @@ -46,7 +46,8 @@
<resource>
<directory>..</directory>
<includes>
<include>LICENSE</include> <!-- copied from the parent pom because I couldn't figure out a way to make combine.children="append" work -->
<include>LICENSE</include>
<!-- copied from the parent pom because I couldn't figure out a way to make combine.children="append" work -->
<include>proguard/*</include>
</includes>
<targetPath>META-INF</targetPath>
Expand All @@ -58,9 +59,11 @@
<artifactId>toolchains-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
</plugin>
<plugin>
Expand Down Expand Up @@ -98,6 +101,7 @@
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
Expand Down Expand Up @@ -140,13 +144,15 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<!-- Passing `-subpackages com.google.common` breaks things, so we explicitly exclude everything else instead. -->
Expand Down Expand Up @@ -202,6 +208,7 @@
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
Expand Down
Loading