Skip to content

Commit 99c5a70

Browse files
jhoellerjhoeller
committed
added optional JPA dependency to spring-aspects POM (SPR-6819)
1 parent d87a947 commit 99c5a70

2 files changed

Lines changed: 122 additions & 116 deletions

File tree

‎org.springframework.aspects/ivy.xml‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
3-
<ivy-module
4-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
6-
version="1.3">
7-
8-
<info organisation="org.springframework" module="${ant.project.name}">
9-
<license name="Apache 2.0" url="http://www.apache.org/licenses/LICENSE-2.0"/>
10-
</info>
11-
12-
<configurations>
13-
<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
14-
<conf name="commons-logging" extends="runtime" description="JARs needed to run with Commons Logging"/>
15-
<conf name="aspectj" extends="runtime" description="JARs needed to run with AspectJ"/>
16-
<conf name="tx" extends="runtime" description="JARs needed to run transactional aspects"/>
17-
<conf name="orm" extends="runtime" description="JARs needed to compile JPA aspects"/>
18-
</configurations>
19-
20-
<publications>
21-
<artifact name="${ant.project.name}"/>
22-
<artifact name="${ant.project.name}-sources" type="src" ext="jar"/>
23-
</publications>
24-
25-
<dependencies>
26-
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
27-
<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional, aspectj->compile"/>
28-
<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="test->compile"/>
29-
<dependency org="org.springframework" name="org.springframework.transaction" rev="latest.integration" conf="optional, tx->compile"/>
30-
<dependency org="org.springframework" name="org.springframework.orm" rev="latest.integration" conf="optional,orm->compile"/>
31-
<dependency org="org.springframework" name="org.springframework.test" rev="latest.integration" conf="test->runtime"/>
32-
<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="test->runtime"/>
33-
<dependency org="org.springframework" name="org.springframework.context.support" rev="latest.integration" conf="test->runtime"/>
34-
<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->compile"/>
35-
<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="provided, compile->compile"/>
36-
<dependency org="javax.mail" name="com.springsource.javax.mail" rev="1.4.0" conf="test->compile"/>
37-
</dependencies>
38-
39-
</ivy-module>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
3+
<ivy-module
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
6+
version="1.3">
7+
8+
<info organisation="org.springframework" module="${ant.project.name}">
9+
<license name="Apache 2.0" url="http://www.apache.org/licenses/LICENSE-2.0"/>
10+
</info>
11+
12+
<configurations>
13+
<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
14+
<conf name="commons-logging" extends="runtime" description="JARs needed to run with Commons Logging"/>
15+
<conf name="aspectj" extends="runtime" description="JARs needed to run with AspectJ"/>
16+
<conf name="tx" extends="runtime" description="JARs needed to run transactional aspects"/>
17+
<conf name="orm" extends="runtime" description="JARs needed to compile JPA aspects"/>
18+
</configurations>
19+
20+
<publications>
21+
<artifact name="${ant.project.name}"/>
22+
<artifact name="${ant.project.name}-sources" type="src" ext="jar"/>
23+
</publications>
24+
25+
<dependencies>
26+
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
27+
<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional, aspectj->compile"/>
28+
<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="test->compile"/>
29+
<dependency org="org.springframework" name="org.springframework.transaction" rev="latest.integration" conf="optional, tx->compile"/>
30+
<dependency org="org.springframework" name="org.springframework.orm" rev="latest.integration" conf="optional, orm->compile"/>
31+
<dependency org="org.springframework" name="org.springframework.test" rev="latest.integration" conf="test->runtime"/>
32+
<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="test->runtime"/>
33+
<dependency org="org.springframework" name="org.springframework.context.support" rev="latest.integration" conf="test->runtime"/>
34+
<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->compile"/>
35+
<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="optional, compile->compile"/>
36+
<dependency org="javax.mail" name="com.springsource.javax.mail" rev="1.4.0" conf="test->compile"/>
37+
</dependencies>
38+
39+
</ivy-module>

‎org.springframework.aspects/pom.xml‎

