diff --git a/spring-batch-core/pom.xml b/spring-batch-core/pom.xml index 0ebedf56a..b0be41527 100644 --- a/spring-batch-core/pom.xml +++ b/spring-batch-core/pom.xml @@ -261,34 +261,6 @@ - - org.apache.felix - maven-bundle-plugin - - - - - - diff --git a/spring-batch-core/src/main/resources/META-INF/MANIFEST.MF b/spring-batch-core/src/main/resources/META-INF/MANIFEST.MF index 9d087f9b0..a6a779ce3 100644 --- a/spring-batch-core/src/main/resources/META-INF/MANIFEST.MF +++ b/spring-batch-core/src/main/resources/META-INF/MANIFEST.MF @@ -4,108 +4,115 @@ Archiver-Version: Plexus Archiver Build-Jdk: 1.5.0_13 Built-By: tsweeney Created-By: Apache Maven -Import-Package: edu.emory.mathcs.backport.java.util.concurrent;version - ="[3.0.0, 4.0.0)";resolution:=optional,javax.sql,org.aopalliance.aop; - version="[1.0.0, 2.0.0)",org.apache.commons.lang;version="[2.1,3.0)"; - resolution:=optional,org.apache.commons.lang.builder;version="[2.1,3. - 0)";resolution:=optional,org.apache.commons.logging;version="[1.1.0, - 2.0.0)",org.osgi.framework,org.springframework.aop;version="[2.5.5, 3 - .0.0)",org.springframework.aop.framework;version="[2.5.5, 3.0.0)",org - .springframework.aop.support;version="[2.5.5, 3.0.0)",org.springframe - work.batch.item;version="[2.0.0, 3.0.0)",org.springframework.batch.it - em.adapter;version="[2.0.0, 3.0.0)",org.springframework.batch.item.da - tabase.support;version="[2.0.0, 3.0.0)",org.springframework.batch.ite - m.support;version="[2.0.0, 3.0.0)",org.springframework.batch.item.val - idator;version="[2.0.0, 3.0.0)",org.springframework.batch.repeat;vers - ion="[2.0.0, 3.0.0)",org.springframework.batch.repeat.exception;versi - on="[2.0.0, 3.0.0)",org.springframework.batch.repeat.listener;version - ="[2.0.0, 3.0.0)",org.springframework.batch.repeat.policy;version="[2 - .0.0, 3.0.0)",org.springframework.batch.repeat.support;version="[2.0. - 0, 3.0.0)",org.springframework.batch.retry;version="[2.0.0, 3.0.0)",o - rg.springframework.batch.retry.backoff;version="[2.0.0, 3.0.0)",org.s - pringframework.batch.retry.callback;version="[2.0.0, 3.0.0)",org.spri - ngframework.batch.retry.listener;version="[2.0.0, 3.0.0)",org.springf - ramework.batch.retry.policy;version="[2.0.0, 3.0.0)",org.springframew - ork.batch.retry.support;version="[2.0.0, 3.0.0)",org.springframework. - batch.support;version="[2.0.0, 3.0.0)",org.springframework.batch.supp - ort.transaction;version="[2.0.0, 3.0.0)",org.springframework.beans;ve - rsion="[2.5.5, 3.0.0)";resolution:=optional,org.springframework.beans - .factory;version="[2.5.5, 3.0.0)";resolution:=optional,org.springfram - ework.beans.factory.config;version="[2.5.5, 3.0.0)";resolution:=optio - nal,org.springframework.beans.factory.xml;version="[2.5.5, 3.0.0)";re - solution:=optional,org.springframework.context;version="[2.5.5, 3.0.0 - )";resolution:=optional,org.springframework.context.support;version=" - [2.5.5, 3.0.0)";resolution:=optional,org.springframework.core;version - ="[2.5.5, 3.0.0)";resolution:=optional,org.springframework.core.io;ve +Import-Package: edu.emory.mathcs.backport.java.util.concurrent,javax.s + ql,org.aopalliance.aop;version="[1.0.0, 2.0.0)",org.aopalliance.inter + cept;version="[1.0.0, 2.0.0)",org.apache.commons.lang;version="[2.1,3 + .0)";resolution:=optional,org.apache.commons.lang.builder;version="[2 + .1,3.0)";resolution:=optional,org.apache.commons.logging;version="[1. + 1.0, 2.0.0)",org.osgi.framework,org.springframework.aop;version="[2.5 + .5, 3.0.0)",org.springframework.aop.framework;version="[2.5.5, 3.0.0) + ",org.springframework.aop.support;version="[2.5.5, 3.0.0)",org.spring + framework.batch.item;version="[2.0.0, 3.0.0)",org.springframework.bat + ch.item.adapter;version="[2.0.0, 3.0.0)",org.springframework.batch.it + em.database.support;version="[2.0.0, 3.0.0)",org.springframework.batc + h.item.support;version="[2.0.0, 3.0.0)",org.springframework.batch.ite + m.validator;version="[2.0.0, 3.0.0)",org.springframework.batch.repeat + ;version="[2.0.0, 3.0.0)",org.springframework.batch.repeat.exception; + version="[2.0.0, 3.0.0)",org.springframework.batch.repeat.listener;ve + rsion="[2.0.0, 3.0.0)",org.springframework.batch.repeat.policy;versio + n="[2.0.0, 3.0.0)",org.springframework.batch.repeat.support;version=" + [2.0.0, 3.0.0)",org.springframework.batch.retry;version="[2.0.0, 3.0. + 0)",org.springframework.batch.retry.backoff;version="[2.0.0, 3.0.0)", + org.springframework.batch.retry.callback;version="[2.0.0, 3.0.0)",org + .springframework.batch.retry.listener;version="[2.0.0, 3.0.0)",org.sp + ringframework.batch.retry.policy;version="[2.0.0, 3.0.0)",org.springf + ramework.batch.retry.support;version="[2.0.0, 3.0.0)",org.springframe + work.batch.support;version="[2.0.0, 3.0.0)",org.springframework.batch + .support.transaction;version="[2.0.0, 3.0.0)",org.springframework.bea + ns;version="[2.5.5, 3.0.0)";resolution:=optional,org.springframework. + beans.factory;version="[2.5.5, 3.0.0)";resolution:=optional,org.sprin + gframework.beans.factory.config;version="[2.5.5, 3.0.0)";resolution:= + optional,org.springframework.beans.factory.xml;version="[2.5.5, 3.0.0 + )";resolution:=optional,org.springframework.context;version="[2.5.5, + 3.0.0)";resolution:=optional,org.springframework.context.support;vers + ion="[2.5.5, 3.0.0)";resolution:=optional,org.springframework.core;ve rsion="[2.5.5, 3.0.0)";resolution:=optional,org.springframework.core. - task;version="[2.5.5, 3.0.0)";resolution:=optional,org.springframewor - k.dao;version="[2.5.5, 3.0.0)";resolution:=optional,org.springframewo - rk.jdbc.core;version="[2.5.5, 3.0.0)";resolution:=optional,org.spring - framework.jdbc.core.support;version="[2.5.5, 3.0.0)";resolution:=opti - onal,org.springframework.jdbc.support.incrementer;version="[2.5.5, 3. - 0.0)";resolution:=optional,org.springframework.jdbc.support.lob;versi - on="[2.5.5, 3.0.0)";resolution:=optional,org.springframework.osgi.con - text;resolution:=optional;version="[1.0.0, 2.0.0)",org.springframewo - rk.osgi.context.support;resolution:=optional;version="[1.0.0, 2.0.0) - ",org.springframework.transaction;version="[2.5.5, 3.0.0)";resolution - :=optional,org.springframework.transaction.interceptor;version="[2.5. - 5, 3.0.0)";resolution:=optional,org.springframework.transaction.suppo - rt;version="[2.5.5, 3.0.0)";resolution:=optional,org.springframework. - util;version="[2.5.5, 3.0.0)";resolution:=optional + io;version="[2.5.5, 3.0.0)";resolution:=optional,org.springframework. + core.task;version="[2.5.5, 3.0.0)";resolution:=optional,org.springfra + mework.dao;version="[2.5.5, 3.0.0)";resolution:=optional,org.springfr + amework.jdbc.core;version="[2.5.5, 3.0.0)";resolution:=optional,org.s + pringframework.jdbc.core.simple;version="[2.5.5, 3.0.0)";resolution:= + optional,org.springframework.jdbc.core.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.jdb + c.support.lob;version="[2.5.5, 3.0.0)";resolution:=optional,org.sprin + gframework.osgi.context;version="[1.1.0, 2.0.0)";resolution:=optional + ,org.springframework.osgi.context.support;version="[1.1.0, 2.0.0)";re + solution:=optional,org.springframework.transaction;version="[2.5.5, 3 + .0.0)";resolution:=optional,org.springframework.transaction.intercept + or;version="[2.5.5, 3.0.0)";resolution:=optional,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 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.springframework.batch.core Export-Package: org.springframework.batch.core;version="2.0.0.CI-SNAPS HOT";uses:="org.springframework.batch.item,org.springframework.batch. repeat",org.springframework.batch.core.configuration;version="2.0.0.C I-SNAPSHOT";uses:="org.springframework.batch.core,org.springframework - .batch.core.repository",org.springframework.batch.core.configuration. - support;version="2.0.0.CI-SNAPSHOT";uses:="org.osgi.framework,org.spr - ingframework.batch.core,org.springframework.batch.core.configuration, - org.springframework.batch.core.repository,org.springframework.beans,o - rg.springframework.context,org.springframework.core.io",org.springfra - mework.batch.core.converter;version="2.0.0.CI-SNAPSHOT";uses:="org.sp - ringframework.batch.core",org.springframework.batch.core.job;version= - "2.0.0.CI-SNAPSHOT";uses:="org.springframework.batch.core,org.springf - ramework.batch.core.listener,org.springframework.batch.core.repositor - y",org.springframework.batch.core.launch;version="2.0.0.CI-SNAPSHOT"; - uses:="org.springframework.batch.core,org.springframework.batch.core. - repository",org.springframework.batch.core.launch.support;version="2. - 0.0.CI-SNAPSHOT";uses:="org.springframework.batch.core,org.springfram - ework.batch.core.configuration,org.springframework.batch.core.convert - er,org.springframework.batch.core.launch,org.springframework.batch.co - re.repository,org.springframework.core.task",org.springframework.batc - h.core.listener;version="2.0.0.CI-SNAPSHOT";uses:="org.springframewor - k.batch.core,org.springframework.batch.repeat",org.springframework.ba - tch.core.repository;version="2.0.0.CI-SNAPSHOT";uses:="org.springfram - ework.batch.core",org.springframework.batch.core.repository.dao;versi - on="2.0.0.CI-SNAPSHOT";uses:="org.springframework.batch.core,org.spri - ngframework.batch.item,org.springframework.dao,org.springframework.jd - bc.core,org.springframework.jdbc.support.incrementer,org.springframew - ork.jdbc.support.lob",org.springframework.batch.core.repository.suppo - rt;version="2.0.0.CI-SNAPSHOT";uses:="javax.sql,org.springframework.b - atch.core,org.springframework.batch.core.repository,org.springframewo - rk.batch.core.repository.dao,org.springframework.batch.item.database. - support,org.springframework.transaction",org.springframework.batch.co - re.resource;version="2.0.0.CI-SNAPSHOT";uses:="org.springframework.ba - tch.core,org.springframework.batch.core.converter,org.springframework - .batch.repeat,org.springframework.core.io",org.springframework.batch. - core.step;version="2.0.0.CI-SNAPSHOT";uses:="org.springframework.batc - h.core,org.springframework.batch.core.repository,org.springframework. - batch.item,org.springframework.batch.repeat",org.springframework.batc - h.core.step.item;version="2.0.0.CI-SNAPSHOT";uses:="org.apache.common - s.logging,org.springframework.batch.core,org.springframework.batch.co - re.listener,org.springframework.batch.core.repository,org.springframe - work.batch.core.step,org.springframework.batch.core.step.skip,org.spr - ingframework.batch.item,org.springframework.batch.item.support,org.sp - ringframework.batch.item.validator,org.springframework.batch.repeat,o - rg.springframework.batch.repeat.exception,org.springframework.batch.r - epeat.support,org.springframework.batch.retry,org.springframework.bat - ch.retry.backoff,org.springframework.core.task,org.springframework.tr - ansaction,org.springframework.transaction.interceptor",org.springfram - ework.batch.core.step.skip;version="2.0.0.CI-SNAPSHOT",org.springfram - ework.batch.core.step.tasklet;version="2.0.0.CI-SNAPSHOT";uses:="org. - springframework.batch.core,org.springframework.batch.core.repository, - org.springframework.batch.repeat" + .batch.core.launch",org.springframework.batch.core.configuration.supp + ort;version="2.0.0.CI-SNAPSHOT";uses:="org.osgi.framework,org.springf + ramework.batch.core,org.springframework.batch.core.configuration,org. + springframework.batch.core.launch,org.springframework.beans,org.sprin + gframework.context,org.springframework.core.io",org.springframework.b + atch.core.converter;version="2.0.0.CI-SNAPSHOT";uses:="org.springfram + ework.batch.core",org.springframework.batch.core.explore;version="2.0 + .0.CI-SNAPSHOT";uses:="org.springframework.batch.core",org.springfram + ework.batch.core.explore.support;version="2.0.0.CI-SNAPSHOT";uses:="j + avax.sql,org.springframework.batch.core,org.springframework.batch.cor + e.repository.dao,org.springframework.batch.item.database.support",org + .springframework.batch.core.job;version="2.0.0.CI-SNAPSHOT";uses:="or + g.springframework.batch.core,org.springframework.batch.core.listener, + org.springframework.batch.core.repository",org.springframework.batch. + core.launch;version="2.0.0.CI-SNAPSHOT";uses:="org.springframework.ba + tch.core,org.springframework.batch.core.repository",org.springframewo + rk.batch.core.launch.support;version="2.0.0.CI-SNAPSHOT";uses:="org.a + opalliance.intercept,org.springframework.batch.core,org.springframewo + rk.batch.core.configuration,org.springframework.batch.core.converter, + org.springframework.batch.core.explore,org.springframework.batch.core + .launch,org.springframework.batch.core.repository,org.springframework + .core.task",org.springframework.batch.core.listener;version="2.0.0.CI + -SNAPSHOT";uses:="org.springframework.batch.core,org.springframework. + batch.repeat",org.springframework.batch.core.repository;version="2.0. + 0.CI-SNAPSHOT";uses:="org.springframework.batch.core",org.springframe + work.batch.core.repository.dao;version="2.0.0.CI-SNAPSHOT";uses:="org + .springframework.batch.core,org.springframework.batch.item,org.spring + framework.dao,org.springframework.jdbc.core.simple,org.springframewor + k.jdbc.support.incrementer,org.springframework.jdbc.support.lob",org. + springframework.batch.core.repository.support;version="2.0.0.CI-SNAPS + HOT";uses:="javax.sql,org.springframework.batch.core,org.springframew + ork.batch.core.repository,org.springframework.batch.core.repository.d + ao,org.springframework.batch.item.database.support,org.springframewor + k.transaction",org.springframework.batch.core.resource;version="2.0.0 + .CI-SNAPSHOT";uses:="org.springframework.batch.core,org.springframewo + rk.batch.core.converter,org.springframework.batch.repeat,org.springfr + amework.core.io",org.springframework.batch.core.step;version="2.0.0.C + I-SNAPSHOT";uses:="org.springframework.batch.core,org.springframework + .batch.core.repository,org.springframework.batch.item,org.springframe + work.batch.repeat",org.springframework.batch.core.step.item;version=" + 2.0.0.CI-SNAPSHOT";uses:="org.apache.commons.logging,org.springframew + ork.batch.core,org.springframework.batch.core.listener,org.springfram + ework.batch.core.repository,org.springframework.batch.core.step,org.s + pringframework.batch.core.step.skip,org.springframework.batch.item,or + g.springframework.batch.item.support,org.springframework.batch.item.v + alidator,org.springframework.batch.repeat,org.springframework.batch.r + epeat.exception,org.springframework.batch.repeat.support,org.springfr + amework.batch.retry,org.springframework.batch.retry.backoff,org.sprin + gframework.core.task,org.springframework.transaction,org.springframew + ork.transaction.interceptor",org.springframework.batch.core.step.skip + ;version="2.0.0.CI-SNAPSHOT",org.springframework.batch.core.step.task + let;version="2.0.0.CI-SNAPSHOT";uses:="org.springframework.batch.core + ,org.springframework.batch.core.repository,org.springframework.batch. + repeat" Bundle-Version: 2.0.0.CI-SNAPSHOT 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 0e7d933f0..f9eb3796e 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,8 +6,7 @@ Ignored-Existing-Headers: Import-Package, Export-Package Import-Template: - edu.emory.mathcs.backport.*;version="[3.0.0, 4.0.0)";resolution:=optional, - org.aopalliance.aop.*;version="[1.0.0, 2.0.0)", + 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)", org.springframework.aop.*;version="[2.5.5, 3.0.0)", diff --git a/spring-batch-infrastructure/pom.xml b/spring-batch-infrastructure/pom.xml index effc788b2..8ffea0c5d 100644 --- a/spring-batch-infrastructure/pom.xml +++ b/spring-batch-infrastructure/pom.xml @@ -54,40 +54,6 @@ org.apache.maven.plugins maven-antrun-plugin - - org.apache.felix - maven-bundle-plugin - - - - - - diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/context/AtomicCounter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/context/AtomicCounter.java deleted file mode 100644 index d51838938..000000000 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/context/AtomicCounter.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2006-2007 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.batch.repeat.context; - -/** - * @author Dave Syer - * - */ -interface AtomicCounter { - - /** - * Atomic addition. - * @param delta the delta to add to the value - */ - void addAndGet(int delta); - - /** - * @return the current value - */ - int intValue(); - -} 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 7b6924f80..8dbb52e86 100644 --- a/spring-batch-infrastructure/src/main/resources/META-INF/MANIFEST.MF +++ b/spring-batch-infrastructure/src/main/resources/META-INF/MANIFEST.MF @@ -5,109 +5,114 @@ 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,edu.emory.mathcs.backport.java.util.concurrent;versi - on="[3.0.0, 4.0.0)";resolution:=optional,edu.emory.mathcs.backport.ja - va.util.concurrent.atomic;version="[3.0.0, 4.0.0)";resolution:=option - al,javax.jms;version="1.1.0";resolution:=optional,javax.sql,javax.xml - .namespace,javax.xml.stream;version="1.2.0";resolution:=optional,java - x.xml.stream.events;version="1.2.0";resolution:=optional,javax.xml.tr - ansform,org.aopalliance.aop;version="1.0.0";resolution:=optional,org. - aopalliance.intercept;version="1.0.0";resolution:=optional,org.apache - .commons.logging;version="[1.1.0, 2.0.0)",org.hibernate;version="[3.2 - .5.ga, 3.3.0.ga)";resolution:=optional,org.hibernate.classic;version= - "[3.2.5.ga, 3.3.0.ga)";resolution:=optional,org.springframework.aop;v - ersion="[2.5.5, 3.0.0)";resolution:=optional,org.springframework.aop. - framework;version="[2.5.5, 3.0.0)";resolution:=optional,org.springfra - mework.aop.support;version="[2.5.5, 3.0.0)";resolution:=optional,org. - springframework.beans;version="[2.5.5, 3.0.0)";resolution:=optional,o - rg.springframework.beans.factory;version="[2.5.5, 3.0.0)";resolution: - =optional,org.springframework.core;version="[2.5.5, 3.0.0)";resolutio - n:=optional,org.springframework.core.enums;version="[2.5.5, 3.0.0)";r - esolution:=optional,org.springframework.core.io;version="[2.5.5, 3.0. - 0)";resolution:=optional,org.springframework.core.task;version="[2.5. - 5, 3.0.0)";resolution:=optional,org.springframework.dao;version="[2.5 - .5, 3.0.0)";resolution:=optional,org.springframework.jdbc;version="[2 - .5.5, 3.0.0)";resolution:=optional,org.springframework.jdbc.core;vers - ion="[2.5.5, 3.0.0)";resolution:=optional,org.springframework.jdbc.su - pport;version="[2.5.5, 3.0.0)";resolution:=optional,org.springframewo - rk.jdbc.support.incrementer;version="[2.5.5, 3.0.0)";resolution:=opti - onal,org.springframework.jms;version="[2.5.5, 3.0.0)";resolution:=opt - ional,org.springframework.jms.core;version="[2.5.5, 3.0.0)";resolutio - n:=optional,org.springframework.orm.hibernate3;version="[2.5.5, 3.0.0 - )";resolution:=optional,org.springframework.orm.ibatis;version="[2.5. - 5, 3.0.0)";resolution:=optional,org.springframework.oxm;version="[1.5 - .0, 2.0.0)";resolution:=optional,org.springframework.transaction;vers - ion="[2.5.5, 3.0.0)";resolution:=optional,org.springframework.transac - tion.support;version="[2.5.5, 3.0.0)";resolution:=optional,org.spring - framework.util;version="[2.5.5, 3.0.0)";resolution:=optional,org.spri - ngframework.validation;version="[2.5.5, 3.0.0)";resolution:=optional, - org.springframework.xml.transform;version="[1.5.0, 2.0.0)";resolution - :=optional + lution:=optional,javax.jms;version="1.1.0";resolution:=optional,javax + .persistence;version="[1.0.0,2.0.0)";resolution:=optional,javax.sql,j + avax.xml.namespace,javax.xml.stream;version="1.2.0";resolution:=optio + nal,javax.xml.stream.events;version="1.2.0";resolution:=optional,java + x.xml.transform,org.aopalliance.aop;version="[1.0.0, 2.0.0)";resoluti + on:=optional,org.aopalliance.intercept;version="[1.0.0, 2.0.0)";resol + ution:=optional,org.apache.commons.logging;version="[1.1.0, 2.0.0)",o + rg.hibernate;version="[3.2.5.ga, 3.3.0.ga)";resolution:=optional,org. + hibernate.classic;version="[3.2.5.ga, 3.3.0.ga)";resolution:=optional + ,org.springframework.aop;version="[2.5.5, 3.0.0)";resolution:=optiona + l,org.springframework.aop.framework;version="[2.5.5, 3.0.0)";resoluti + on:=optional,org.springframework.aop.support;version="[2.5.5, 3.0.0)" + ;resolution:=optional,org.springframework.beans;version="[2.5.5, 3.0. + 0)";resolution:=optional,org.springframework.beans.factory;version="[ + 2.5.5, 3.0.0)";resolution:=optional,org.springframework.core;version= + "[2.5.5, 3.0.0)";resolution:=optional,org.springframework.core.enums; + version="[2.5.5, 3.0.0)";resolution:=optional,org.springframework.cor + e.io;version="[2.5.5, 3.0.0)";resolution:=optional,org.springframewor + k.core.task;version="[2.5.5, 3.0.0)";resolution:=optional,org.springf + 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 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.springframework.batch.infrastructure -Export-Package: org.springframework.batch.item;version="2.0.0.CI",org. - springframework.batch.item.adapter;version="2.0.0.CI";uses:="org.spri - ngframework.batch.item",org.springframework.batch.item.database;versi - on="2.0.0.CI";uses:="com.ibatis.sqlmap.client,javax.sql,org.hibernate - ,org.springframework.batch.item,org.springframework.dao,org.springfra - mework.jdbc.core,org.springframework.jdbc.support,org.springframework - .orm.hibernate3",org.springframework.batch.item.database.support;vers - ion="2.0.0.CI";uses:="com.ibatis.sqlmap.client,javax.sql,org.springfr - amework.batch.item,org.springframework.batch.item.database,org.spring - framework.jdbc.core,org.springframework.jdbc.support.incrementer,org. - springframework.orm.ibatis",org.springframework.batch.item.file;versi - on="2.0.0.CI";uses:="org.springframework.batch.item,org.springframewo - rk.batch.item.file.mapping,org.springframework.batch.item.file.separa - tor,org.springframework.batch.item.file.transform,org.springframework - .core.io",org.springframework.batch.item.file.mapping;version="2.0.0. - CI";uses:="org.springframework.beans.factory,org.springframework.vali - dation",org.springframework.batch.item.file.separator;version="2.0.0. - CI";uses:="org.springframework.batch.item,org.springframework.core.io - ",org.springframework.batch.item.file.transform;version="2.0.0.CI";us - es:="org.springframework.batch.item.file.mapping,org.springframework. - batch.item.transform",org.springframework.batch.item.jms;version="2.0 - .0.CI";uses:="javax.jms,org.springframework.jms.core",org.springframe - work.batch.item.support;version="2.0.0.CI";uses:="org.springframework - .batch.item",org.springframework.batch.item.transform;version="2.0.0. - CI",org.springframework.batch.item.util;version="2.0.0.CI",org.spring - framework.batch.item.validator;version="2.0.0.CI";uses:="org.springfr - amework.validation",org.springframework.batch.item.xml;version="2.0.0 - .CI";uses:="javax.xml.stream,org.springframework.batch.item,org.sprin - gframework.core.io",org.springframework.batch.item.xml.oxm;version="2 - .0.0.CI";uses:="javax.xml.stream,org.springframework.oxm",org.springf - ramework.batch.item.xml.stax;version="2.0.0.CI";uses:="javax.xml.name - space,javax.xml.stream,javax.xml.stream.events",org.springframework.b - atch.repeat;version="2.0.0.CI",org.springframework.batch.repeat.callb - ack;version="2.0.0.CI";uses:="org.springframework.batch.item,org.spri - ngframework.batch.repeat",org.springframework.batch.repeat.context;ve - rsion="2.0.0.CI";uses:="org.springframework.batch.repeat",org.springf - ramework.batch.repeat.exception;version="2.0.0.CI";uses:="org.springf - ramework.batch.repeat,org.springframework.batch.support",org.springfr - amework.batch.repeat.interceptor;version="2.0.0.CI";uses:="org.aopall - iance.intercept,org.springframework.batch.repeat",org.springframework - .batch.repeat.listener;version="2.0.0.CI";uses:="org.springframework. - batch.repeat",org.springframework.batch.repeat.policy;version="2.0.0. - CI";uses:="org.springframework.batch.repeat,org.springframework.batch - .repeat.context",org.springframework.batch.repeat.support;version="2. - 0.0.CI";uses:="org.springframework.batch.repeat,org.springframework.b - atch.repeat.exception,org.springframework.core.task",org.springframew - ork.batch.retry;version="2.0.0.CI",org.springframework.batch.retry.ba - ckoff;version="2.0.0.CI";uses:="org.springframework.batch.retry",org. - springframework.batch.retry.callback;version="2.0.0.CI";uses:="org.sp - ringframework.batch.retry",org.springframework.batch.retry.context;ve - rsion="2.0.0.CI";uses:="org.springframework.batch.retry",org.springfr - amework.batch.retry.interceptor;version="2.0.0.CI";uses:="org.aopalli - ance.intercept,org.springframework.batch.item,org.springframework.bat - ch.retry",org.springframework.batch.retry.listener;version="2.0.0.CI" - ;uses:="org.springframework.batch.retry",org.springframework.batch.re - try.policy;version="2.0.0.CI";uses:="org.springframework.batch.retry, - org.springframework.batch.retry.callback,org.springframework.batch.su - pport",org.springframework.batch.retry.support;version="2.0.0.CI";use - s:="org.springframework.batch.retry,org.springframework.batch.retry.b - ackoff",org.springframework.batch.support;version="2.0.0.CI";uses:="o - rg.springframework.beans",org.springframework.batch.support.transacti - on;version="2.0.0.CI";uses:="org.aopalliance.intercept,org.springfram - ework.transaction,org.springframework.transaction.support" -Bundle-Version: 2.0.0.CI +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";uses:="org.springframework.batch.item,org.springframe + work.core.io",org.springframework.batch.item.file.transform;version=" + 2.0.0.CI-SNAPSHOT";uses:="org.springframework.batch.item.file.mapping + ,org.springframework.batch.item.transform",org.springframework.batch. + item.jms;version="2.0.0.CI-SNAPSHOT";uses:="javax.jms,org.springframe + work.jms.core",org.springframework.batch.item.support;version="2.0.0. + CI-SNAPSHOT";uses:="org.springframework.batch.item,org.springframewor + k.batch.item.file.mapping",org.springframework.batch.item.transform;v + ersion="2.0.0.CI-SNAPSHOT",org.springframework.batch.item.util;versio + n="2.0.0.CI-SNAPSHOT",org.springframework.batch.item.validator;versio + n="2.0.0.CI-SNAPSHOT";uses:="org.springframework.validation",org.spri + ngframework.batch.item.xml;version="2.0.0.CI-SNAPSHOT";uses:="javax.x + ml.stream,org.springframework.batch.item,org.springframework.core.io" + ,org.springframework.batch.item.xml.oxm;version="2.0.0.CI-SNAPSHOT";u + ses:="javax.xml.stream,org.springframework.oxm",org.springframework.b + atch.item.xml.stax;version="2.0.0.CI-SNAPSHOT";uses:="javax.xml.names + pace,javax.xml.stream,javax.xml.stream.events",org.springframework.ba + tch.repeat;version="2.0.0.CI-SNAPSHOT",org.springframework.batch.repe + at.callback;version="2.0.0.CI-SNAPSHOT";uses:="org.springframework.ba + tch.item,org.springframework.batch.repeat",org.springframework.batch. + repeat.context;version="2.0.0.CI-SNAPSHOT";uses:="org.springframework + .batch.repeat",org.springframework.batch.repeat.exception;version="2. + 0.0.CI-SNAPSHOT";uses:="org.springframework.batch.repeat,org.springfr + amework.batch.support",org.springframework.batch.repeat.interceptor;v + ersion="2.0.0.CI-SNAPSHOT";uses:="org.aopalliance.intercept,org.sprin + gframework.batch.repeat",org.springframework.batch.repeat.listener;ve + rsion="2.0.0.CI-SNAPSHOT";uses:="org.springframework.batch.repeat",or + g.springframework.batch.repeat.policy;version="2.0.0.CI-SNAPSHOT";use + s:="org.springframework.batch.repeat,org.springframework.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.springfram + ework.batch.retry;version="2.0.0.CI-SNAPSHOT",org.springframework.bat + ch.retry.backoff;version="2.0.0.CI-SNAPSHOT";uses:="org.springframewo + rk.batch.retry",org.springframework.batch.retry.callback;version="2.0 + .0.CI-SNAPSHOT";uses:="org.springframework.batch.retry",org.springfra + mework.batch.retry.context;version="2.0.0.CI-SNAPSHOT";uses:="org.spr + ingframework.batch.retry",org.springframework.batch.retry.interceptor + ;version="2.0.0.CI-SNAPSHOT";uses:="org.aopalliance.intercept,org.spr + ingframework.batch.item,org.springframework.batch.retry",org.springfr + amework.batch.retry.listener;version="2.0.0.CI-SNAPSHOT";uses:="org.s + pringframework.batch.retry",org.springframework.batch.retry.policy;ve + rsion="2.0.0.CI-SNAPSHOT";uses:="org.springframework.batch.retry,org. + springframework.batch.retry.callback,org.springframework.batch.suppor + t",org.springframework.batch.retry.support;version="2.0.0.CI-SNAPSHOT + ";uses:="org.springframework.batch.retry,org.springframework.batch.re + try.backoff",org.springframework.batch.support;version="2.0.0.CI-SNAP + SHOT";uses:="org.springframework.beans",org.springframework.batch.sup + port.transaction;version="2.0.0.CI-SNAPSHOT";uses:="org.aopalliance.i + ntercept,org.springframework.transaction,org.springframework.transact + ion.support" +Bundle-Version: 2.0.0.CI-SNAPSHOT diff --git a/spring-batch-infrastructure/src/main/resources/META-INF/spring-batch-infrastructure.mf b/spring-batch-infrastructure/src/main/resources/META-INF/spring-batch-infrastructure.mf index 07fe56609..41d760a49 100644 --- a/spring-batch-infrastructure/src/main/resources/META-INF/spring-batch-infrastructure.mf +++ b/spring-batch-infrastructure/src/main/resources/META-INF/spring-batch-infrastructure.mf @@ -4,10 +4,10 @@ Bundle-ManifestVersion: 2 Bundle-Name: Spring Batch Infrastructure Import-Template: com.ibatis.sqlmap.*;version="[2.3.0, 3.0.0)";resolution:=optional, - edu.emory.mathcs.backport.*;version="[3.0.0, 4.0.0)";resolution:=optional, javax.jms.*;version=1.1.0;resolution:=optional, javax.xml.stream.*;version=1.2.0;resolution:=optional, - org.aopalliance.*;version=1.0.0;resolution:=optional, + javax.persistence.*;version="[1.0.0,2.0.0)";resolution:=optional, + org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional, org.apache.commons.logging.*;version="[1.1.0, 2.0.0)", org.hibernate.*;version="[3.2.5.ga, 3.3.0.ga)";resolution:=optional, org.springframework.aop.*;version="[2.5.5, 3.0.0)";resolution:=optional, diff --git a/spring-batch-samples/pom.xml b/spring-batch-samples/pom.xml index 79c427ebc..c5f5ebc69 100644 --- a/spring-batch-samples/pom.xml +++ b/spring-batch-samples/pom.xml @@ -104,12 +104,10 @@ commons-io commons-io - test commons-dbcp commons-dbcp - test org.springframework.ws @@ -161,11 +159,6 @@ cglib-nodep true - - backport-util-concurrent - backport-util-concurrent - true - org.apache.ibatis ibatis-sqlmap