diff options
Diffstat (limited to 'guava-gwt/pom.xml')
| -rw-r--r-- | guava-gwt/pom.xml | 109 |
1 files changed, 22 insertions, 87 deletions
diff --git a/guava-gwt/pom.xml b/guava-gwt/pom.xml index 6b44fac..f087b3d 100644 --- a/guava-gwt/pom.xml +++ b/guava-gwt/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>com.google.guava</groupId> <artifactId>guava-parent</artifactId> - <version>14.0.1</version> + <version>11.0.2</version> </parent> <artifactId>guava-gwt</artifactId> <name>Guava GWT compatible libs</name> @@ -16,89 +16,53 @@ This project includes GWT-friendly sources. </description> - <properties> - <gwt.version>2.5.0-rc1</gwt.version> - </properties> <dependencies> - <!-- GWT requires a library's transitive dependencies to be present when compiling a project that uses that library, thanks to its full-program compilation, so we don't use scope=provided. --> <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> - <version>1.3.9</version> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> <version>${project.version}</version> + <classifier>sources</classifier> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.5</version> + <scope>test</scope> </dependency> <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-dev</artifactId> - <version>${gwt.version}</version> + <version>2.2.0</version> + <type>jar</type> <scope>provided</scope> </dependency> <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-user</artifactId> - <version>${gwt.version}</version> + <version>2.2.0</version> + <type>jar</type> <scope>provided</scope> </dependency> </dependencies> <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <version>2.3.2</version> <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <version>2.3.1</version> - <configuration> - <excludes> - <exclude>**/ForceGuavaCompilation*</exclude> - </excludes> - </configuration> - </plugin> - <plugin> - <artifactId>maven-source-plugin</artifactId> - <version>2.1.2</version> - <executions> - <execution> - <id>attach-sources</id> - <phase>post-integration-test</phase> - <goals><goal>jar</goal></goals> - </execution> - </executions> - <configuration> - <excludes> - <exclude>**/ForceGuavaCompilation*</exclude> - </excludes> + <source>1.5</source> + <target>1.5</target> </configuration> </plugin> <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.8</version> - <executions> - <execution> - <id>attach-docs</id> - <phase>post-integration-test</phase> - <goals><goal>jar</goal></goals> - </execution> - </executions> - </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> <artifactId>maven-dependency-plugin</artifactId> <version>2.3</version> <executions> @@ -111,6 +75,7 @@ <classifier>sources</classifier> <overWrite>true</overWrite> <excludeTransitive>true</excludeTransitive> + <includeScope>provided</includeScope> <excludes>META-INF/MANIFEST.MF</excludes> <outputDirectory>${project.build.directory}/guava-sources</outputDirectory> <type>java-source</type> @@ -118,16 +83,9 @@ </configuration> </execution> </executions> - <dependencies> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - </dependencies> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> <version>1.6</version> <executions> @@ -151,27 +109,9 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>gwt-maven-plugin</artifactId> - <version>${gwt.version}</version> - <executions> - <execution> - <id>gwt-compile</id> - <goals> - <goal>compile</goal> - </goals> - <configuration> - <module>com.google.common.ForceGuavaCompilation</module> - <strict>true</strict> - <validateOnly>true</validateOnly> - </configuration> - </execution> - </executions> - </plugin> </plugins> <sourceDirectory>src</sourceDirectory> - <testSourceDirectory>test</testSourceDirectory> + <testSourceDirectory>disabled</testSourceDirectory> <resources> <resource> <directory>src</directory> @@ -183,10 +123,5 @@ <directory>${project.build.directory}/guava-gwt-sources</directory> </resource> </resources> - <testResources> - <testResource> - <directory>test</directory> - </testResource> - </testResources> </build> </project> |