Permalink
Browse files

Tweak build config for release

- Spring ivy dependencies fixed for EBR
- Added Sonatype voodoo
  • Loading branch information...
1 parent d717027 commit 80b593de2f9d9ae1be1fbee52e0fa6d9b9a9d3f0 @dsyer dsyer committed Feb 7, 2011
Showing with 80 additions and 30 deletions.
  1. +4 −0 .gitignore
  2. +1 −1 build.properties
  3. +10 −5 pom.xml
  4. +10 −8 spring-batch-core/ivy.xml
  5. +9 −9 spring-batch-infrastructure/ivy.xml
  6. +44 −5 spring-batch-parent/pom.xml
  7. +2 −2 spring-batch-test/ivy.xml
View
@@ -1,8 +1,12 @@
target
bin
integration-repo
+ivy-cache
+spring-build
derby-home
derbydb
derby.log
derbydb
com.springsource.sts.config.flow.prefs
+s3.properties
+
View
@@ -1,4 +1,4 @@
-version=2.1.2
+version=2.2.0
integration.repo.dir=${basedir}/../integration-repo
ivy.cache.dir=${basedir}/../ivy-cache
View
15 pom.xml
@@ -308,11 +308,16 @@
<profile>
<id>central</id>
<distributionManagement>
- <repository>
- <id>spring-sourceforge</id>
- <name>Spring Sourceforge Repository</name>
- <url>file:///${user.dir}/sourceforge</url>
- </repository>
+ <snapshotRepository>
+ <id>sonatype-nexus-snapshots</id>
+ <name>Sonatype Nexus Snapshots</name>
+ <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+ </snapshotRepository>
+ <repository>
+ <id>sonatype-nexus-staging</id>
+ <name>Nexus Release Repository</name>
+ <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+ </repository>
</distributionManagement>
</profile>
<profile>
View
@@ -33,14 +33,16 @@
<dependency org="com.thoughtworks.xstream" name="com.springsource.com.thoughtworks.xstream" rev="1.3.0" conf="compile->runtime,provided"/>
<dependency org="org.codehaus.jettison" name="com.springsource.org.codehaus.jettison" rev="1.0.0" conf="compile->runtime,provided"/>
<dependency org="org.eclipse.osgi" name="org.eclipse.osgi" rev="3.4.2.R34x_v20080826-1230" conf="optional->runtime,provided"/>
- <dependency org="org.springframework" name="org.springframework.aop" rev="2.5.6.A" conf="compile->runtime,provided"/>
- <dependency org="org.springframework" name="org.springframework.beans" rev="2.5.6.A" conf="compile->runtime,provided"/>
- <dependency org="org.springframework" name="org.springframework.context" rev="2.5.6.A" conf="compile->runtime,provided"/>
- <dependency org="org.springframework" name="org.springframework.core" rev="2.5.6.A" conf="compile->runtime,provided"/>
- <dependency org="org.springframework" name="org.springframework.jdbc" rev="2.5.6.A" conf="optional->runtime,provided"/>
- <dependency org="org.springframework.osgi" name="org.springframework.osgi.core" rev="1.1.2.A" conf="optional->runtime,provided"/>
- <dependency org="org.springframework" name="org.springframework.test" rev="2.5.6.A" conf="test->runtime,provided"/>
- <dependency org="org.springframework" name="org.springframework.transaction" rev="2.5.6.A" conf="compile->runtime,provided"/>
+ <dependency org="org.springframework" name="org.springframework.aop" rev="2.5.6.SEC02" conf="compile->runtime,provided"/>
+ <dependency org="org.springframework" name="org.springframework.beans" rev="2.5.6.SEC02" conf="compile->runtime,provided"/>
+ <dependency org="org.springframework" name="org.springframework.context" rev="2.5.6.SEC02" conf="compile->runtime,provided">
+ <exclude org="com.oracle.oc4j" module="com.springsource.oracle.classloader"/>
+ </dependency>
+ <dependency org="org.springframework" name="org.springframework.core" rev="2.5.6.SEC02" conf="compile->runtime,provided"/>
+ <dependency org="org.springframework" name="org.springframework.jdbc" rev="2.5.6.SEC02" conf="optional->runtime,provided"/>
+ <dependency org="org.springframework.osgi" name="org.springframework.osgi.core" rev="1.1.2.B" conf="optional->runtime,provided"/>
+ <dependency org="org.springframework" name="org.springframework.test" rev="2.5.6.SEC02" conf="test->runtime,provided"/>
+ <dependency org="org.springframework" name="org.springframework.transaction" rev="2.5.6.SEC02" conf="compile->runtime,provided"/>
<dependency org="javax.annotation" name="com.springsource.javax.annotation" rev="1.0.0" conf="test->runtime,provided"/>
<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="optional->runtime,provided"/>
</dependencies>
@@ -39,15 +39,15 @@
<dependency org="org.apache.ibatis" name="com.springsource.com.ibatis" rev="2.3.0.677" conf="optional->runtime,provided"/>
<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="optional->runtime,provided"/>
<dependency org="org.springframework.ws" name="org.springframework.oxm" rev="1.5.5.A" conf="optional->runtime,provided"/>
- <dependency org="org.springframework" name="org.springframework.aop" rev="2.5.6.A" conf="optional->runtime,provided"/>
- <dependency org="org.springframework" name="org.springframework.context.support" rev="2.5.6.A" conf="optional->runtime,provided"/>
- <dependency org="org.springframework" name="org.springframework.context.support" rev="2.5.6.A" conf="optional->runtime,provided"/>
- <dependency org="org.springframework" name="org.springframework.core" rev="2.5.6.A" conf="compile->runtime,provided"/>
- <dependency org="org.springframework" name="org.springframework.jdbc" rev="2.5.6.A" conf="optional->runtime,provided"/>
- <dependency org="org.springframework" name="org.springframework.jms" rev="2.5.6.A" conf="optional->runtime,provided"/>
- <dependency org="org.springframework" name="org.springframework.orm" rev="2.5.6.A" conf="optional->runtime,provided"/>
- <dependency org="org.springframework" name="org.springframework.test" rev="2.5.6.A" conf="test->runtime,provided"/>
- <dependency org="org.springframework" name="org.springframework.transaction" rev="2.5.6.A" conf="optional->runtime,provided"/>
+ <dependency org="org.springframework" name="org.springframework.aop" rev="2.5.6.SEC02" conf="optional->runtime,provided"/>
+ <dependency org="org.springframework" name="org.springframework.context.support" rev="2.5.6.SEC02" conf="optional->runtime,provided"/>
+ <dependency org="org.springframework" name="org.springframework.context.support" rev="2.5.6.SEC02" conf="optional->runtime,provided"/>
+ <dependency org="org.springframework" name="org.springframework.core" rev="2.5.6.SEC02" conf="compile->runtime,provided"/>
+ <dependency org="org.springframework" name="org.springframework.jdbc" rev="2.5.6.SEC02" conf="optional->runtime,provided"/>
+ <dependency org="org.springframework" name="org.springframework.jms" rev="2.5.6.SEC02" conf="optional->runtime,provided"/>
+ <dependency org="org.springframework" name="org.springframework.orm" rev="2.5.6.SEC02" conf="optional->runtime,provided"/>
+ <dependency org="org.springframework" name="org.springframework.test" rev="2.5.6.SEC02" conf="test->runtime,provided"/>
+ <dependency org="org.springframework" name="org.springframework.transaction" rev="2.5.6.SEC02" conf="optional->runtime,provided"/>
</dependencies>
</ivy-module>
@@ -8,6 +8,24 @@
<description>Spring Batch parent project. Defines dependencies and common configuration for the build process.</description>
<url>http://static.springframework.org/spring-batch/${project.artifactId}</url>
<packaging>pom</packaging>
+ <scm>
+ <url>http://github.com/SpringSource/spring-batch</url>
+ <connection>scm:git:git://github.com/SpringSource/spring-batch.git</connection>
+ <developerConnection>scm:git:git://github.com/SpringSource/spring-batch.git</developerConnection>
+ </scm>
+ <licenses>
+ <license>
+ <name>Apache 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>dsyer</id>
+ <name>Dave Syer</name>
+ <email>david.syer@springsource.com</email>
+ </developer>
+ </developers>
<properties>
<maven.test.failure.ignore>true</maven.test.failure.ignore>
<spring.framework.version>2.5.6</spring.framework.version>
@@ -39,12 +57,33 @@
<profile>
<id>central</id>
<distributionManagement>
- <repository>
- <id>spring-sourceforge</id>
- <name>Spring Sourceforge Repository</name>
- <url>file:///${user.dir}/sourceforge</url>
- </repository>
+ <snapshotRepository>
+ <id>sonatype-nexus-snapshots</id>
+ <name>Sonatype Nexus Snapshots</name>
+ <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+ </snapshotRepository>
+ <repository>
+ <id>sonatype-nexus-staging</id>
+ <name>Nexus Release Repository</name>
+ <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+ </repository>
</distributionManagement>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</profile>
<profile>
<id>staging</id>
@@ -21,8 +21,8 @@
<dependency org="org.springframework.batch" name="org.springframework.batch.core" rev="latest.integration"
conf="compile->runtime,provided" />
<dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="compile->runtime,provided" />
- <dependency org="org.springframework" name="org.springframework.test" rev="2.5.6.A" conf="compile->runtime,provided" />
- <dependency org="org.springframework" name="org.springframework.jdbc" rev="2.5.6.A" conf="compile->runtime,provided" />
+ <dependency org="org.springframework" name="org.springframework.test" rev="2.5.6.SEC02" conf="compile->runtime,provided" />
+ <dependency org="org.springframework" name="org.springframework.jdbc" rev="2.5.6.SEC02" conf="compile->runtime,provided" />
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.io" rev="1.4.0"
conf="compile->runtime,provided" />
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.dbcp" rev="1.2.2.osgi"

0 comments on commit 80b593d

Please sign in to comment.