Skip to content

Commit 0b463c0

Browse files
markpollackmarkpollack
committed
SPR-5385, SPR-5301 - partial work committed.
1 parent 6ca253e commit 0b463c0

File tree

10 files changed

+1030
-475
lines changed
  • build-spring-framework
  • org.springframework.aop
  • org.springframework.beans
  • org.springframework.context.support
  • org.springframework.context
  • org.springframework.core
  • org.springframework.expression
  • org.springframework.instrument.classloading
  • org.springframework.instrument
  • org.springframework.transaction

10 files changed

+1030
-475
lines changed

‎build-spring-framework/pom.xml‎

Lines changed: 168 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,168 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4+
5+
<modelVersion>4.0.0</modelVersion>
6+
<groupId>org.springframework</groupId>
7+
<artifactId>org.springframework.parent</artifactId>
8+
<name>Spring Framework</name>
9+
<version>3.0.0.M3</version>
10+
<packaging>pom</packaging>
11+
12+
<repositories>
13+
<repository>
14+
<id>java.net</id>
15+
<name>Java.net Repository for Maven</name>
16+
<url>http://download.java.net/maven/1/</url>
17+
<layout>legacy</layout>
18+
</repository>
19+
<!-- for websphere uow -->
20+
<repository>
21+
<id>maven.seasar.org</id>
22+
<name>The Seasar Foundation Maven2 Repository</name>
23+
<url>http://maven.seasar.org/maven2</url>
24+
</repository>
25+
</repositories>
26+
27+
<dependencyManagement>
28+
<dependencies>
29+
<dependency>
30+
<groupId>javax.xml.ws</groupId>
31+
<artifactId>jaxws-api</artifactId>
32+
<version>2.1-1</version>
33+
<exclusions>
34+
<exclusion>
35+
<groupId>javax.jws</groupId>
36+
<artifactId>jsr181</artifactId>
37+
</exclusion>
38+
</exclusions>
39+
</dependency>
40+
<!--
41+
<dependency>
42+
<artifactId>org.springframework</artifactId>
43+
<groupId>spring-context</groupId>
44+
<version>3.0.0.M3</version>
45+
<exclusions>
46+
<exclusion>
47+
<groupId>com.oracle.oc4j</groupId>
48+
<artifactId>oracle.classloader</artifactId>
49+
</exclusion>
50+
</exclusions>
51+
</dependency>
52+
-->
53+
</dependencies>
54+
</dependencyManagement>
55+
56+
<profiles>
57+
<profile>
58+
<id>strict</id>
59+
<properties>
60+
<maven.test.failure.ignore>false</maven.test.failure.ignore>
61+
</properties>
62+
</profile>
63+
<profile>
64+
<id>fast</id>
65+
<properties>
66+
<maven.test.skip>true</maven.test.skip>
67+
<maven.javadoc.skip>true</maven.javadoc.skip>
68+
</properties>
69+
</profile>
70+
<profile>
71+
<id>staging</id>
72+
<distributionManagement>
73+
<site>
74+
<id>staging</id>
75+
<url>file:///${user.dir}/target/staging</url>
76+
</site>
77+
<repository>
78+
<id>staging</id>
79+
<url>file:///${user.dir}/target/staging</url>
80+
</repository>
81+
<snapshotRepository>
82+
<id>staging</id>
83+
<url>file:///${user.dir}/target/staging</url>
84+
</snapshotRepository>
85+
</distributionManagement>
86+
</profile>
87+
<profile>
88+
<id>release</id>
89+
<build>
90+
<plugins>
91+
<plugin>
92+
<artifactId>maven-javadoc-plugin</artifactId>
93+
<executions>
94+
<execution>
95+
<id>javadoc</id>
96+
<phase>package</phase>
97+
<goals>
98+
<goal>jar</goal>
99+
</goals>
100+
</execution>
101+
</executions>
102+
</plugin>
103+
<plugin>
104+
<artifactId>maven-source-plugin</artifactId>
105+
<executions>
106+
<execution>
107+
<id>attach-sources</id>
108+
<goals>
109+
<goal>jar</goal>
110+
</goals>
111+
</execution>
112+
</executions>
113+
</plugin>
114+
</plugins>
115+
</build>
116+
</profile>
117+
</profiles>
118+
119+
<modules>
120+
<module>../org.springframework.aop</module>
121+
<module>../org.springframework.aspects</module>
122+
<module>../org.springframework.beans</module>
123+
<module>../org.springframework.context</module>
124+
<module>../org.springframework.context.support</module>
125+
<module>../org.springframework.core</module>
126+
<module>../org.springframework.expression</module>
127+
<module>../org.springframework.instrument</module>
128+
<module>../org.springframework.instrument.classloading</module>
129+
<module>../org.springframework.integration-tests</module>
130+
<module>../org.springframework.jdbc</module>
131+
<module>../org.springframework.jms</module>
132+
<module>../org.springframework.orm</module>
133+
<module>../org.springframework.oxm</module>
134+
<module>../org.springframework.test</module>
135+
<module>../org.springframework.transaction</module>
136+
<module>../org.springframework.web</module>
137+
<module>../org.springframework.web.portlet</module>
138+
<module>../org.springframework.web.servlet</module>
139+
</modules>
140+
141+
<url>http://static.springframework.org/docs</url>
142+
<organization>
143+
<name>SpringSource</name>
144+
<url>http://www.springsource.com</url>
145+
</organization>
146+
<pluginRepositories>
147+
<pluginRepository>
148+
<id>com.springsource.repository.bundles.milestone</id>
149+
<name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Milestones</name>
150+
<url>http://repository.springsource.com/maven/bundles/milestone</url>
151+
<snapshots>
152+
<enabled>false</enabled>
153+
</snapshots>
154+
</pluginRepository>
155+
<pluginRepository>
156+
<id>com.springsource.repository.bundles.snapshot</id>
157+
<name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Snapshots</name>
158+
<url>http://repository.springsource.com/maven/bundles/snapshot</url>
159+
</pluginRepository>
160+
<pluginRepository>
161+
<id>agilejava</id>
162+
<url>http://agilejava.com/maven</url>
163+
<snapshots>
164+
<enabled>false</enabled>
165+
</snapshots>
166+
</pluginRepository>
167+
</pluginRepositories>
168+
</project>

