Skip to content

Commit f4c6963

Browse files
author
Dave Syer
committed
Fix dependencies and poms for 2.1.6 release
1 parent 8423a65 commit f4c6963

File tree

6 files changed

+59
-31
lines changed

6 files changed

+59
-31
lines changed

‎.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
target
22
bin
33
integration-repo
4+
ivy-cache
5+
spring-build
46
derby-home
57
derbydb
68
derby.log
79
derbydb
810
com.springsource.sts.config.flow.prefs
11+
s3.properties
12+

‎pom.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -85,18 +85,6 @@
8585
</execution>
8686
</executions>
8787
</plugin>
88-
<plugin>
89-
<artifactId>maven-gpg-plugin</artifactId>
90-
<executions>
91-
<execution>
92-
<id>sign-artifacts</id>
93-
<phase>verify</phase>
94-
<goals>
95-
<goal>sign</goal>
96-
</goals>
97-
</execution>
98-
</executions>
99-
</plugin>
10088
<plugin>
10189
<groupId>com.agilejava.docbkx</groupId>
10290
<artifactId>docbkx-maven-plugin</artifactId>

‎spring-batch-core/ivy.xml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,16 @@
3333
<dependency org="com.thoughtworks.xstream" name="com.springsource.com.thoughtworks.xstream" rev="1.3.0" conf="compile->runtime,provided"/>
3434
<dependency org="org.codehaus.jettison" name="com.springsource.org.codehaus.jettison" rev="1.0.0" conf="compile->runtime,provided"/>
3535
<dependency org="org.eclipse.osgi" name="org.eclipse.osgi" rev="3.4.2.R34x_v20080826-1230" conf="optional->runtime,provided"/>
36-
<dependency org="org.springframework" name="org.springframework.aop" rev="2.5.6.A" conf="compile->runtime,provided"/>
37-
<dependency org="org.springframework" name="org.springframework.beans" rev="2.5.6.A" conf="compile->runtime,provided"/>
38-
<dependency org="org.springframework" name="org.springframework.context" rev="2.5.6.A" conf="compile->runtime,provided"/>
39-
<dependency org="org.springframework" name="org.springframework.core" rev="2.5.6.A" conf="compile->runtime,provided"/>
40-
<dependency org="org.springframework" name="org.springframework.jdbc" rev="2.5.6.A" conf="optional->runtime,provided"/>
41-
<dependency org="org.springframework.osgi" name="org.springframework.osgi.core" rev="1.1.2.A" conf="optional->runtime,provided"/>
42-
<dependency org="org.springframework" name="org.springframework.test" rev="2.5.6.A" conf="test->runtime,provided"/>
43-
<dependency org="org.springframework" name="org.springframework.transaction" rev="2.5.6.A" conf="compile->runtime,provided"/>
36+
<dependency org="org.springframework" name="org.springframework.aop" rev="2.5.6.SEC02" conf="compile->runtime,provided"/>
37+
<dependency org="org.springframework" name="org.springframework.beans" rev="2.5.6.SEC02" conf="compile->runtime,provided"/>
38+
<dependency org="org.springframework" name="org.springframework.context" rev="2.5.6.SEC02" conf="compile->runtime,provided">
39+
<exclude org="com.oracle.oc4j" module="com.springsource.oracle.classloader"/>
40+
</dependency>
41+
<dependency org="org.springframework" name="org.springframework.core" rev="2.5.6.SEC02" conf="compile->runtime,provided"/>
42+
<dependency org="org.springframework" name="org.springframework.jdbc" rev="2.5.6.SEC02" conf="optional->runtime,provided"/>
43+
<dependency org="org.springframework.osgi" name="org.springframework.osgi.core" rev="1.1.2.B" conf="optional->runtime,provided"/>
44+
<dependency org="org.springframework" name="org.springframework.test" rev="2.5.6.SEC02" conf="test->runtime,provided"/>
45+
<dependency org="org.springframework" name="org.springframework.transaction" rev="2.5.6.SEC02" conf="compile->runtime,provided"/>
4446
<dependency org="javax.annotation" name="com.springsource.javax.annotation" rev="1.0.0" conf="test->runtime,provided"/>
4547
<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="optional->runtime,provided"/>
4648
</dependencies>

