You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by an...@apache.org on 2012/04/28 01:19:56 UTC
svn commit: r1331633 - in /karaf/trunk:
assemblies/features/standard/src/main/feature/feature.xml pom.xml
Author: anierbeck
Date: Fri Apr 27 23:19:55 2012
New Revision: 1331633
URL: http://svn.apache.org/viewvc?rev=1331633&view=rev
Log:
[KARAF-1258] - Upgrade to Jetty 8.1.3.v20120416
Modified:
karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
karaf/trunk/pom.xml
Modified: karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml?rev=1331633&r1=1331632&r2=1331633&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml (original)
+++ karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml Fri Apr 27 23:19:55 2012
@@ -83,7 +83,7 @@
<bundle dependency="true" start-level="30">mvn:${servlet.spec.groupId}/${servlet.spec.artifactId}/${servlet.spec.version}</bundle>
<bundle dependency="true" start-level="30">mvn:javax.mail/mail/${javax.mail.version}</bundle>
<bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
- <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo.annotation-spec.version}</bundle>
+ <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo.annotation-spec.version}</bundle>
<bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jaspic_1.0_spec/${geronimo.jaspic-spec.version}</bundle>
<bundle start-level="30">mvn:org.eclipse.jetty.aggregate/jetty-all-server/${jetty.version}</bundle>
</feature>
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1331633&r1=1331632&r2=1331633&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Fri Apr 27 23:19:55 2012
@@ -130,7 +130,7 @@
<commons-jexl.version>2.0</commons-jexl.version>
<commons-lang.version>2.6</commons-lang.version>
<jasypt.bundle.version>1.9.0_1</jasypt.bundle.version>
- <jetty.version>8.0.4.v20111024</jetty.version>
+ <jetty.version>8.1.3.v20120416</jetty.version>
<servlet.spec.groupId>org.mortbay.jetty</servlet.spec.groupId>
<servlet.spec.artifactId>servlet-api</servlet.spec.artifactId>
<servlet.spec.version>3.0.20100224</servlet.spec.version>
@@ -142,7 +142,7 @@
<geronimo.jms-spec.version>1.1.1</geronimo.jms-spec.version>
<geronimo.jpa-spec.version>1.1</geronimo.jpa-spec.version>
<geronimo.jta-spec.version>1.1.1</geronimo.jta-spec.version>
- <geronimo.annotation-spec.version>1.1.1</geronimo.annotation-spec.version>
+ <geronimo.annotation-spec.version>1.0.1</geronimo.annotation-spec.version>
<geronimo.jaspic-spec.version>1.0</geronimo.jaspic-spec.version>
<easymock.version>3.1</easymock.version>
<equinox.version>3.7.1.R37x_v20110808-1106</equinox.version>