Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BATCH-1950: Patch up build

Browse Source 
* Ensure bundlor is available and remove from sample
* Tidy dependencies in some poms
* Update some template.mf dependencies
* Add .travis.yml for automated builds independent of bamboo
This commit is contained in:
Dave Syer
2013-01-15 08:26:11 +00:00
parent 60af65c7ae
commit bc9ee74a25
15 changed files with 96 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
archetypes/simple-cli/pom.xml
View File

@@ -42,14 +42,6 @@
<enabled>false</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>com.springsource.repository.bundles.release</id>
<name> SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
<url>http://repository.springsource.com/maven/bundles/release</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
@@ -163,19 +155,6 @@
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>com.springsource.bundlor</groupId>
<artifactId>com.springsource.bundlor.maven</artifactId>
<versionRange>[1.0,)</versionRange>
<goals>
<goal>bundlor</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
@@ -204,20 +183,6 @@
<target>1.6</target>
</configuration>
</plugin>
<plugin>
<groupId>com.springsource.bundlor</groupId>
<artifactId>com.springsource.bundlor.maven</artifactId>
<version>1.0.0.RELEASE</version>
<executions>
<execution>
<id>bundlor-transform</id>
<phase>compile</phase>
<goals>
<goal>bundlor</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -270,7 +235,6 @@
<addClasspath>true</addClasspath>
<classpathPrefix>lib/</classpathPrefix>
</manifest>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>

16
archetypes/simple-cli/template.mf
View File

@@ -1,16 +0,0 @@
Bundle-SymbolicName: org.springframework.batch.archetype.simple.cli
Bundle-Version: ${version}
Bundle-ManifestVersion: 2
Bundle-Name: Spring Batch Cammand Line Archetype
Import-Template:
org.apache.commons.logging.*;version="[1.1.0, 2.0.0)",
org.apache.commons.io.*;version="[1.4.0, 2.0.0)";resolution:=optional,
org.springframework.batch.*;version="[2.0.0, 3.0.0)",
org.springframework.beans.*;version="[2.5.5, 4.0.0)";resolution:=optional,
org.springframework.jdbc.*;version="[2.5.5, 4.0.0)";resolution:=optional,
org.springframework.util.*;version="[2.5.5, 4.0.0)";resolution:=optional,
org.springframework.dao.*;version="[2.5.5, 4.0.0)";resolution:=optional,
org.springframework.transaction.*;version="[2.5.5, 4.0.0)";resolution:=optional,
org.springframework.context.*;version="[2.5.5, 4.0.0)";resolution:=optional,
org.springframework.core.*;version="[2.5.5, 4.0.0)";resolution:=optional,
javax.sql.*;version="0";resolution:=optional