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

declared JPA API as optional (SPR-6819)

3.0.x
Juergen Hoeller 16 years ago
parent
d418eed56f
commit
82ec515e59
2 changed files with 92 additions and 86 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      org.springframework.aspects/ivy.xml
  2. 174
      org.springframework.aspects/pom.xml

4
org.springframework.aspects/ivy.xml
Unescape View File

@ -33,9 +33,9 @@
<dependency org="org.springframework" name="org.springframework.test" rev="latest.integration" conf="test->runtime"/> <dependency org="org.springframework" name="org.springframework.test" rev="latest.integration" conf="test->runtime"/>
<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="test->runtime"/> <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="test->runtime"/>
<dependency org="org.springframework" name="org.springframework.context.support" rev="latest.integration" conf="test->runtime"/> <dependency org="org.springframework" name="org.springframework.context.support" rev="latest.integration" conf="test->runtime"/>
<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="optional, orm->compile"/>
<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->compile"/> <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->compile"/>
<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="compile->compile"/> <dependency org="javax.mail" name="com.springsource.javax.mail" rev="1.4.0" conf="optional, test->compile"/>
<dependency org="javax.mail" name="com.springsource.javax.mail" rev="1.4.0" conf="test->compile"/>
</dependencies> </dependencies>
</ivy-module> </ivy-module>

174
org.springframework.aspects/pom.xml
Unescape View File

@ -1,84 +1,90 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<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"> <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">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-aspects</artifactId> <artifactId>spring-aspects</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>3.0.5.BUILD-SNAPSHOT</version> <version>3.0.5.BUILD-SNAPSHOT</version>
<parent> <parent>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-parent</artifactId> <artifactId>spring-parent</artifactId>
<relativePath>../org.springframework.spring-parent</relativePath> <relativePath>../org.springframework.spring-parent</relativePath>
<version>3.0.5.BUILD-SNAPSHOT</version> <version>3.0.5.BUILD-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>
<!-- common logging dependency is in spring-core --> <!-- commons logging dependency is in spring-core -->
<dependency> <dependency>
<groupId>org.aspectj</groupId> <groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId> <artifactId>aspectjweaver</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId> <artifactId>spring-beans</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId> <artifactId>spring-tx</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId> <artifactId>spring-orm</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>compile</scope> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId> <artifactId>spring-context</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId> <artifactId>spring-context-support</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.persistence</groupId> <groupId>org.springframework</groupId>
<artifactId>persistence-api</artifactId> <artifactId>spring-test</artifactId>
<version>1.0</version> <version>${project.version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>javax.persistence</groupId>
<artifactId>junit</artifactId> <artifactId>persistence-api</artifactId>
<scope>test</scope> <version>1.0</version>
</dependency> <optional>true</optional>
<dependency> </dependency>
<groupId>javax.mail</groupId> <dependency>
<artifactId>mail</artifactId> <groupId>junit</groupId>
<version>1.4</version> <artifactId>junit</artifactId>
<scope>test</scope> <scope>test</scope>
<optional>true</optional> </dependency>
</dependency> <dependency>
</dependencies> <groupId>javax.mail</groupId>
<build> <artifactId>mail</artifactId>
<pluginManagement> <version>1.4</version>
<plugins> <scope>test</scope>
<plugin> <optional>true</optional>
<groupId>org.apache.maven.plugins</groupId> </dependency>
<artifactId>maven-surefire-plugin</artifactId> </dependencies>
<configuration> <build>
<junitArtifactName>junit:junit</junitArtifactName> <pluginManagement>
</configuration> <plugins>
</plugin> <plugin>
</plugins> <groupId>org.apache.maven.plugins</groupId>
</pluginManagement> <artifactId>maven-surefire-plugin</artifactId>
</build> <configuration>
</project> <junitArtifactName>junit:junit</junitArtifactName>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>

Write Preview
Loading…
Cancel
Save