This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/master by this push:
new ccf7657 Karaf 5412 (#404)
ccf7657 is described below
commit ccf76574a7c7e7bc6dd84115254301b8dcd5829a
Author: Guillaume Nodet <[email protected]>
AuthorDate: Thu Nov 30 17:14:24 2017 +0100
Karaf 5412 (#404)
[KARAF-5412] Upgrade to ASM 6.0, XBean 4.6, SpiFly 1.0.10, Pax-Web
6.1.0-SNAPSHOT
---
assemblies/features/standard/pom.xml | 3 -
.../features/standard/src/main/feature/feature.xml | 68 ++++++++++++----------
itests/pom.xml | 10 ----
itests/src/test/filtered-resources/etc/feature.xml | 14 ++++-
jaas/blueprint/jasypt/pom.xml | 22 ++++++-
pom.xml | 32 ++++++++--
service/guard/pom.xml | 33 +++++++----
tooling/karaf-maven-plugin/pom.xml | 1 -
8 files changed, 118 insertions(+), 65 deletions(-)
diff --git a/assemblies/features/standard/pom.xml
b/assemblies/features/standard/pom.xml
index 21c4536..283483a 100644
--- a/assemblies/features/standard/pom.xml
+++ b/assemblies/features/standard/pom.xml
@@ -36,11 +36,8 @@
<properties>
<appendedResourcesDirectory>${basedir}/../../../../etc/appended-resources</appendedResourcesDirectory>
- <dependency.jetty.version>9.3.15.v20161220</dependency.jetty.version>
<javax.annotation.version>1.2</javax.annotation.version>
<geronimo.jaspic-spec.version>1.1</geronimo.jaspic-spec.version>
- <aries.spifly.version>1.0.2</aries.spifly.version>
- <dependency.websocket.version>1.1</dependency.websocket.version>
</properties>
<dependencies>
diff --git a/assemblies/features/standard/src/main/feature/feature.xml
b/assemblies/features/standard/src/main/feature/feature.xml
index d18fc56..437bef5 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -32,7 +32,11 @@
<feature name="aries-proxy" description="Aries Proxy"
version="${project.version}">
<!-- false to avoid restarts of proxy which cascades badly -->
- <bundle dependency="false"
start-level="20">mvn:org.ow2.asm/asm-all/${asm.version}</bundle>
+ <bundle dependency="false"
start-level="20">mvn:org.ow2.asm/asm/${asm.version}</bundle>
+ <bundle dependency="false"
start-level="20">mvn:org.ow2.asm/asm-util/${asm.version}</bundle>
+ <bundle dependency="false"
start-level="20">mvn:org.ow2.asm/asm-tree/${asm.version}</bundle>
+ <bundle dependency="false"
start-level="20">mvn:org.ow2.asm/asm-analysis/${asm.version}</bundle>
+ <bundle dependency="false"
start-level="20">mvn:org.ow2.asm/asm-commons/${asm.version}</bundle>
<bundle
start-level="20">mvn:org.apache.aries.proxy/org.apache.aries.proxy/${aries.proxy.version}</bundle>
</feature>
@@ -582,43 +586,47 @@
<bundle
start-level="30">mvn:org.apache.karaf.web/org.apache.karaf.web.core/${project.version}</bundle>
</feature>
- <feature name="jetty" version="${dependency.jetty.version}">
+ <feature name="jetty" version="${jetty.version}">
<bundle dependency="true"
start-level="30">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version}</bundle>
<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:javax.annotation/javax.annotation-api/${javax.annotation.version}</bundle>
<bundle dependency="true"
start-level="30">mvn:org.apache.geronimo.specs/geronimo-jaspic_1.0_spec/${geronimo.jaspic-spec.version}</bundle>
- <bundle dependency="true"
start-level="30">mvn:org.ow2.asm/asm-all/${asm.version}</bundle>
+ <bundle dependency="true"
start-level="30">mvn:org.ow2.asm/asm/${asm.version}</bundle>
+ <bundle dependency="true"
start-level="30">mvn:org.ow2.asm/asm-util/${asm.version}</bundle>
+ <bundle dependency="true"
start-level="30">mvn:org.ow2.asm/asm-tree/${asm.version}</bundle>
+ <bundle dependency="true"
start-level="30">mvn:org.ow2.asm/asm-analysis/${asm.version}</bundle>
+ <bundle dependency="true"
start-level="30">mvn:org.ow2.asm/asm-commons/${asm.version}</bundle>
<bundle dependency="true"
start-level="30">mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/${aries.spifly.version}</bundle>
<bundle dependency="true"
start-level="30">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
- <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-continuation/${dependency.jetty.version}</bundle>
- <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-http/${dependency.jetty.version}</bundle>
- <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-io/${dependency.jetty.version}</bundle>
- <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-jaspi/${dependency.jetty.version}</bundle>
- <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-plus/${dependency.jetty.version}</bundle>
- <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-jndi/${dependency.jetty.version}</bundle>
- <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-rewrite/${dependency.jetty.version}</bundle>
- <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-security/${dependency.jetty.version}</bundle>
- <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-server/${dependency.jetty.version}</bundle>
- <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-servlet/${dependency.jetty.version}</bundle>
- <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-servlets/${dependency.jetty.version}</bundle>
- <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-util/${dependency.jetty.version}</bundle>
- <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-util-ajax/${dependency.jetty.version}</bundle>
- <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-webapp/${dependency.jetty.version}</bundle>
- <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-jaas/${dependency.jetty.version}</bundle>
- <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-xml/${dependency.jetty.version}</bundle>
- <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-client/${dependency.jetty.version}</bundle>
- <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-deploy/${dependency.jetty.version}</bundle>
- <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-jmx/${dependency.jetty.version}</bundle>
- <bundle
start-level="30">mvn:org.eclipse.jetty.websocket/websocket-server/${dependency.jetty.version}</bundle>
- <bundle
start-level="30">mvn:org.eclipse.jetty.websocket/websocket-client/${dependency.jetty.version}</bundle>
- <bundle
start-level="30">mvn:org.eclipse.jetty.websocket/websocket-common/${dependency.jetty.version}</bundle>
- <bundle
start-level="30">mvn:org.eclipse.jetty.websocket/websocket-servlet/${dependency.jetty.version}</bundle>
- <bundle
start-level="30">mvn:org.eclipse.jetty.websocket/websocket-api/${dependency.jetty.version}</bundle>
- <bundle
start-level="30">mvn:org.eclipse.jetty.websocket/javax-websocket-server-impl/${dependency.jetty.version}</bundle>
- <bundle
start-level="30">mvn:org.eclipse.jetty.websocket/javax-websocket-client-impl/${dependency.jetty.version}</bundle>
- <bundle
start-level="30">mvn:javax.websocket/javax.websocket-api/${dependency.websocket.version}</bundle>
+ <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-continuation/${jetty.version}</bundle>
+ <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-http/${jetty.version}</bundle>
+ <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-io/${jetty.version}</bundle>
+ <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-jaspi/${jetty.version}</bundle>
+ <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-plus/${jetty.version}</bundle>
+ <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-jndi/${jetty.version}</bundle>
+ <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-rewrite/${jetty.version}</bundle>
+ <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-security/${jetty.version}</bundle>
+ <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-server/${jetty.version}</bundle>
+ <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-servlet/${jetty.version}</bundle>
+ <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-servlets/${jetty.version}</bundle>
+ <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-util/${jetty.version}</bundle>
+ <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-util-ajax/${jetty.version}</bundle>
+ <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-webapp/${jetty.version}</bundle>
+ <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-jaas/${jetty.version}</bundle>
+ <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-xml/${jetty.version}</bundle>
+ <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-client/${jetty.version}</bundle>
+ <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-deploy/${jetty.version}</bundle>
+ <bundle
start-level="30">mvn:org.eclipse.jetty/jetty-jmx/${jetty.version}</bundle>
+ <bundle
start-level="30">mvn:org.eclipse.jetty.websocket/websocket-server/${jetty.version}</bundle>
+ <bundle
start-level="30">mvn:org.eclipse.jetty.websocket/websocket-client/${jetty.version}</bundle>
+ <bundle
start-level="30">mvn:org.eclipse.jetty.websocket/websocket-common/${jetty.version}</bundle>
+ <bundle
start-level="30">mvn:org.eclipse.jetty.websocket/websocket-servlet/${jetty.version}</bundle>
+ <bundle
start-level="30">mvn:org.eclipse.jetty.websocket/websocket-api/${jetty.version}</bundle>
+ <bundle
start-level="30">mvn:org.eclipse.jetty.websocket/javax-websocket-server-impl/${jetty.version}</bundle>
+ <bundle
start-level="30">mvn:org.eclipse.jetty.websocket/javax-websocket-client-impl/${jetty.version}</bundle>
+ <bundle
start-level="30">mvn:javax.websocket/javax.websocket-api/${websocket.version}</bundle>
</feature>
<feature name="jetty" version="8.1.14.v20131031">
diff --git a/itests/pom.xml b/itests/pom.xml
index 8e6f61f..c58e418 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -35,7 +35,6 @@
<properties>
<appendedResourcesDirectory>${basedir}/../etc/appended-resources</appendedResourcesDirectory>
- <jetty.version>9.3.12.v20160915</jetty.version>
</properties>
<dependencies>
@@ -298,15 +297,6 @@
<profiles>
<profile>
- <id>java9</id>
- <properties>
- <asm.version>6.0_BETA</asm.version>
- </properties>
- <activation>
- <jdk>9</jdk>
- </activation>
- </profile>
- <profile>
<id>ci-build-profile</id>
<activation>
<property>
diff --git a/itests/src/test/filtered-resources/etc/feature.xml
b/itests/src/test/filtered-resources/etc/feature.xml
index 5a173b7..75d4140 100644
--- a/itests/src/test/filtered-resources/etc/feature.xml
+++ b/itests/src/test/filtered-resources/etc/feature.xml
@@ -32,7 +32,11 @@
<feature name="aries-proxy" description="Aries Proxy"
version="${project.version}">
<!-- false to avoid restarts of proxy which cascades badly -->
- <bundle dependency="false"
start-level="20">mvn:org.ow2.asm/asm-all/${asm.version}</bundle>
+ <bundle dependency="false"
start-level="20">mvn:org.ow2.asm/asm/${asm.version}</bundle>
+ <bundle dependency="false"
start-level="20">mvn:org.ow2.asm/asm-util/${asm.version}</bundle>
+ <bundle dependency="false"
start-level="20">mvn:org.ow2.asm/asm-tree/${asm.version}</bundle>
+ <bundle dependency="false"
start-level="20">mvn:org.ow2.asm/asm-analysis/${asm.version}</bundle>
+ <bundle dependency="false"
start-level="20">mvn:org.ow2.asm/asm-commons/${asm.version}</bundle>
<bundle
start-level="20">mvn:org.apache.aries.proxy/org.apache.aries.proxy/${aries.proxy.version}</bundle>
</feature>
@@ -596,7 +600,11 @@
<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:javax.annotation/javax.annotation-api/${javax.annotation.version}</bundle>
<bundle dependency="true"
start-level="30">mvn:org.apache.geronimo.specs/geronimo-jaspic_1.0_spec/${geronimo.jaspic-spec.version}</bundle>
- <bundle dependency="true"
start-level="30">mvn:org.ow2.asm/asm-all/${asm.version}</bundle>
+ <bundle dependency="true"
start-level="30">mvn:org.ow2.asm/asm/${asm.version}</bundle>
+ <bundle dependency="true"
start-level="30">mvn:org.ow2.asm/asm-util/${asm.version}</bundle>
+ <bundle dependency="true"
start-level="30">mvn:org.ow2.asm/asm-tree/${asm.version}</bundle>
+ <bundle dependency="true"
start-level="30">mvn:org.ow2.asm/asm-analysis/${asm.version}</bundle>
+ <bundle dependency="true"
start-level="30">mvn:org.ow2.asm/asm-commons/${asm.version}</bundle>
<bundle dependency="true"
start-level="30">mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/${aries.spifly.version}</bundle>
<bundle dependency="true"
start-level="30">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
<bundle
start-level="30">mvn:org.eclipse.jetty/jetty-continuation/${dependency.jetty.version}</bundle>
@@ -625,7 +633,7 @@
<bundle
start-level="30">mvn:org.eclipse.jetty.websocket/websocket-api/${dependency.jetty.version}</bundle>
<bundle
start-level="30">mvn:org.eclipse.jetty.websocket/javax-websocket-server-impl/${dependency.jetty.version}</bundle>
<bundle
start-level="30">mvn:org.eclipse.jetty.websocket/javax-websocket-client-impl/${dependency.jetty.version}</bundle>
- <bundle
start-level="30">mvn:javax.websocket/javax.websocket-api/${dependency.websocket.version}</bundle>
+ <bundle
start-level="30">mvn:javax.websocket/javax.websocket-api/${websocket.version}</bundle>
</feature>
<feature name="jetty" version="8.1.14.v20131031">
diff --git a/jaas/blueprint/jasypt/pom.xml b/jaas/blueprint/jasypt/pom.xml
index 4382e88..eee5690 100644
--- a/jaas/blueprint/jasypt/pom.xml
+++ b/jaas/blueprint/jasypt/pom.xml
@@ -98,7 +98,27 @@
<dependency>
<groupId>org.ow2.asm</groupId>
- <artifactId>asm-all</artifactId>
+ <artifactId>asm</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-util</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-tree</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-analysis</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-commons</artifactId>
<scope>test</scope>
</dependency>
diff --git a/pom.xml b/pom.xml
index a840522..fa9efeb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,8 +143,7 @@
<aspectj.bundle.version>1.7.4_1</aspectj.bundle.version>
<ant.bundle.version>1.9.7_1</ant.bundle.version>
<antlr.bundle.version>2.7.7_5</antlr.bundle.version>
- <asm.version>5.2</asm.version>
- <asm.springsource.version>1.5.3</asm.springsource.version>
+ <asm.version>6.0</asm.version>
<awaitility.version>3.0.0</awaitility.version>
<cglib.bundle.version>3.2.4_1</cglib.bundle.version>
<cglib2.version>2.2.0</cglib2.version>
@@ -236,6 +235,7 @@
<aries.jndi.url.version>1.1.0</aries.jndi.url.version>
<aries.proxy.version>1.1.1</aries.proxy.version>
<aries.proxy.api.version>1.1.0</aries.proxy.api.version>
+ <aries.spifly.version>1.0.10</aries.spifly.version>
<aries.subsystem.api.version>2.0.10</aries.subsystem.api.version>
<aries.subsystem.core.version>2.0.10</aries.subsystem.core.version>
<aries.transaction.manager.version>1.3.3</aries.transaction.manager.version>
@@ -257,6 +257,7 @@
<hibernate.validator.version>5.3.4.Final</hibernate.validator.version>
<jansi.version>1.16</jansi.version>
<javassist.version>3.9.0.GA</javassist.version>
+ <jetty.version>9.3.21.v20170918</jetty.version>
<jline.version>3.5.1</jline.version>
<jsw.version>3.2.3</jsw.version>
<log4j.version>1.2.17</log4j.version>
@@ -273,7 +274,7 @@
<pax.logging.version>1.10.1</pax.logging.version>
<pax.base.version>1.5.0</pax.base.version>
<pax.url.version>2.5.3</pax.url.version>
- <pax.web.version>6.0.7</pax.web.version>
+ <pax.web.version>6.1.0-SNAPSHOT</pax.web.version>
<pax.tinybundle.version>2.1.1</pax.tinybundle.version>
<pax.jdbc.version>1.2.0</pax.jdbc.version>
<pax.jms.version>0.1.0</pax.jms.version>
@@ -296,12 +297,13 @@
<derby-version>10.12.1.1</derby-version>
<directory-version>2.0.0-M24</directory-version>
<struts.bundle.version>1.3.10_1</struts.bundle.version>
- <xbean.version>3.18</xbean.version>
+ <xbean.version>4.6</xbean.version>
<xerces.version>2.11.0_1</xerces.version>
<xalan.bundle.version>2.7.2_3</xalan.bundle.version>
<xalan-serializer.bundle.version>2.7.2_1</xalan-serializer.bundle.version>
<javax.mail.version>1.4.7</javax.mail.version>
+ <websocket.version>1.1</websocket.version>
<winsw.version>1.18</winsw.version>
@@ -978,7 +980,27 @@
<dependency>
<groupId>org.ow2.asm</groupId>
- <artifactId>asm-all</artifactId>
+ <artifactId>asm</artifactId>
+ <version>${asm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-util</artifactId>
+ <version>${asm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-tree</artifactId>
+ <version>${asm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-analysis</artifactId>
+ <version>${asm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-commons</artifactId>
<version>${asm.version}</version>
</dependency>
diff --git a/service/guard/pom.xml b/service/guard/pom.xml
index 2169d29..cd2565b 100644
--- a/service/guard/pom.xml
+++ b/service/guard/pom.xml
@@ -76,7 +76,27 @@
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
- <artifactId>asm-all</artifactId>
+ <artifactId>asm</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-util</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-tree</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-analysis</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-commons</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -119,16 +139,5 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>java9</id>
- <properties>
- <asm.version>6.0_BETA</asm.version>
- </properties>
- <activation>
- <jdk>9</jdk>
- </activation>
- </profile>
- </profiles>
</project>
diff --git a/tooling/karaf-maven-plugin/pom.xml
b/tooling/karaf-maven-plugin/pom.xml
index 4ea78ab..c957c63 100644
--- a/tooling/karaf-maven-plugin/pom.xml
+++ b/tooling/karaf-maven-plugin/pom.xml
@@ -399,7 +399,6 @@
<id>java9</id>
<properties>
<plexus-utils.version>3.1.0</plexus-utils.version>
- <asm.version>6.0_BETA</asm.version>
<mvn.opts>--add-exports=java.base/sun.net.www.protocol.http=ALL-UNNAMED
--add-exports=java.base/sun.net.www.protocol.https=ALL-UNNAMED
--add-exports=java.xml.bind/com.sun.xml.internal.bind.v2.runtime=ALL-UNNAMED
--add-exports=jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED --add-modules
java.activation,java.xml.ws.annotation,java.corba,java.transaction,java.xml.bind,java.xml.ws
-Djava.io.tmpdir=${project.build.directory}</mvn.opts>
</properties>
<dependencies>
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
