Tidy poms and update plugin and test jar versions.

This commit is contained in:
Luke Taylor
2012-09-21 13:21:41 +01:00
parent 685adcf453
commit af5d591857
2 changed files with 50 additions and 60 deletions

90
pom.xml
View File

@@ -88,15 +88,15 @@
<id>com.springsource.repository.bundles.milestone</id>
<name>SpringSource Enterprise Bundle Repository - External Bundle Milestones</name>
<url>http://repository.springsource.com/maven/bundles/milestone</url>
</pluginRepository>
</pluginRepository>
</pluginRepositories>
<developers>
<developer>
<name>Mike Wiesner</name>
<id>mwiesner</id>
<organization>
SpringSource
</organization>
SpringSource
</organization>
</developer>
</developers>
<build>
@@ -104,7 +104,7 @@
<extension>
<groupId>org.springframework.build.aws</groupId>
<artifactId>org.springframework.build.aws.maven</artifactId>
<version>2.0.0.RELEASE</version>
<version>3.0.0.RELEASE</version>
</extension>
</extensions>
<pluginManagement>
@@ -127,23 +127,23 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-2</version>
<executions>
<execution>
<id>create-project-bundle</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptorRefs>
<descriptorRef>project</descriptorRef>
</descriptorRefs>
</configuration>
</execution>
</executions>
</plugin>
<executions>
<execution>
<id>create-project-bundle</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptorRefs>
<descriptorRef>project</descriptorRef>
</descriptorRefs>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
@@ -196,7 +196,7 @@
<artifactId>maven-war-plugin</artifactId>
<version>2.0.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
@@ -207,21 +207,11 @@
<artifactId>maven-deploy-plugin</artifactId>
<version>2.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.0-beta-7</version>
<configuration>
<tagBase>
https://src.springsource.org/svn/se-security/tags
</tagBase>
</configuration>
</plugin>
<!-- IDE -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<version>2.5.1</version>
<version>2.9</version>
<configuration>
<downloadSources>true</downloadSources>
<wtpversion>2.0</wtpversion>
@@ -235,8 +225,8 @@
<downloadSources>true</downloadSources>
<!--<downloadJavadocs>true</downloadJavadocs>-->
<dependenciesAsLibraries>
true
</dependenciesAsLibraries>
true
</dependenciesAsLibraries>
</configuration>
</plugin>
</plugins>
@@ -246,11 +236,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>2.4.2</version>
<version>2.11</version>
<!--
<configuration>
<aggregate>true</aggregate>
</configuration>
<configuration>
<aggregate>true</aggregate>
</configuration>
-->
</plugin>
<plugin>
@@ -288,17 +278,17 @@
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.0.1</version>
<!--
<reportSets>
<reportSet>
<reports>
<report>dependencies</report>
<report>project-team</report>
<report>mailing-list</report>
<report>issue-tracking</report>
<report>license</report>
</reports>
</reportSet>
</reportSets>
<reportSets>
<reportSet>
<reports>
<report>dependencies</report>
<report>project-team</report>
<report>mailing-list</report>
<report>issue-tracking</report>
<report>license</report>
</reports>
</reportSet>
</reportSets>
-->
</plugin>
</plugins>
@@ -306,6 +296,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<jetty.version>6.1.18</jetty.version>
<jetty.version>6.1.26</jetty.version>
</properties>
</project>

View File

@@ -17,28 +17,28 @@
<name>Mike Wiesner</name>
<id>mwiesner</id>
<organization>
SpringSource
</organization>
SpringSource
</organization>
</developer>
</developers>
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
</plugin>
</plugins>
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.7</version>
<version>4.10</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.8.5</version>
<version>1.9.0</version>
<scope>test</scope>
</dependency>
<dependency>