Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 5410e07

Browse files
author
Dave Syer
committed
BATCH-1685: fix broken dependeny on spring-oxm
1 parent d0e0334 commit 5410e07

File tree

6 files changed

+77
-74
lines changed

6 files changed

+77
-74
lines changed

‎spring-batch-infrastructure-tests/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,8 @@
196196
<optional>true</optional>
197197
</dependency>
198198
<dependency>
199-
<groupId>${spring.oxm.group}</groupId>
200-
<artifactId>${spring.oxm.artifact}</artifactId>
199+
<groupId>org.springframework</groupId>
200+
<artifactId>spring-oxm</artifactId>
201201
<scope>test</scope>
202202
</dependency>
203203
<dependency>

‎spring-batch-infrastructure/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@
163163
<optional>true</optional>
164164
</dependency>
165165
<dependency>
166-
<groupId>${spring.oxm.group}</groupId>
167-
<artifactId>${spring.oxm.artifact}</artifactId>
166+
<groupId>org.springframework</groupId>
167+
<artifactId>spring-oxm</artifactId>
168168
<optional>true</optional>
169169
</dependency>
170170
<dependency>

‎spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
*
4141
* @author Josh Long
4242
*
43-
* @see org.springframework.xml.transform.StaxSource
4443
*/
44+
@SuppressWarnings("restriction")
4545
public abstract class StaxUtils {
4646

4747
private static final Log logger = LogFactory.getLog(StaxUtils.class);

‎spring-batch-infrastructure/src/main/java/org/springframework/batch/support/JdbcTestUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
/**
88
* <p>
99
* Util class based off {@link org.springframework.test.jdbc.SimpleJdbcTestUtils} but for JdbcTemplate
10-
* rather than the deprecated {@link org.springframework.jdbc.core.simple.SimpleJdbcTemplate}.
10+
* rather than the deprecated SimpleJdbcTemplate.
1111
*
1212
* This class should be removed when Batch uses Spring 3.2 - see:
1313
* https://jira.springsource.org/browse/SPR-9235

‎spring-batch-parent/pom.xml‎

Lines changed: 69 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
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">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
34
<modelVersion>4.0.0</modelVersion>
45
<groupId>org.springframework.batch</groupId>
56
<artifactId>spring-batch-parent</artifactId>
@@ -12,8 +13,8 @@
1213
<url>http://github.com/SpringSource/spring-batch</url>
1314
<connection>scm:git:git://github.com/SpringSource/spring-batch.git</connection>
1415
<developerConnection>scm:git:git://github.com/SpringSource/spring-batch.git</developerConnection>
15-
<tag>HEAD</tag>
16-
</scm>
16+
<tag>HEAD</tag>
17+
</scm>
1718
<licenses>
1819
<license>
1920
<name>Apache 2.0</name>
@@ -28,15 +29,12 @@
2829
</developer>
2930
</developers>
3031
<properties>
31-
<spring.framework.version>3.1.2.RELEASE</spring.framework.version>
32-
<spring.oxm.group>org.springframework</spring.oxm.group>
33-
<spring.oxm.artifact>spring-oxm</spring.oxm.artifact>
34-
<spring.oxm.version>3.0.7.RELEASE</spring.oxm.version>
35-
<spring.amqp.version>1.1.2.RELEASE</spring.amqp.version>
36-
<junit.version>4.10</junit.version>
32+
<spring.framework.version>3.1.2.RELEASE</spring.framework.version>
33+
<spring.amqp.version>1.1.2.RELEASE</spring.amqp.version>
34+
<junit.version>4.10</junit.version>
3735
<bundlor.version>1.0.0.RELEASE</bundlor.version>
3836
<dependency.locations.enabled>false</dependency.locations.enabled>
39-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
37+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4038
</properties>
4139
<profiles>
4240
<profile>
@@ -169,8 +167,7 @@
169167
</extensions>
170168
<pluginManagement>
171169
<plugins>
172-
<!--This plugin's configuration is used to store Eclipse m2e settings
173-
only. It has no influence on the Maven build itself. -->
170+
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself. -->
174171
<plugin>
175172
<groupId>org.eclipse.m2e</groupId>
176173
<artifactId>lifecycle-mapping</artifactId>
@@ -243,25 +240,25 @@
243240
</dependency>
244241
</dependencies>
245242
</plugin>
246-
<plugin>
247-
<groupId>org.apache.maven.plugins</groupId>
248-
<artifactId>maven-site-plugin</artifactId>
249-
<version>3.1</version>
250-
<dependencies>
251-
<dependency>
252-
<groupId>org.apache.maven.wagon</groupId>
253-
<artifactId>wagon-ssh</artifactId>
254-
<version>2.2</version>
255-
</dependency>
256-
</dependencies>
257-
</plugin>
243+
<plugin>
244+
<groupId>org.apache.maven.plugins</groupId>
245+
<artifactId>maven-site-plugin</artifactId>
246+
<version>3.1</version>
247+
<dependencies>
248+
<dependency>
249+
<groupId>org.apache.maven.wagon</groupId>
250+
<artifactId>wagon-ssh</artifactId>
251+
<version>2.2</version>
252+
</dependency>
253+
</dependencies>
254+
</plugin>
258255
</plugins>
259256
</pluginManagement>
260257
<plugins>
261258
<plugin>
262259
<groupId>org.apache.maven.plugins</groupId>
263260
<artifactId>maven-compiler-plugin</artifactId>
264-
<version>2.5.1</version>
261+
<version>2.5.1</version>
265262
<configuration>
266263
<source>1.5</source>
267264
<target>1.5</target>
@@ -285,7 +282,7 @@
285282
<plugin>
286283
<groupId>org.apache.maven.plugins</groupId>
287284
<artifactId>maven-surefire-plugin</artifactId>
288-
<version>2.12.3</version>
285+
<version>2.12.3</version>
289286
<configuration>
290287
<includes>
291288
<include>**/*Tests.java</include>
@@ -298,36 +295,36 @@
298295
</plugin>
299296
</plugins>
300297
</build>
301-
<pluginRepositories>
302-
<pluginRepository>
303-
<id>objectstyle</id>
304-
<name>ObjectStyle.org Repository</name>
305-
<url>http://objectstyle.org/maven2/</url>
306-
<snapshots>
307-
<enabled>false</enabled>
308-
</snapshots>
309-
</pluginRepository>
310-
<pluginRepository>
311-
<id>com.springsource.repository.bundles.release</id>
312-
<name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
313-
<url>http://repository.springsource.com/maven/bundles/release/</url>
314-
<snapshots>
315-
<enabled>false</enabled>
316-
</snapshots>
317-
</pluginRepository>
318-
</pluginRepositories>
298+
<pluginRepositories>
299+
<pluginRepository>
300+
<id>objectstyle</id>
301+
<name>ObjectStyle.org Repository</name>
302+
<url>http://objectstyle.org/maven2/</url>
303+
<snapshots>
304+
<enabled>false</enabled>
305+
</snapshots>
306+
</pluginRepository>
307+
<pluginRepository>
308+
<id>com.springsource.repository.bundles.release</id>
309+
<name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
310+
<url>http://repository.springsource.com/maven/bundles/release/</url>
311+
<snapshots>
312+
<enabled>false</enabled>
313+
</snapshots>
314+
</pluginRepository>
315+
</pluginRepositories>
319316
<reporting>
320317
<plugins>
321318
<plugin>
322319
<artifactId>maven-jxr-plugin</artifactId>
323-
<version>2.3</version>
320+
<version>2.3</version>
324321
<configuration>
325322
<aggregate>true</aggregate>
326323
</configuration>
327324
</plugin>
328325
<plugin>
329326
<artifactId>maven-surefire-report-plugin</artifactId>
330-
<version>2.12.3</version>
327+
<version>2.12.3</version>
331328
<configuration>
332329
<aggregate>true</aggregate>
333330
</configuration>
@@ -338,7 +335,7 @@
338335
</plugin>
339336
<plugin>
340337
<artifactId>maven-javadoc-plugin</artifactId>
341-
<version>2.8.1</version>
338+
<version>2.8.1</version>
342339
<configuration>
343340
<quiet>true</quiet>
344341
</configuration>
@@ -376,12 +373,12 @@
376373
<version>2.4</version>
377374
<scope>test</scope>
378375
</dependency>
379-
<dependency>
380-
<groupId>org.easymock</groupId>
381-
<artifactId>easymockclassextension</artifactId>
382-
<version>2.4</version>
383-
<scope>test</scope>
384-
</dependency>
376+
<dependency>
377+
<groupId>org.easymock</groupId>
378+
<artifactId>easymockclassextension</artifactId>
379+
<version>2.4</version>
380+
<scope>test</scope>
381+
</dependency>
385382
<dependency>
386383
<groupId>org.apache.geronimo.specs</groupId>
387384
<artifactId>geronimo-jms_1.1_spec</artifactId>
@@ -659,27 +656,33 @@
659656
<version>${spring.framework.version}</version>
660657
</dependency>
661658
<dependency>
662-
<groupId>${spring.oxm.group}</groupId>
663-
<artifactId>${spring.oxm.artifact}</artifactId>
664-
<version>${spring.oxm.version}</version>
659+
<groupId>org.springframework</groupId>
660+
<artifactId>spring-oxm</artifactId>
661+
<version>${spring.framework.version}</version>
665662
<optional>true</optional>
663+
<exclusions>
664+
<exclusion>
665+
<groupId>commons-lang</groupId>
666+
<artifactId>commons-lang</artifactId>
667+
</exclusion>
668+
</exclusions>
666669
</dependency>
667670
<dependency>
668671
<groupId>org.springframework.osgi</groupId>
669672
<artifactId>spring-osgi-core</artifactId>
670673
<version>1.1.2</version>
671674
<optional>true</optional>
672675
</dependency>
673-
<dependency>
674-
<groupId>org.springframework.amqp</groupId>
675-
<artifactId>spring-amqp</artifactId>
676-
<version>${spring.amqp.version}</version>
677-
</dependency>
678-
<dependency>
679-
<groupId>org.springframework.amqp</groupId>
680-
<artifactId>spring-rabbit</artifactId>
681-
<version>${spring.amqp.version}</version>
682-
</dependency>
676+
<dependency>
677+
<groupId>org.springframework.amqp</groupId>
678+
<artifactId>spring-amqp</artifactId>
679+
<version>${spring.amqp.version}</version>
680+
</dependency>
681+
<dependency>
682+
<groupId>org.springframework.amqp</groupId>
683+
<artifactId>spring-rabbit</artifactId>
684+
<version>${spring.amqp.version}</version>
685+
</dependency>
683686
</dependencies>
684687
</dependencyManagement>
685688
<distributionManagement>

‎spring-batch-samples/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@
200200
<artifactId>spring-aop</artifactId>
201201
</dependency>
202202
<dependency>
203-
<groupId>${spring.oxm.group}</groupId>
204-
<artifactId>${spring.oxm.artifact}</artifactId>
203+
<groupId>org.springframework</groupId>
204+
<artifactId>spring-oxm</artifactId>
205205
</dependency>
206206
<dependency>
207207
<groupId>org.springframework</groupId>

0 commit comments

Comments
 (0)