‎org.springframework.aop/pom.xml‎

Lines changed: 108 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,108 @@
1-
<?xml version="1.0"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
4-
<groupId>org.springframework</groupId>
5-
<artifactId>org.springframework.aop</artifactId>
6-
<packaging>jar</packaging>
7-
<name>Spring Core Abstractions and Utilities</name>
8-
<version>3.0.0.M1</version>
9-
<repositories>
10-
<repository>
11-
<id>com.springsource.repository.bundles.external</id>
12-
<name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
13-
<url>http://repository.springsource.com/maven/bundles/external</url>
14-
</repository>
15-
</repositories>
16-
<build>
17-
<plugins>
18-
<plugin>
19-
<groupId>org.apache.maven.plugins</groupId>
20-
<artifactId>maven-compiler-plugin</artifactId>
21-
<configuration>
22-
<source>1.5</source>
23-
<target>1.5</target>
24-
</configuration>
25-
</plugin>
26-
</plugins>
27-
</build>
28-
<dependencies>
29-
<dependency>
30-
<groupId>commons-logging</groupId>
31-
<artifactId>commons-logging</artifactId>
32-
<version>1.1.1</version>
33-
</dependency>
34-
<dependency>
35-
<groupId>org.aopalliance</groupId>
36-
<artifactId>com.springsource.org.aopalliance</artifactId>
37-
<version>1.0.0</version>
38-
</dependency>
39-
<dependency>
40-
<groupId>org.apache.commons</groupId>
41-
<artifactId>com.springsource.org.apache.commons.pool</artifactId>
42-
<version>1.4.0</version>
43-
<optional>true</optional>
44-
</dependency>
45-
</dependencies>
46-
</project>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>org.springframework</groupId>
5+
<artifactId>spring-aop</artifactId>
6+
<packaging>jar</packaging>
7+
<version>3.0.0.M3</version>
8+
<parent>
9+
<groupId>org.springframework</groupId>
10+
<artifactId>org.springframework.parent</artifactId>
11+
<relativePath>../build-spring-framework</relativePath>
12+
<version>3.0.0.M3</version>
13+
</parent>
14+
15+
<dependencies>
16+
<dependency>
17+
<groupId>com.jamonapi</groupId>
18+
<artifactId>jamon</artifactId>
19+
<version>2.4</version>
20+
<optional>true</optional>
21+
</dependency>
22+
<dependency>
23+
<groupId>cglib</groupId>
24+
<artifactId>cglib-nodep</artifactId>
25+
<version>2.1_3</version>
26+
<optional>true</optional>
27+
</dependency>
28+
<dependency>
29+
<groupId>aopalliance</groupId>
30+
<artifactId>aopalliance</artifactId>
31+
<version>1.0</version>
32+
<scope>compile</scope>
33+
</dependency>
34+
<dependency>
35+
<groupId>commons-logging</groupId>
36+
<artifactId>commons-logging</artifactId>
37+
<version>1.1.1</version>
38+
<scope>compile</scope>
39+
</dependency>
40+
<dependency>
41+
<groupId>commons-pool</groupId>
42+
<artifactId>commons-pool</artifactId>
43+
<version>1.4</version>
44+
<optional>true</optional>
45+
</dependency>
46+
<dependency>
47+
<groupId>org.aspectj</groupId>
48+
<artifactId>aspectjweaver</artifactId>
49+
<version>1.6.2</version>
50+
<optional>true</optional>
51+
</dependency>
52+
<dependency>
53+
<groupId>org.springframework</groupId>
54+
<artifactId>spring-beans</artifactId>
55+
<version>3.0.0.M3</version>
56+
<scope>compile</scope>
57+
</dependency>
58+
<dependency>
59+
<groupId>org.springframework</groupId>
60+
<artifactId>spring-core</artifactId>
61+
<version>3.0.0.M3</version>
62+
<scope>compile</scope>
63+
</dependency>
64+
<dependency>
65+
<groupId>log4j</groupId>
66+
<artifactId>log4j</artifactId>
67+
<version>1.2.14</version>
68+
<scope>test</scope>
69+
</dependency>
70+
<dependency>
71+
<groupId>org.easymock</groupId>
72+
<artifactId>easymock</artifactId>
73+
<version>2.3</version>
74+
<scope>test</scope>
75+
</dependency>
76+
<dependency>
77+
<groupId>junit</groupId>
78+
<artifactId>junit</artifactId>
79+
<version>4.5</version>
80+
<scope>test</scope>
81+
</dependency>
82+
<dependency>
83+
<groupId>asm</groupId>
84+
<artifactId>asm</artifactId>
85+
<version>2.2.3</version>
86+
<scope>test</scope>
87+
</dependency>
88+
<dependency>
89+
<groupId>asm</groupId>
90+
<artifactId>asm-commons</artifactId>
91+
<version>2.2.3</version>
92+
<scope>test</scope>
93+
</dependency>
94+
</dependencies>
95+
<build>
96+
<pluginManagement>
97+
<plugins>
98+
<plugin>
99+
<groupId>org.apache.maven.plugins</groupId>
100+
<artifactId>maven-surefire-plugin</artifactId>
101+
<configuration>
102+
<junitArtifactName>junit:junit</junitArtifactName>
103+
</configuration>
104+
</plugin>
105+
</plugins>
106+
</pluginManagement>
107+
</build>
108+
</project>

0 commit comments

Comments
 (0)