Lines changed: 83 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,83 @@
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-aspects</artifactId>
6-
<packaging>jar</packaging>
7-
<version>3.0.1.BUILD-SNAPSHOT</version>
8-
<parent>
9-
<groupId>org.springframework</groupId>
10-
<artifactId>spring-parent</artifactId>
11-
<relativePath>../org.springframework.spring-parent</relativePath>
12-
<version>3.0.1.BUILD-SNAPSHOT</version>
13-
</parent>
14-
15-
<dependencies>
16-
<!-- common logging dependency is in spring-core -->
17-
<dependency>
18-
<groupId>org.aspectj</groupId>
19-
<artifactId>aspectjweaver</artifactId>
20-
<optional>true</optional>
21-
</dependency>
22-
<dependency>
23-
<groupId>org.springframework</groupId>
24-
<artifactId>spring-beans</artifactId>
25-
<version>${project.version}</version>
26-
<scope>compile</scope>
27-
</dependency>
28-
<dependency>
29-
<groupId>org.springframework</groupId>
30-
<artifactId>spring-tx</artifactId>
31-
<version>${project.version}</version>
32-
<optional>true</optional>
33-
</dependency>
34-
<dependency>
35-
<groupId>org.springframework</groupId>
36-
<artifactId>spring-context</artifactId>
37-
<version>${project.version}</version>
38-
<scope>compile</scope>
39-
</dependency>
40-
<dependency>
41-
<groupId>org.springframework</groupId>
42-
<artifactId>spring-context-support</artifactId>
43-
<version>${project.version}</version>
44-
<optional>true</optional>
45-
</dependency>
46-
<dependency>
47-
<groupId>org.springframework</groupId>
48-
<artifactId>spring-test</artifactId>
49-
<version>${project.version}</version>
50-
<scope>compile</scope>
51-
</dependency>
52-
<dependency>
53-
<groupId>junit</groupId>
54-
<artifactId>junit</artifactId>
55-
<scope>test</scope>
56-
</dependency>
57-
<dependency>
58-
<groupId>javax.mail</groupId>
59-
<artifactId>mail</artifactId>
60-
<version>1.4</version>
61-
<optional>true</optional>
62-
</dependency>
63-
</dependencies>
64-
<build>
65-
<pluginManagement>
66-
<plugins>
67-
<plugin>
68-
<groupId>org.apache.maven.plugins</groupId>
69-
<artifactId>maven-surefire-plugin</artifactId>
70-
<configuration>
71-
<junitArtifactName>junit:junit</junitArtifactName>
72-
</configuration>
73-
</plugin>
74-
</plugins>
75-
</pluginManagement>
76-
</build>
77-
</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-aspects</artifactId>
6+
<packaging>jar</packaging>
7+
<version>3.0.1.BUILD-SNAPSHOT</version>
8+
<parent>
9+
<groupId>org.springframework</groupId>
10+
<artifactId>spring-parent</artifactId>
11+
<relativePath>../org.springframework.spring-parent</relativePath>
12+
<version>3.0.1.BUILD-SNAPSHOT</version>
13+
</parent>
14+
15+
<dependencies>
16+
<!-- common logging dependency is in spring-core -->
17+
<dependency>
18+
<groupId>org.aspectj</groupId>
19+
<artifactId>aspectjweaver</artifactId>
20+
<optional>true</optional>
21+
</dependency>
22+
<dependency>
23+
<groupId>org.springframework</groupId>
24+
<artifactId>spring-beans</artifactId>
25+
<version>${project.version}</version>
26+
<scope>compile</scope>
27+
</dependency>
28+
<dependency>
29+
<groupId>org.springframework</groupId>
30+
<artifactId>spring-tx</artifactId>
31+
<version>${project.version}</version>
32+
<optional>true</optional>
33+
</dependency>
34+
<dependency>
35+
<groupId>org.springframework</groupId>
36+
<artifactId>spring-context</artifactId>
37+
<version>${project.version}</version>
38+
<scope>compile</scope>
39+
</dependency>
40+
<dependency>
41+
<groupId>org.springframework</groupId>
42+
<artifactId>spring-context-support</artifactId>
43+
<version>${project.version}</version>
44+
<optional>true</optional>
45+
</dependency>
46+
<dependency>
47+
<groupId>org.springframework</groupId>
48+
<artifactId>spring-test</artifactId>
49+
<version>${project.version}</version>
50+
<scope>compile</scope>
51+
</dependency>
52+
<dependency>
53+
<groupId>junit</groupId>
54+
<artifactId>junit</artifactId>
55+
<scope>test</scope>
56+
</dependency>
57+
<dependency>
58+
<groupId>javax.mail</groupId>
59+
<artifactId>mail</artifactId>
60+
<version>1.4</version>
61+
<optional>true</optional>
62+
</dependency>
63+
<dependency>
64+
<groupId>javax.persistence</groupId>
65+
<artifactId>persistence-api</artifactId>
66+
<version>1.0</version>
67+
<optional>true</optional>
68+
</dependency>
69+
</dependencies>
70+
<build>
71+
<pluginManagement>
72+
<plugins>
73+
<plugin>
74+
<groupId>org.apache.maven.plugins</groupId>
75+
<artifactId>maven-surefire-plugin</artifactId>
76+
<configuration>
77+
<junitArtifactName>junit:junit</junitArtifactName>
78+
</configuration>
79+
</plugin>
80+
</plugins>
81+
</pluginManagement>
82+
</build>
83+
</project>

0 commit comments

Comments
 (0)