Skip to content

Commit 82ec515

Browse files
jhoellerjhoeller
committed
declared JPA API as optional (SPR-6819)
1 parent d418eed commit 82ec515

File tree

2 files changed

+92
-86
lines changed

2 files changed

+92
-86
lines changed

‎org.springframework.aspects/ivy.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
<dependency org="org.springframework" name="org.springframework.test" rev="latest.integration" conf="test->runtime"/>
3434
<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="test->runtime"/>
3535
<dependency org="org.springframework" name="org.springframework.context.support" rev="latest.integration" conf="test->runtime"/>
36+
<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="optional, orm->compile"/>
3637
<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->compile"/>
37-
<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="compile->compile"/>
38-
<dependency org="javax.mail" name="com.springsource.javax.mail" rev="1.4.0" conf="test->compile"/>
38+
<dependency org="javax.mail" name="com.springsource.javax.mail" rev="1.4.0" conf="optional, test->compile"/>
3939
</dependencies>
4040

4141
</ivy-module>

‎org.springframework.aspects/pom.xml

Lines changed: 90 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,84 +1,90 @@
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.5.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.5.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-
<scope>compile</scope>
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>javax.persistence</groupId>
54-
<artifactId>persistence-api</artifactId>
55-
<version>1.0</version>
56-
<scope>compile</scope>
57-
</dependency>
58-
<dependency>
59-
<groupId>junit</groupId>
60-
<artifactId>junit</artifactId>
61-
<scope>test</scope>
62-
</dependency>
63-
<dependency>
64-
<groupId>javax.mail</groupId>
65-
<artifactId>mail</artifactId>
66-
<version>1.4</version>
67-
<scope>test</scope>
68-
<optional>true</optional>
69-
</dependency>
70-
</dependencies>
71-
<build>
72-
<pluginManagement>
73-
<plugins>
74-
<plugin>
75-
<groupId>org.apache.maven.plugins</groupId>
76-
<artifactId>maven-surefire-plugin</artifactId>
77-
<configuration>
78-
<junitArtifactName>junit:junit</junitArtifactName>
79-
</configuration>
80-
</plugin>
81-
</plugins>
82-
</pluginManagement>
83-
</build>
84-
</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.5.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.5.BUILD-SNAPSHOT</version>
13+
</parent>
14+
15+
<dependencies>
16+
<!-- commons 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-orm</artifactId>
37+
<version>${project.version}</version>
38+
<optional>true</optional>
39+
</dependency>
40+
<dependency>
41+
<groupId>org.springframework</groupId>
42+
<artifactId>spring-context</artifactId>
43+
<version>${project.version}</version>
44+
<scope>compile</scope>
45+
</dependency>
46+
<dependency>
47+
<groupId>org.springframework</groupId>
48+
<artifactId>spring-context-support</artifactId>
49+
<version>${project.version}</version>
50+
<scope>compile</scope>
51+
</dependency>
52+
<dependency>
53+
<groupId>org.springframework</groupId>
54+
<artifactId>spring-test</artifactId>
55+
<version>${project.version}</version>
56+
<scope>compile</scope>
57+
</dependency>
58+
<dependency>
59+
<groupId>javax.persistence</groupId>
60+
<artifactId>persistence-api</artifactId>
61+
<version>1.0</version>
62+
<optional>true</optional>
63+
</dependency>
64+
<dependency>
65+
<groupId>junit</groupId>
66+
<artifactId>junit</artifactId>
67+
<scope>test</scope>
68+
</dependency>
69+
<dependency>
70+
<groupId>javax.mail</groupId>
71+
<artifactId>mail</artifactId>
72+
<version>1.4</version>
73+
<scope>test</scope>
74+
<optional>true</optional>
75+
</dependency>
76+
</dependencies>
77+
<build>
78+
<pluginManagement>
79+
<plugins>
80+
<plugin>
81+
<groupId>org.apache.maven.plugins</groupId>
82+
<artifactId>maven-surefire-plugin</artifactId>
83+
<configuration>
84+
<junitArtifactName>junit:junit</junitArtifactName>
85+
</configuration>
86+
</plugin>
87+
</plugins>
88+
</pluginManagement>
89+
</build>
90+
</project>

0 commit comments

Comments
 (0)