‎spring-batch-infrastructure/ivy.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@
3939
<dependency org="org.apache.ibatis" name="com.springsource.com.ibatis" rev="2.3.0.677" conf="optional->runtime,provided"/>
4040
<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="optional->runtime,provided"/>
4141
<dependency org="org.springframework.ws" name="org.springframework.oxm" rev="1.5.5.A" conf="optional->runtime,provided"/>
42-
<dependency org="org.springframework" name="org.springframework.aop" rev="2.5.6.A" conf="optional->runtime,provided"/>
43-
<dependency org="org.springframework" name="org.springframework.context.support" rev="2.5.6.A" conf="optional->runtime,provided"/>
44-
<dependency org="org.springframework" name="org.springframework.context.support" rev="2.5.6.A" conf="optional->runtime,provided"/>
45-
<dependency org="org.springframework" name="org.springframework.core" rev="2.5.6.A" conf="compile->runtime,provided"/>
46-
<dependency org="org.springframework" name="org.springframework.jdbc" rev="2.5.6.A" conf="optional->runtime,provided"/>
47-
<dependency org="org.springframework" name="org.springframework.jms" rev="2.5.6.A" conf="optional->runtime,provided"/>
48-
<dependency org="org.springframework" name="org.springframework.orm" rev="2.5.6.A" conf="optional->runtime,provided"/>
49-
<dependency org="org.springframework" name="org.springframework.test" rev="2.5.6.A" conf="test->runtime,provided"/>
50-
<dependency org="org.springframework" name="org.springframework.transaction" rev="2.5.6.A" conf="optional->runtime,provided"/>
42+
<dependency org="org.springframework" name="org.springframework.aop" rev="2.5.6.SEC02" conf="optional->runtime,provided"/>
43+
<dependency org="org.springframework" name="org.springframework.context.support" rev="2.5.6.SEC02" conf="optional->runtime,provided"/>
44+
<dependency org="org.springframework" name="org.springframework.context.support" rev="2.5.6.SEC02" conf="optional->runtime,provided"/>
45+
<dependency org="org.springframework" name="org.springframework.core" rev="2.5.6.SEC02" conf="compile->runtime,provided"/>
46+
<dependency org="org.springframework" name="org.springframework.jdbc" rev="2.5.6.SEC02" conf="optional->runtime,provided"/>
47+
<dependency org="org.springframework" name="org.springframework.jms" rev="2.5.6.SEC02" conf="optional->runtime,provided"/>
48+
<dependency org="org.springframework" name="org.springframework.orm" rev="2.5.6.SEC02" conf="optional->runtime,provided"/>
49+
<dependency org="org.springframework" name="org.springframework.test" rev="2.5.6.SEC02" conf="test->runtime,provided"/>
50+
<dependency org="org.springframework" name="org.springframework.transaction" rev="2.5.6.SEC02" conf="optional->runtime,provided"/>
5151
</dependencies>
5252

5353
</ivy-module>

‎spring-batch-parent/pom.xml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,24 @@
88
<description>Spring Batch parent project. Defines dependencies and common configuration for the build process.</description>
99
<url>http://static.springframework.org/spring-batch/${project.artifactId}</url>
1010
<packaging>pom</packaging>
11+
<scm>
12+
<url>http://github.com/SpringSource/spring-batch</url>
13+
<connection>scm:git:git://github.com/SpringSource/spring-batch.git</connection>
14+
<developerConnection>scm:git:git://github.com/SpringSource/spring-batch.git</developerConnection>
15+
</scm>
16+
<licenses>
17+
<license>
18+
<name>Apache 2.0</name>
19+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
20+
</license>
21+
</licenses>
22+
<developers>
23+
<developer>
24+
<id>dsyer</id>
25+
<name>Dave Syer</name>
26+
<email>david.syer@springsource.com</email>
27+
</developer>
28+
</developers>
1129
<properties>
1230
<maven.test.failure.ignore>true</maven.test.failure.ignore>
1331
<spring.framework.version>2.5.6</spring.framework.version>
@@ -50,6 +68,22 @@
5068
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
5169
</repository>
5270
</distributionManagement>
71+
<build>
72+
<plugins>
73+
<plugin>
74+
<artifactId>maven-gpg-plugin</artifactId>
75+
<executions>
76+
<execution>
77+
<id>sign-artifacts</id>
78+
<phase>verify</phase>
79+
<goals>
80+
<goal>sign</goal>
81+
</goals>
82+
</execution>
83+
</executions>
84+
</plugin>
85+
</plugins>
86+
</build>
5387
</profile>
5488
<profile>
5589
<id>staging</id>

‎spring-batch-test/ivy.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
<dependency org="org.springframework.batch" name="org.springframework.batch.core" rev="latest.integration"
2222
conf="compile->runtime,provided" />
2323
<dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="compile->runtime,provided" />
24-
<dependency org="org.springframework" name="org.springframework.test" rev="2.5.6.A" conf="compile->runtime,provided" />
25-
<dependency org="org.springframework" name="org.springframework.jdbc" rev="2.5.6.A" conf="compile->runtime,provided" />
24+
<dependency org="org.springframework" name="org.springframework.test" rev="2.5.6.SEC02" conf="compile->runtime,provided" />
25+
<dependency org="org.springframework" name="org.springframework.jdbc" rev="2.5.6.SEC02" conf="compile->runtime,provided" />
2626
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.io" rev="1.4.0"
2727
conf="compile->runtime,provided" />
2828
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.dbcp" rev="1.2.2.osgi"

0 commit comments

Comments
 (0)