Permalink
Browse files

upgrade bundlor to 1.0.0

  • Loading branch information...
1 parent 7a55b03 commit b8dc9658afd357b4d1d168343ba39abe87e9d872 dsyer committed Feb 5, 2010
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.batch</groupId>
<artifactId>spring-batch-simple-cli</artifactId>
@@ -118,11 +119,6 @@
<pluginManagement>
<plugins>
<plugin>
- <groupId>com.springsource.bundlor</groupId>
- <artifactId>com.springsource.bundlor.maven</artifactId>
- <version>1.0.0.M1B</version>
- </plugin>
- <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<inherited>false</inherited>
<configuration>
@@ -131,6 +127,15 @@
</descriptorRefs>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -145,12 +150,13 @@
<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>package</phase>
+ <phase>compile</phase>
<goals>
- <goal>transform</goal>
+ <goal>bundlor</goal>
</goals>
</execution>
</executions>
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-SymbolicName: org.springframework.batch.core.tests
+Bundle-Name: Spring Batch Core Tests
+Bundle-Vendor: Spring
+Bundle-Version: ${version}
+Bundle-ManifestVersion: 2
+Ignored-Existing-Headers:
+ Import-Package,
+ Export-Package
+Import-Template:
+ *;version="0"
View
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-batch-core</artifactId>
<packaging>jar</packaging>
@@ -136,10 +137,6 @@
<build>
<plugins>
<plugin>
- <groupId>com.springsource.bundlor</groupId>
- <artifactId>com.springsource.bundlor.maven</artifactId>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
@@ -150,7 +147,8 @@
<tasks>
<typedef resource="foundrylogic/vpp/typedef.properties" />
<taskdef resource="foundrylogic/vpp/taskdef.properties" />
- <vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
+ <vppcopy todir="${basedir}/target/generated-resources"
+ overwrite="true">
<config>
<context>
<property key="includes" value="src/main/sql" />
@@ -163,7 +161,8 @@
<fileset dir="${basedir}/src/main/sql" includes="schema*.sql.vpp" />
<mapper type="glob" from="*.sql.vpp" to="*-hsqldb.sql" />
</vppcopy>
- <vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
+ <vppcopy todir="${basedir}/target/generated-resources"
+ overwrite="true">
<config>
<context>
<property key="includes" value="src/main/sql" />
@@ -176,7 +175,8 @@
<fileset dir="${basedir}/src/main/sql" includes="schema*.sql.vpp" />
<mapper type="glob" from="*.sql.vpp" to="*-h2.sql" />
</vppcopy>
- <vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
+ <vppcopy todir="${basedir}/target/generated-resources"
+ overwrite="true">
<config>
<context>
<property key="includes" value="src/main/sql" />
@@ -189,7 +189,8 @@
<fileset dir="${basedir}/src/main/sql" includes="schema*.sql.vpp" />
<mapper type="glob" from="*.sql.vpp" to="*-db2.sql" />
</vppcopy>
- <vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
+ <vppcopy todir="${basedir}/target/generated-resources"
+ overwrite="true">
<config>
<context>
<property key="includes" value="src/main/sql" />
@@ -202,7 +203,8 @@
<fileset dir="${basedir}/src/main/sql" includes="schema*.sql.vpp" />
<mapper type="glob" from="*.sql.vpp" to="*-derby.sql" />
</vppcopy>
- <vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
+ <vppcopy todir="${basedir}/target/generated-resources"
+ overwrite="true">
<config>
<context>
<property key="includes" value="src/main/sql" />
@@ -215,7 +217,8 @@
<fileset dir="${basedir}/src/main/sql" includes="schema*.sql.vpp" />
<mapper type="glob" from="*.sql.vpp" to="*-oracle10g.sql" />
</vppcopy>
- <vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
+ <vppcopy todir="${basedir}/target/generated-resources"
+ overwrite="true">
<config>
<context>
<property key="includes" value="src/main/sql" />
@@ -228,7 +231,8 @@
<fileset dir="${basedir}/src/main/sql" includes="schema*.sql.vpp" />
<mapper type="glob" from="*.sql.vpp" to="*-postgresql.sql" />
</vppcopy>
- <vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
+ <vppcopy todir="${basedir}/target/generated-resources"
+ overwrite="true">
<config>
<context>
<property key="includes" value="src/main/sql" />
@@ -241,7 +245,8 @@
<fileset dir="${basedir}/src/main/sql" includes="schema*.sql.vpp" />
<mapper type="glob" from="*.sql.vpp" to="*-mysql.sql" />
</vppcopy>
- <vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
+ <vppcopy todir="${basedir}/target/generated-resources"
+ overwrite="true">
<config>
<context>
<property key="includes" value="src/main/sql" />
@@ -254,7 +259,8 @@
<fileset dir="${basedir}/src/main/sql" includes="schema*.sql.vpp" />
<mapper type="glob" from="*.sql.vpp" to="*-sqlserver.sql" />
</vppcopy>
- <vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
+ <vppcopy todir="${basedir}/target/generated-resources"
+ overwrite="true">
<config>
<context>
<property key="includes" value="src/main/sql" />
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-SymbolicName: org.springframework.batch.infrastructure.tests
+Bundle-Name: Spring Batch Infrastructure Tests
+Bundle-Vendor: Spring
+Bundle-Version: ${version}
+Bundle-ManifestVersion: 2
+Ignored-Existing-Headers:
+ Import-Package,
+ Export-Package
+Import-Template:
+ *;version="0"
@@ -19,10 +19,6 @@
<build>
<plugins>
<plugin>
- <groupId>com.springsource.bundlor</groupId>
- <artifactId>com.springsource.bundlor.maven</artifactId>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.batch</groupId>
<artifactId>spring-batch-parent</artifactId>
@@ -12,7 +13,7 @@
<maven.test.failure.ignore>true</maven.test.failure.ignore>
<spring.framework.version>2.5.6</spring.framework.version>
<junit.version>4.4</junit.version>
- <bundlor.version>1.0.0.M2</bundlor.version>
+ <bundlor.version>1.0.0.RELEASE</bundlor.version>
</properties>
<profiles>
<profile>
@@ -134,19 +135,13 @@
<version>2.0</version>
</plugin>
<plugin>
- <groupId>com.springsource.bundlor</groupId>
- <artifactId>com.springsource.bundlor.maven</artifactId>
- <version>${bundlor.version}</version>
- <inherited>true</inherited>
- <executions>
- <execution>
- <id>bundlor-transform</id>
- <phase>package</phase>
- <goals>
- <goal>transform</goal>
- </goals>
- </execution>
- </executions>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -186,6 +181,21 @@
</configuration>
</plugin>
<plugin>
+ <groupId>com.springsource.bundlor</groupId>
+ <artifactId>com.springsource.bundlor.maven</artifactId>
+ <version>${bundlor.version}</version>
+ <inherited>true</inherited>
+ <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>
<configuration>
@@ -580,17 +590,12 @@
</repositories>
<pluginRepositories>
<pluginRepository>
- <id>com.springsource.repository.bundles.milestone</id>
- <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Milestones</name>
- <url>http://repository.springsource.com/maven/bundles/milestone/</url>
+ <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>
- <pluginRepository>
- <id>com.springsource.repository.bundles.snapshot</id>
- <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Snapshots</name>
- <url>http://repository.springsource.com/maven/bundles/snapshot/</url>
- </pluginRepository>
</pluginRepositories>
</project>
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-SymbolicName: org.springframework.batch.samples
+Bundle-Name: Spring Batch Samples
+Bundle-Vendor: Spring
+Bundle-Version: ${version}
+Bundle-ManifestVersion: 2
+Ignored-Existing-Headers:
+ Import-Package,
+ Export-Package
+Import-Template:
+ *;version="0"

0 comments on commit b8dc965

Please sign in to comment.