diff --git a/archetypes/simple-cli/.project b/archetypes/simple-cli/.project index 3baa78be6..12253ee59 100644 --- a/archetypes/simple-cli/.project +++ b/archetypes/simple-cli/.project @@ -1,6 +1,6 @@ - - - simple-cli-archetype + + + simple-cli-archetype This plugin is an archetype that creates a command line batch sample from Spring Batch. Once installed you can create the archetype project using<br/> @@ -10,36 +10,35 @@ $ mvn archetype:create -DgroupId=com.mycompany -DartifactId=batch \ -DarchetypeArtifactId=spring-batch-cli -DarchetypeVersion=1.0-m3-SNAPSHOT </pre><br/> Then you should be able to "cd batch; mvn package exec:exec", and see the - app run. - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.devzuz.q.maven.jdt.core.mavenIncrementalBuilder - - - - - org.springframework.ide.eclipse.core.springbuilder - - - - - - com.springsource.platform.ide.facet.core.bundlenature - org.springframework.ide.eclipse.core.springnature - org.eclipse.jdt.core.javanature - org.devzuz.q.maven.jdt.core.mavenNature - org.eclipse.wst.common.project.facet.core.nature - - + app run. + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.devzuz.q.maven.jdt.core.mavenIncrementalBuilder + + + + + org.springframework.ide.eclipse.core.springbuilder + + + + + + org.springframework.ide.eclipse.core.springnature + org.eclipse.jdt.core.javanature + org.devzuz.q.maven.jdt.core.mavenNature + org.eclipse.wst.common.project.facet.core.nature + + diff --git a/archetypes/simple-cli/.settings/org.eclipse.wst.common.project.facet.core.xml b/archetypes/simple-cli/.settings/org.eclipse.wst.common.project.facet.core.xml index af55bdf1a..e9a60fbc3 100644 --- a/archetypes/simple-cli/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/archetypes/simple-cli/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,5 +1,4 @@ - - - - - + + + + diff --git a/archetypes/simple-cli/pom.xml b/archetypes/simple-cli/pom.xml index 1eb08ae2e..a644e2b61 100644 --- a/archetypes/simple-cli/pom.xml +++ b/archetypes/simple-cli/pom.xml @@ -1,5 +1,5 @@ - - + 4.0.0 org.springframework.batch simple-cli-archetype @@ -7,7 +7,6 @@ jar Commandline http://www.springframework.org/spring-batch/archetypes/simple-cli-archetype - - true 2.5.5 - ${pom.groupId}.sample.archetype.cli + 1.0.0.BUILD-SNAPSHOT - strict @@ -29,8 +26,34 @@ false + + manifest + + false + + + + + com.springsource.bundlor + com.springsource.bundlor.maven + ${bundlor.version} + + + bundlor-manifest + package + + manifest + + + ${project.basedir}/src/main/resources/META-INF/MANIFEST.MF + + + + + + + - junit @@ -76,7 +99,6 @@ 1.5.3 - @@ -95,30 +117,19 @@ - org.apache.maven.plugins - maven-jar-plugin - - - src/main/resources/META-INF/MANIFEST.MF - - - - - org.apache.felix - maven-bundle-plugin - true - - target/generated-resources/META-INF - - ${bundle.symbolic.name} - !example,!test.* - - - + com.springsource.bundlor + com.springsource.bundlor.maven + ${bundlor.version} + + + bundlor-transform + + package + + transform + + + org.apache.maven.plugins @@ -149,14 +160,18 @@ - Codehaus http://repository.codehaus.org/ + + com.springsource.repository.bundles.snapshot + SpringSource Enterprise Bundle Repository - + SpringSource Bundle Snapshots + http://repository.springsource.com/maven/bundles/snapshot + - http://www.springframework.org/download @@ -174,5 +189,4 @@ s3://maven.springframework.org/snapshot - - + \ No newline at end of file diff --git a/archetypes/simple-cli/src/main/resources/META-INF/MANIFEST.MF b/archetypes/simple-cli/src/main/resources/META-INF/MANIFEST.MF deleted file mode 100644 index 0235ca886..000000000 --- a/archetypes/simple-cli/src/main/resources/META-INF/MANIFEST.MF +++ /dev/null @@ -1,28 +0,0 @@ -Manifest-Version: 1.0 -Import-Library: org.springframework.spring;version="[2.5.4.A,3.0.0)" -Import-Bundle: org.springframework.batch.core;version="[2.0.0,3.0.0)", - org.springframework.batch.infrastructure;version="[2.0.0,3.0.0)" -Created-By: 1.5.0_09 (Sun Microsystems Inc.) -Import-Package: org.apache.commons.logging;version="[1.1.0, 2.0.0)",or - g.springframework.batch.item.support;version="[2.0.0,3.0.0)" -Bnd-LastModified: 1216037156921 -Export-Package: example;uses:="org.springframework.batch.item.support, - org.apache.commons.logging";version="2.0.0.CI",test.jdbc.da - tasource;uses:="org.apache.commons.logging,org.springframework.jdbc.c - ore,org.springframework.transaction,org.springframework.beans.factory - .config,org.springframework.jdbc.datasource,org.springframework.core. - io,org.springframework.util,org.springframework.beans.factory,org.spr - ingframework.transaction.support";version="2.0.0.CI" -Bundle-Version: 2.0.0.CI-SNAPSHOT -Ignore-Package: example,test.jdbc.datasource -Bundle-Name: Spring Batch Simple Commandline Archetype -Bundle-Description: This project is a minimal command line batch sampl - e from Spring Batch. Once installed you can use "mvn exec:java" - to see the job run. -Private-Package: example;version="1.1.0.DEV-SNAPSHOT",test.jdbc.dataso - urce;version="1.1.0.DEV-SNAPSHOT" -Originally-Created-By: 1.5.0_09 (Sun Microsystems Inc.) -Bundle-ManifestVersion: 2 -Bundle-SymbolicName: org.springframework.batch.sample.archetype.cli -Tool: Bnd-0.0.255 - diff --git a/archetypes/src/.project b/archetypes/src/.project index 235efeb12..e0d9f992a 100644 --- a/archetypes/src/.project +++ b/archetypes/src/.project @@ -1,18 +1,18 @@ - - - archetypes-src - - - - - - - - - - archetypes-pom.xml - 1 - SPRING_BATCH/archetypes/pom.xml - - - + + + archetypes-src + + + + + + + + + + archetypes-pom.xml + 1 + SPRING_BATCH/archetypes/pom.xml + + + diff --git a/spring-batch-core/.project b/spring-batch-core/.project index ca632cd00..aee145583 100644 --- a/spring-batch-core/.project +++ b/spring-batch-core/.project @@ -6,11 +6,6 @@ spring-batch-infrastructure - - org.eclipse.wst.common.project.facet.core.builder - - - org.eclipse.jdt.core.javabuilder @@ -28,10 +23,8 @@ - com.springsource.platform.ide.facet.core.bundlenature org.springframework.ide.eclipse.core.springnature org.eclipse.jdt.core.javanature org.devzuz.q.maven.jdt.core.mavenNature - org.eclipse.wst.common.project.facet.core.nature diff --git a/spring-batch-core/.settings/org.eclipse.wst.common.project.facet.core.xml b/spring-batch-core/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index af55bdf1a..000000000 --- a/spring-batch-core/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/spring-batch-core/pom.xml b/spring-batch-core/pom.xml index 9b4e935bd..9b41a9efe 100644 --- a/spring-batch-core/pom.xml +++ b/spring-batch-core/pom.xml @@ -130,13 +130,8 @@ - org.apache.maven.plugins - maven-jar-plugin - - - src/main/resources/META-INF/MANIFEST.MF - - + com.springsource.bundlor + com.springsource.bundlor.maven org.apache.maven.plugins diff --git a/spring-batch-core/src/main/resources/META-INF/spring-batch-core.mf b/spring-batch-core/src/main/resources/META-INF/spring-batch-core.mf index f9eb3796e..5a8486522 100644 --- a/spring-batch-core/src/main/resources/META-INF/spring-batch-core.mf +++ b/spring-batch-core/src/main/resources/META-INF/spring-batch-core.mf @@ -6,6 +6,8 @@ Ignored-Existing-Headers: Import-Package, Export-Package Import-Template: + com.thoughtworks.xstream.*;version="[1.3,1.4)", + org.codehaus.jettison.*;version="[1.0,1.1)", org.aopalliance.*;version="[1.0.0, 2.0.0)", org.apache.commons.lang.*;version="[2.1,3.0)";resolution:=optional, org.apache.commons.logging.*;version="[1.1.0, 2.0.0)", diff --git a/spring-batch-infrastructure/pom.xml b/spring-batch-infrastructure/pom.xml index 7430d1a57..235ce195b 100644 --- a/spring-batch-infrastructure/pom.xml +++ b/spring-batch-infrastructure/pom.xml @@ -1,7 +1,8 @@ - + 4.0.0 spring-batch-infrastructure - 2.0.0.CI-SNAPSHOT + 2.0.0.CI-SNAPSHOT jar Infrastructure @@ -42,13 +43,8 @@ - org.apache.maven.plugins - maven-jar-plugin - - - src/main/resources/META-INF/MANIFEST.MF - - + com.springsource.bundlor + com.springsource.bundlor.maven org.apache.maven.plugins @@ -152,7 +148,10 @@ provided - + cglib cglib-nodep true @@ -213,4 +212,4 @@ - + \ No newline at end of file diff --git a/spring-batch-infrastructure/src/main/resources/META-INF/MANIFEST.MF b/spring-batch-infrastructure/src/main/resources/META-INF/MANIFEST.MF index 19779a98b..a82a8eff7 100644 --- a/spring-batch-infrastructure/src/main/resources/META-INF/MANIFEST.MF +++ b/spring-batch-infrastructure/src/main/resources/META-INF/MANIFEST.MF @@ -1,8 +1,8 @@ Manifest-Version: 1.0 Bundle-Name: Spring Batch Infrastructure Archiver-Version: Plexus Archiver +Built-By: dsyer Build-Jdk: 1.5.0_13 -Built-By: tsweeney Created-By: Apache Maven Import-Package: com.ibatis.sqlmap.client;version="[2.3.0, 3.0.0)";reso lution:=optional,javax.jms;version="1.1.0";resolution:=optional,javax @@ -27,90 +27,91 @@ Import-Package: com.ibatis.sqlmap.client;version="[2.3.0, 3.0.0)";reso ramework.dao;version="[2.5.5, 3.0.0)";resolution:=optional,org.spring framework.jdbc;version="[2.5.5, 3.0.0)";resolution:=optional,org.spri ngframework.jdbc.core;version="[2.5.5, 3.0.0)";resolution:=optional,o - rg.springframework.jdbc.support;version="[2.5.5, 3.0.0)";resolution:= - optional,org.springframework.jdbc.support.incrementer;version="[2.5.5 - , 3.0.0)";resolution:=optional,org.springframework.jms;version="[2.5. - 5, 3.0.0)";resolution:=optional,org.springframework.jms.core;version= - "[2.5.5, 3.0.0)";resolution:=optional,org.springframework.orm.hiberna - te3;version="[2.5.5, 3.0.0)";resolution:=optional,org.springframework - .orm.ibatis;version="[2.5.5, 3.0.0)";resolution:=optional,org.springf - ramework.orm.jpa;version="[2.5.5, 3.0.0)";resolution:=optional,org.sp - ringframework.oxm;version="[1.5.0, 2.0.0)";resolution:=optional,org.s - pringframework.transaction;version="[2.5.5, 3.0.0)";resolution:=optio - nal,org.springframework.transaction.support;version="[2.5.5, 3.0.0)"; - resolution:=optional,org.springframework.util;version="[2.5.5, 3.0.0) - ";resolution:=optional,org.springframework.validation;version="[2.5.5 - , 3.0.0)";resolution:=optional,org.springframework.xml.transform;vers - ion="[1.5.0, 2.0.0)";resolution:=optional + rg.springframework.jdbc.core.namedparam;version="[2.5.5, 3.0.0)";reso + lution:=optional,org.springframework.jdbc.core.simple;version="[2.5.5 + , 3.0.0)";resolution:=optional,org.springframework.jdbc.support;versi + on="[2.5.5, 3.0.0)";resolution:=optional,org.springframework.jdbc.sup + port.incrementer;version="[2.5.5, 3.0.0)";resolution:=optional,org.sp + ringframework.jms;version="[2.5.5, 3.0.0)";resolution:=optional,org.s + pringframework.jms.core;version="[2.5.5, 3.0.0)";resolution:=optional + ,org.springframework.orm.hibernate3;version="[2.5.5, 3.0.0)";resoluti + on:=optional,org.springframework.orm.ibatis;version="[2.5.5, 3.0.0)"; + resolution:=optional,org.springframework.orm.jpa;version="[2.5.5, 3.0 + .0)";resolution:=optional,org.springframework.oxm;version="[1.5.0, 2. + 0.0)";resolution:=optional,org.springframework.transaction;version="[ + 2.5.5, 3.0.0)";resolution:=optional,org.springframework.transaction.s + upport;version="[2.5.5, 3.0.0)";resolution:=optional,org.springframew + ork.util;version="[2.5.5, 3.0.0)";resolution:=optional,org.springfram + ework.validation;version="[2.5.5, 3.0.0)";resolution:=optional,org.sp + ringframework.xml.transform;version="[1.5.0, 2.0.0)";resolution:=opti + onal Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.springframework.batch.infrastructure Export-Package: org.springframework.batch.item;version="2.0.0.CI-SNAPS HOT",org.springframework.batch.item.adapter;version="2.0.0.CI-SNAPSHO - T";uses:="org.springframework.batch.item",org.springframework.batch.i - tem.database;version="2.0.0.CI-SNAPSHOT";uses:="com.ibatis.sqlmap.cli - ent,javax.persistence,javax.sql,org.hibernate,org.springframework.bat - ch.item,org.springframework.dao,org.springframework.jdbc.core,org.spr - ingframework.jdbc.support,org.springframework.orm.hibernate3",org.spr - ingframework.batch.item.database.support;version="2.0.0.CI-SNAPSHOT"; - uses:="com.ibatis.sqlmap.client,javax.sql,org.springframework.batch.i - tem,org.springframework.batch.item.database,org.springframework.jdbc. - core,org.springframework.jdbc.support.incrementer,org.springframework - .orm.ibatis",org.springframework.batch.item.file;version="2.0.0.CI-SN - APSHOT";uses:="org.springframework.batch.item,org.springframework.bat - ch.item.file.mapping,org.springframework.batch.item.file.separator,or - g.springframework.batch.item.file.transform,org.springframework.core. - io",org.springframework.batch.item.file.mapping;version="2.0.0.CI-SNA - PSHOT";uses:="org.springframework.beans.factory,org.springframework.v - alidation",org.springframework.batch.item.file.separator;version="2.0 - .0.CI-SNAPSHOT",org.springframework.batch.item.file.transform;version - ="2.0.0.CI-SNAPSHOT";uses:="org.springframework.batch.item.file.mappi - ng",org.springframework.batch.item.jms;version="2.0.0.CI-SNAPSHOT";us - es:="javax.jms,org.springframework.jms.core",org.springframework.batc - h.item.support;version="2.0.0.CI-SNAPSHOT";uses:="org.springframework - .batch.item,org.springframework.batch.item.file.mapping",org.springfr - amework.batch.item.transform;version="2.0.0.CI-SNAPSHOT",org.springfr - amework.batch.item.util;version="2.0.0.CI-SNAPSHOT",org.springframewo - rk.batch.item.validator;version="2.0.0.CI-SNAPSHOT";uses:="org.spring - framework.validation",org.springframework.batch.item.xml;version="2.0 - .0.CI-SNAPSHOT";uses:="javax.xml.stream,org.springframework.batch.ite - m,org.springframework.core.io",org.springframework.batch.item.xml.oxm - ;version="2.0.0.CI-SNAPSHOT";uses:="javax.xml.stream,org.springframew - ork.oxm",org.springframework.batch.item.xml.stax;version="2.0.0.CI-SN - APSHOT";uses:="javax.xml.namespace,javax.xml.stream,javax.xml.stream. - events",org.springframework.batch.repeat;version="2.0.0.CI-SNAPSHOT", - org.springframework.batch.repeat.callback;version="2.0.0.CI-SNAPSHOT" - ;uses:="org.springframework.batch.item,org.springframework.batch.repe - at",org.springframework.batch.repeat.context;version="2.0.0.CI-SNAPSH - OT";uses:="org.springframework.batch.repeat",org.springframework.batc - h.repeat.exception;version="2.0.0.CI-SNAPSHOT";uses:="org.springframe - work.batch.repeat,org.springframework.batch.support",org.springframew - ork.batch.repeat.interceptor;version="2.0.0.CI-SNAPSHOT";uses:="org.a - opalliance.intercept,org.springframework.batch.repeat",org.springfram - ework.batch.repeat.listener;version="2.0.0.CI-SNAPSHOT";uses:="org.sp - ringframework.batch.repeat",org.springframework.batch.repeat.policy;v - ersion="2.0.0.CI-SNAPSHOT";uses:="org.springframework.batch.repeat,or - g.springframework.batch.repeat.context",org.springframework.batch.rep - eat.support;version="2.0.0.CI-SNAPSHOT";uses:="org.springframework.ba - tch.repeat,org.springframework.batch.repeat.exception,org.springframe - work.core.task",org.springframework.batch.retry;version="2.0.0.CI-SNA - PSHOT",org.springframework.batch.retry.backoff;version="2.0.0.CI-SNAP - SHOT";uses:="org.springframework.batch.retry",org.springframework.bat - ch.retry.callback;version="2.0.0.CI-SNAPSHOT";uses:="org.springframew - ork.batch.retry",org.springframework.batch.retry.context;version="2.0 - .0.CI-SNAPSHOT";uses:="org.springframework.batch.retry",org.springfra - mework.batch.retry.interceptor;version="2.0.0.CI-SNAPSHOT";uses:="org - .aopalliance.intercept,org.springframework.batch.item,org.springframe - work.batch.retry",org.springframework.batch.retry.listener;version="2 - .0.0.CI-SNAPSHOT";uses:="org.springframework.batch.retry",org.springf - ramework.batch.retry.policy;version="2.0.0.CI-SNAPSHOT";uses:="org.sp - ringframework.batch.retry,org.springframework.batch.retry.callback,or - g.springframework.batch.support",org.springframework.batch.retry.supp - ort;version="2.0.0.CI-SNAPSHOT";uses:="org.springframework.batch.retr - y,org.springframework.batch.retry.backoff",org.springframework.batch. - support;version="2.0.0.CI-SNAPSHOT";uses:="org.springframework.beans" + T",org.springframework.batch.item.database;version="2.0.0.CI-SNAPSHOT + ";uses:="com.ibatis.sqlmap.client,javax.persistence,javax.sql,org.hib + ernate,org.springframework.batch.item,org.springframework.batch.item. + database.support,org.springframework.dao,org.springframework.jdbc.cor + e,org.springframework.jdbc.core.simple,org.springframework.jdbc.suppo + rt,org.springframework.orm.hibernate3",org.springframework.batch.item + .database.support;version="2.0.0.CI-SNAPSHOT";uses:="com.ibatis.sqlma + p.client,javax.sql,org.springframework.batch.item,org.springframework + .batch.item.database,org.springframework.jdbc.core,org.springframewor + k.jdbc.support.incrementer,org.springframework.orm.ibatis",org.spring + framework.batch.item.file;version="2.0.0.CI-SNAPSHOT";uses:="org.spri + ngframework.batch.item,org.springframework.batch.item.file.mapping,or + g.springframework.batch.item.file.separator,org.springframework.batch + .item.file.transform,org.springframework.batch.item.util,org.springfr + amework.core.io",org.springframework.batch.item.file.mapping;version= + "2.0.0.CI-SNAPSHOT";uses:="org.springframework.beans.factory,org.spri + ngframework.validation",org.springframework.batch.item.file.separator + ;version="2.0.0.CI-SNAPSHOT",org.springframework.batch.item.file.tran + sform;version="2.0.0.CI-SNAPSHOT";uses:="org.springframework.batch.it + em.file.mapping",org.springframework.batch.item.jms;version="2.0.0.CI + -SNAPSHOT";uses:="org.springframework.jms.core",org.springframework.b + atch.item.support;version="2.0.0.CI-SNAPSHOT";uses:="org.springframew + ork.batch.item,org.springframework.batch.item.file.mapping",org.sprin + gframework.batch.item.util;version="2.0.0.CI-SNAPSHOT",org.springfram + ework.batch.item.validator;version="2.0.0.CI-SNAPSHOT";uses:="org.spr + ingframework.validation",org.springframework.batch.item.xml;version=" + 2.0.0.CI-SNAPSHOT";uses:="javax.xml.stream,org.springframework.batch. + item,org.springframework.core.io,org.springframework.oxm",org.springf + ramework.batch.item.xml.oxm;version="2.0.0.CI-SNAPSHOT";uses:="javax. + xml.stream,org.springframework.oxm",org.springframework.batch.item.xm + l.stax;version="2.0.0.CI-SNAPSHOT";uses:="javax.xml.namespace,javax.x + ml.stream,javax.xml.stream.events",org.springframework.batch.repeat;v + ersion="2.0.0.CI-SNAPSHOT",org.springframework.batch.repeat.callback; + version="2.0.0.CI-SNAPSHOT";uses:="org.springframework.batch.repeat", + org.springframework.batch.repeat.context;version="2.0.0.CI-SNAPSHOT"; + uses:="org.springframework.batch.repeat",org.springframework.batch.re + peat.exception;version="2.0.0.CI-SNAPSHOT";uses:="org.springframework + .batch.repeat,org.springframework.batch.support",org.springframework. + batch.repeat.interceptor;version="2.0.0.CI-SNAPSHOT";uses:="org.aopal + liance.intercept,org.springframework.batch.repeat",org.springframewor + k.batch.repeat.listener;version="2.0.0.CI-SNAPSHOT";uses:="org.spring + framework.batch.repeat",org.springframework.batch.repeat.policy;versi + on="2.0.0.CI-SNAPSHOT";uses:="org.springframework.batch.repeat,org.sp + ringframework.batch.repeat.context",org.springframework.batch.repeat. + support;version="2.0.0.CI-SNAPSHOT";uses:="org.springframework.batch. + repeat,org.springframework.batch.repeat.exception,org.springframework + .core.task",org.springframework.batch.retry;version="2.0.0.CI-SNAPSHO + T",org.springframework.batch.retry.backoff;version="2.0.0.CI-SNAPSHOT + ";uses:="org.springframework.batch.retry",org.springframework.batch.r + etry.context;version="2.0.0.CI-SNAPSHOT";uses:="org.springframework.b + atch.retry",org.springframework.batch.retry.interceptor;version="2.0. + 0.CI-SNAPSHOT";uses:="org.aopalliance.intercept,org.springframework.b + atch.retry",org.springframework.batch.retry.listener;version="2.0.0.C + I-SNAPSHOT";uses:="org.springframework.batch.retry",org.springframewo + rk.batch.retry.policy;version="2.0.0.CI-SNAPSHOT";uses:="org.springfr + amework.batch.retry,org.springframework.batch.support",org.springfram + ework.batch.retry.support;version="2.0.0.CI-SNAPSHOT";uses:="org.spri + ngframework.batch.retry,org.springframework.batch.retry.backoff,org.s + pringframework.batch.retry.policy,org.springframework.batch.support", + org.springframework.batch.support;version="2.0.0.CI-SNAPSHOT";uses:=" + javax.sql,org.springframework.beans,org.springframework.jdbc.support" ,org.springframework.batch.support.transaction;version="2.0.0.CI-SNAP SHOT";uses:="org.aopalliance.intercept,org.springframework.transactio n,org.springframework.transaction.support" Bundle-Version: 2.0.0.CI-SNAPSHOT -