DATACMNS-103 - Improved 3.1 build.

We now use an exclusive upper bound of 4.0.0.RELEASE for Spring dependencies. With the snapshot repository removed we now get the latest release milestone to build on. Changed repository links to use http://repo.springframework.org to route dependencies through our Artifactory instance. Fixed some plugin dependency versions along the way.
This commit is contained in:
Oliver Gierke
2011-12-01 13:04:03 +01:00
parent 7d2314ab7e
commit 5eaa87ceb0
2 changed files with 12 additions and 9 deletions

View File

@@ -159,7 +159,7 @@
<entities>
<entity>
<name>version</name>
<value>${pom.version}</value>
<value>${project.version}</value>
</entity>
</entities>
<postProcess>
@@ -285,11 +285,13 @@
<plugins>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<version>2.1.2</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jxr-maven-plugin</artifactId>
<version>2.0-beta-1</version>
</plugin>
<!-- ============== -->
@@ -320,10 +322,12 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jdepend-maven-plugin</artifactId>
<version>2.0-beta-2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>2.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>

View File

@@ -15,7 +15,8 @@
<log4j.version>1.2.16</log4j.version>
<org.mockito.version>1.8.4</org.mockito.version>
<org.springframework.version.30>3.0.6.RELEASE</org.springframework.version.30>
<org.springframework.version>[${org.springframework.version.30}, 3.1.0.RC2]</org.springframework.version>
<org.springframework.version.40>4.0.0.RELEASE</org.springframework.version.40>
<org.springframework.version>[${org.springframework.version.30}, ${org.springframework.version.40}]</org.springframework.version>
<org.hamcrest.version>1.2.1</org.hamcrest.version>
</properties>
<profiles>
@@ -244,6 +245,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@ -263,6 +265,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.8</version>
<configuration>
<useFile>false</useFile>
<includes>
@@ -277,6 +280,7 @@
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<version>2.1.2</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -344,17 +348,12 @@
<repository>
<id>repository.springframework.maven.release</id>
<name>Spring Framework Maven Release Repository</name>
<url>http://maven.springframework.org/release</url>
<url>http://repo.springframework.org/release</url>
</repository>
<repository>
<id>repository.springframework.maven.milestone</id>
<name>Spring Framework Maven Milestone Repository</name>
<url>http://maven.springframework.org/milestone</url>
</repository>
<repository>
<id>repository.springframework.maven.snapshot</id>
<name>Spring Framework Maven Snapshot Repository</name>
<url>http://maven.springframework.org/snapshot</url>
<url>http://repo.springframework.org/milestone</url>
</repository>
<repository>
<id>querydsl</id>