Merge pull request #3 from ealden/fix-maven-build-warnings

Fix maven build warnings
This commit is contained in:
Dave Syer
2011-10-17 05:31:54 -07:00
3 changed files with 23 additions and 13 deletions

View File

@@ -18,6 +18,7 @@
<maven.test.failure.ignore>true</maven.test.failure.ignore> <maven.test.failure.ignore>true</maven.test.failure.ignore>
<spring.framework.version>3.0.5.RELEASE</spring.framework.version> <spring.framework.version>3.0.5.RELEASE</spring.framework.version>
<spring.amqp.version>1.0.0.RELEASE</spring.amqp.version> <spring.amqp.version>1.0.0.RELEASE</spring.amqp.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
<profiles> <profiles>
<profile> <profile>
@@ -39,7 +40,7 @@
<groupId>org.springframework.amqp</groupId> <groupId>org.springframework.amqp</groupId>
<artifactId>spring-rabbit</artifactId> <artifactId>spring-rabbit</artifactId>
<version>${spring.amqp.version}</version> <version>${spring.amqp.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
@@ -70,15 +71,15 @@
<version>2.2</version> <version>2.2</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.8.1</version> <version>4.8.1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
@@ -102,7 +103,7 @@
<version>1.2.14</version> <version>1.2.14</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
@@ -128,6 +129,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration> <configuration>
<source>1.5</source> <source>1.5</source>
<target>1.5</target> <target>1.5</target>
@@ -136,6 +138,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.9</version>
<configuration> <configuration>
<!--forkMode>pertest</forkMode--> <!--forkMode>pertest</forkMode-->
<includes> <includes>
@@ -162,7 +165,7 @@
<downloadUrl>http://www.springframework.org/download</downloadUrl> <downloadUrl>http://www.springframework.org/download</downloadUrl>
<site> <site>
<id>staging</id> <id>staging</id>
<url>file:///${user.dir}/target/staging/org.springframework.batch.archetype/${pom.artifactId}</url> <url>file:///${user.dir}/target/staging/org.springframework.batch.archetype/${project.artifactId}</url>
</site> </site>
<repository> <repository>
<id>spring-release</id> <id>spring-release</id>

View File

@@ -18,6 +18,7 @@
<maven.test.failure.ignore>true</maven.test.failure.ignore> <maven.test.failure.ignore>true</maven.test.failure.ignore>
<spring.framework.version>3.0.5.RELEASE</spring.framework.version> <spring.framework.version>3.0.5.RELEASE</spring.framework.version>
<spring.amqp.version>1.0.0.RELEASE</spring.amqp.version> <spring.amqp.version>1.0.0.RELEASE</spring.amqp.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
<profiles> <profiles>
<profile> <profile>
@@ -93,12 +94,12 @@
<version>2.2</version> <version>2.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>aspectj</groupId> <groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId> <artifactId>aspectjrt</artifactId>
<version>1.5.4</version> <version>1.5.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>aspectj</groupId> <groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId> <artifactId>aspectjweaver</artifactId>
<version>1.5.4</version> <version>1.5.4</version>
</dependency> </dependency>
@@ -155,10 +156,12 @@
<plugin> <plugin>
<groupId>org.mortbay.jetty</groupId> <groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId> <artifactId>maven-jetty-plugin</artifactId>
<version>6.1.26</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration> <configuration>
<source>1.5</source> <source>1.5</source>
<target>1.5</target> <target>1.5</target>
@@ -167,6 +170,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.9</version>
<configuration> <configuration>
<!--forkMode>pertest</forkMode --> <!--forkMode>pertest</forkMode -->
<includes> <includes>
@@ -193,7 +197,7 @@
<downloadUrl>http://www.springframework.org/download</downloadUrl> <downloadUrl>http://www.springframework.org/download</downloadUrl>
<site> <site>
<id>staging</id> <id>staging</id>
<url>file:///${user.dir}/target/staging/org.springframework.batch.archetype/${pom.artifactId}</url> <url>file:///${user.dir}/target/staging/org.springframework.batch.archetype/${project.artifactId}</url>
</site> </site>
<repository> <repository>
<id>spring-release</id> <id>spring-release</id>
@@ -208,4 +212,3 @@
</distributionManagement> </distributionManagement>
</project> </project>

View File

@@ -17,6 +17,7 @@
<maven.test.failure.ignore>true</maven.test.failure.ignore> <maven.test.failure.ignore>true</maven.test.failure.ignore>
<spring.framework.version>3.0.5.RELEASE</spring.framework.version> <spring.framework.version>3.0.5.RELEASE</spring.framework.version>
<spring.amqp.version>1.0.0.RELEASE</spring.amqp.version> <spring.amqp.version>1.0.0.RELEASE</spring.amqp.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
<profiles> <profiles>
<profile> <profile>
@@ -92,12 +93,12 @@
<version>2.2</version> <version>2.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>aspectj</groupId> <groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId> <artifactId>aspectjrt</artifactId>
<version>1.5.4</version> <version>1.5.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>aspectj</groupId> <groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId> <artifactId>aspectjweaver</artifactId>
<version>1.5.4</version> <version>1.5.4</version>
</dependency> </dependency>
@@ -154,10 +155,12 @@
<plugin> <plugin>
<groupId>org.mortbay.jetty</groupId> <groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId> <artifactId>maven-jetty-plugin</artifactId>
<version>6.1.26</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration> <configuration>
<source>1.5</source> <source>1.5</source>
<target>1.5</target> <target>1.5</target>
@@ -166,6 +169,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.9</version>
<configuration> <configuration>
<!--forkMode>pertest</forkMode --> <!--forkMode>pertest</forkMode -->
<includes> <includes>
@@ -192,7 +196,7 @@
<downloadUrl>http://www.springframework.org/download</downloadUrl> <downloadUrl>http://www.springframework.org/download</downloadUrl>
<site> <site>
<id>staging</id> <id>staging</id>
<url>file:///${user.dir}/target/staging/org.springframework.batch.archetype/${pom.artifactId}</url> <url>file:///${user.dir}/target/staging/org.springframework.batch.archetype/${project.artifactId}</url>
</site> </site>
<repository> <repository>
<id>spring-release</id> <id>spring-release</id>