diff options
| author | Robert Gemmell <robbie@apache.org> | 2014-01-31 15:52:15 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2014-01-31 15:52:15 +0000 |
| commit | e39e8353b5321a8ddd9a19054e83822a7b629684 (patch) | |
| tree | 50b8c6513d4fec6a55e613bb44bf75b607df8332 /qpid/java/jca | |
| parent | f7e49d4b3d51aa3b9c1e57032f1ade212552dbac (diff) | |
| download | qpid-python-e39e8353b5321a8ddd9a19054e83822a7b629684.tar.gz | |
QPID-5527: Upgrade to Jetty 8
Applied patch from Emmanuel Bourg.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1563153 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/jca')
| -rw-r--r-- | qpid/java/jca/build.xml | 2 | ||||
| -rw-r--r-- | qpid/java/jca/example/build-geronimo-properties.xml | 3 | ||||
| -rw-r--r-- | qpid/java/jca/pom.xml | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/qpid/java/jca/build.xml b/qpid/java/jca/build.xml index 7137467e4b..83cc781ba9 100644 --- a/qpid/java/jca/build.xml +++ b/qpid/java/jca/build.xml @@ -24,7 +24,7 @@ <property name="module.name" value="jca"/> <property name="module.genpom" value="true"/> - <property name="module.genpom.args" value="-Sgeronimo-j2ee-connector_1.5_spec=provided -Sgeronimo-jta_1.1_spec=provided -Sgeronimo-jms_1.1_spec=provided -Sgeronimo-ejb_3.0_spec=provided -Sgeronimo-servlet_2.5_spec=provided -Sgeronimo-kernel=provided"/> + <property name="module.genpom.args" value="-Sgeronimo-j2ee-connector_1.5_spec=provided -Sgeronimo-jta_1.1_spec=provided -Sgeronimo-jms_1.1_spec=provided -Sgeronimo-ejb_3.0_spec=provided -Sgeronimo-servlet_3.0_spec=provided -Sgeronimo-kernel=provided"/> <import file="../module.xml"/> diff --git a/qpid/java/jca/example/build-geronimo-properties.xml b/qpid/java/jca/example/build-geronimo-properties.xml index a20753117f..3c84b7634a 100644 --- a/qpid/java/jca/example/build-geronimo-properties.xml +++ b/qpid/java/jca/example/build-geronimo-properties.xml @@ -87,7 +87,6 @@ <path id="compile.classpath"> <fileset dir="${geronimo.home}/repository/org/apache/geronimo/specs"> <include name="geronimo-jms_1.1_spec/1.1.1/geronimo-jms_1.1_spec-1.1.1.jar"/> - <include name="geronimo-servlet_2.5_spec/1.2/geronimo-servlet_2.5_spec-1.2.jar"/> <include name="geronimo-ejb_3.0_spec/1.0.1/geronimo-ejb_3.0_spec-1.0.1.jar"/> <include name="geronimo-jta_1.1_spec/1.1.1/geronimo-jta_1.1_spec-1.1.1.jar"/> @@ -113,7 +112,7 @@ <fileset dir="${geronimo.home}/repository/org/apache/geronimo/specs"> <include name="geronimo-j2ee-connector_1.5_spec/2.0.0/geronimo-j2ee-connector_1.5_spec-2.0.0.jar"/> <include name="geronimo-jms_1.1_spec/1.1.1/geronimo-jms_1.1_spec-1.1.1.jar"/> - <include name="geronimo-servlet_2.5_spec/1.2/geronimo-servlet_2.5_spec-1.2.jar"/> + <include name="geronimo-servlet_3.0_spec/1.0/geronimo-servlet_3.0_spec-1.0.jar"/> <include name="geronimo-ejb_3.0_spec/1.0.1/geronimo-ejb_3.0_spec-1.0.1.jar"/> <include name="geronimo-jta_1.1_spec/1.1.1/geronimo-jta_1.1_spec-1.1.1.jar"/> </fileset> diff --git a/qpid/java/jca/pom.xml b/qpid/java/jca/pom.xml index 859b8aabac..c7a8de61fe 100644 --- a/qpid/java/jca/pom.xml +++ b/qpid/java/jca/pom.xml @@ -70,8 +70,8 @@ <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_2.5_spec</artifactId> - <version>1.2</version> + <artifactId>geronimo-servlet_3.0_spec</artifactId> + <version>1.0</version> <scope>provided</scope> </dependency> |