GitHub-Spring
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

POM maintenance 

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@861 50f2f4bb-b051-0410-bef5-90022cba6387
pull/1/head
Mark Pollack 17 years ago
parent
454f2e18b2
commit
f8adb82ab3
8 changed files with 85 additions and 87 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      build-spring-framework/generate-pom.xml
  2. 34
      build-spring-framework/pom.xml
  3. 14
      org.springframework.aop/pom.xml
  4. 27
      org.springframework.asm/pom.xml
  5. 14
      org.springframework.context/pom.xml
  6. 18
      org.springframework.core/pom.xml
  7. 49
      org.springframework.orm/pom.xml
  8. 6
      org.springframework.test/pom.xml

10
build-spring-framework/generate-pom.xml
Unescape View File

@ -34,6 +34,14 @@ @@ -34,6 +34,14 @@
-->
</path>
<!--
<target name="create-poms" depends="clean,clean-integration,test"
description="Create a Maven pom for each module (use -Dbuild.stamp=m3-SNAPSHOT etc. to get the version number right).">
<all-bundles target="create-pom">
<property name="pom.output.file" value="pom.xml"/>
</all-bundles>
</target>
-->
<condition property="maven.extension" value=".bat" else="">
<os family="windows"/>
</condition>
@ -57,7 +65,7 @@ @@ -57,7 +65,7 @@
<delete file="pom.xml" quiet="true"/>
<delete file="pom-central.xml" quiet="true"/>
<delete file="central-pom.xml" quiet="true"/>
<ivy:makepom ivyfile="ivy.xml" pomfile="pom.xml">
<mapping conf="compile" scope="compile"/>

34
build-spring-framework/pom.xml
Unescape View File

@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
<url>http://mirror.cc.vt.edu/pub/eclipse/rt/eclipselink/maven.repo/</url>
</repository>
-->
<!-- for use with jexcelapi 2.6.8, portlet 2.0-->
<!-- for use with jexcelapi 2.6.8, portlet 2.0, hibernate 3.3.1-->
<repository>
<id>jboss</id>
<name>JBoss Repository</name>
@ -186,25 +186,31 @@ @@ -186,25 +186,31 @@
</build>
<modules>
<module>../org.springframework.aop</module>
<module>../org.springframework.aspects</module>
<module>../org.springframework.beans</module>
<module>../org.springframework.context</module>
<module>../org.springframework.context.support</module>
<module>../org.springframework.core</module>
<module>../org.springframework.expression</module>
<module>../org.springframework.instrument</module>
<module>../org.springframework.instrument.classloading</module>
<module>../org.springframework.integration-tests</module>
<module>../org.springframework.jdbc</module>
<module>../org.springframework.jms</module>
<module>../org.springframework.orm</module>
<module>../org.springframework.oxm</module>
<module>../org.springframework.test</module>
<module>../org.springframework.asm</module>
<module>../org.springframework.core</module>
<module>../org.springframework.expression</module>
<module>../org.springframework.core</module>
<module>../org.springframework.beans</module>
<module>../org.springframework.aop</module>
<module>../org.springframework.context</module>
<module>../org.springframework.transaction</module>
<module>../org.springframework.oxm</module>
<module>../org.springframework.jms</module>
<module>../org.springframework.aspects</module>
<module>../org.springframework.jdbc</module>
<module>../org.springframework.web</module>
<module>../org.springframework.orm</module>
<module>../org.springframework.context.support</module>
<module>../org.springframework.web.portlet</module>
<module>../org.springframework.web.servlet</module>
<module>../org.springframework.test</module>
<!--
<module>../org.springframework.integration-tests</module>
-->
</modules>
<url>http://static.springframework.org/docs</url>

14
org.springframework.aop/pom.xml
Unescape View File

@ -80,16 +80,10 @@ @@ -80,16 +80,10 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
<version>2.2.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>asm</groupId>
<artifactId>asm-commons</artifactId>
<version>2.2.3</version>
<scope>test</scope>
<groupId>org.springframework</groupId>
<artifactId>spring-asm</artifactId>
<version>3.0.0.M3</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>

27
org.springframework.asm/pom.xml
Unescape View File

@ -12,31 +12,4 @@ @@ -12,31 +12,4 @@
<version>3.0.0.M3</version>
</parent>
<dependencies>
<dependency>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
<version>2.2.3</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>asm</groupId>
<artifactId>asm-commons</artifactId>
<version>2.2.3</version>
<optional>true</optional>
</dependency>
</dependencies>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<junitArtifactName>junit:junit</junitArtifactName>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>

14
org.springframework.context/pom.xml
Unescape View File

@ -182,16 +182,10 @@ @@ -182,16 +182,10 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
<version>2.2.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>asm</groupId>
<artifactId>asm-commons</artifactId>
<version>2.2.3</version>
<scope>test</scope>
<groupId>org.springframework</groupId>
<artifactId>spring-asm</artifactId>
<version>3.0.0.M3</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>

18
org.springframework.core/pom.xml
Unescape View File

@ -19,6 +19,12 @@ @@ -19,6 +19,12 @@
<version>3.2</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-asm</artifactId>
<version>3.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
@ -37,18 +43,6 @@ @@ -37,18 +43,6 @@
<version>1.6.2</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
<version>2.2.3</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>asm</groupId>
<artifactId>asm-commons</artifactId>
<version>2.2.3</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>

49
org.springframework.orm/pom.xml
Unescape View File

@ -59,10 +59,23 @@ @@ -59,10 +59,23 @@
-->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate</artifactId>
<version>3.2.6.ga</version>
<artifactId>hibernate-core</artifactId>
<version>3.3.1.GA</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>2.1_3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>1.5.2</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
@ -185,16 +198,26 @@ @@ -185,16 +198,26 @@
</dependency>
</dependencies>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<junitArtifactName>junit:junit</junitArtifactName>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<testResources>
<testResource>
<directory>src/test/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
</testResource>
<testResource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xsd</include>
</includes>
</testResource>
<testResource>
<directory>../org.springframework.integration/src/main/java</directory>
<includes>
<include>**/*.xsd</include>
</includes>
</testResource>
</testResources>
</build>
</project>

6
org.springframework.test/pom.xml
Unescape View File

@ -152,6 +152,12 @@ @@ -152,6 +152,12 @@
<version>1.8.0.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>2.1_3</version>
<optional>true</optional>
</dependency>
</dependencies>
<build>
<pluginManagement>

Write Preview
Loading…
Cancel
Save