Move some version numbers out of features.xml into parent pom and align with build
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/293dbe4f Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/293dbe4f Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/293dbe4f Branch: refs/heads/master Commit: 293dbe4f76b14ecb294d58d0cba6fca85b5536c0 Parents: ef5812b Author: Daniel Kulp <dk...@apache.org> Authored: Mon Aug 28 10:38:13 2017 -0400 Committer: Daniel Kulp <dk...@apache.org> Committed: Mon Aug 28 10:38:13 2017 -0400 ---------------------------------------------------------------------- osgi/karaf/features/src/main/resources/features.xml | 10 +++++----- parent/pom.xml | 8 +++++++- systests/jaxrs/pom.xml | 1 - 3 files changed, 12 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/293dbe4f/osgi/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml index 8f815c3..c64c1fa 100644 --- a/osgi/karaf/features/src/main/resources/features.xml +++ b/osgi/karaf/features/src/main/resources/features.xml @@ -169,7 +169,7 @@ </feature> <feature name="cxf-http-jetty" version="${project.version}"> <feature version="${project.version}">cxf-http</feature> - <feature version="[7,10)">jetty</feature> + <feature version="[9,11)">jetty</feature> <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-http-jetty/${project.version}</bundle> <capability> cxf.http.provider;name=jetty @@ -274,7 +274,7 @@ <!-- Required by jackson-dataformat-yaml --> <bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxrs-api-2.1/${cxf.servicemix.specs.version}</bundle> <bundle start-level="10" dependency="true">mvn:javax.annotation/javax.annotation-api/${cxf.javax.annotation-api.version}</bundle> - <bundle start-level="35">mvn:org.yaml/snakeyaml/1.17</bundle> + <bundle start-level="35">mvn:org.yaml/snakeyaml/${cxf.snakeyaml.version}</bundle> <bundle start-level="35">mvn:com.fasterxml.jackson.core/jackson-core/${cxf.jackson.version}</bundle> <bundle start-level="35">mvn:com.fasterxml.jackson.core/jackson-annotations/${cxf.jackson.version}</bundle> <bundle start-level="35">mvn:com.fasterxml.jackson.core/jackson-databind/${cxf.jackson.version}</bundle> @@ -476,9 +476,9 @@ <feature version="${project.version}">cxf-wsn-api</feature> <feature version="${project.version}">cxf-http-provider</feature> <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/1.0_6</bundle> - <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle> - <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle> - <bundle dependency="true">mvn:org.apache.activemq/activemq-osgi/5.14.0</bundle> + <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${cxf.geronimo.jms.version}</bundle> + <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/${cxf.geronimo.j2ee.management.version}</bundle> + <bundle dependency="true">mvn:org.apache.activemq/activemq-osgi/${cxf.activemq.version}</bundle> <bundle>mvn:org.apache.cxf.services.wsn/cxf-services-wsn-core/${project.version}</bundle> </feature> <feature name="cxf-ws-discovery-api" version="${project.version}"> http://git-wip-us.apache.org/repos/asf/cxf/blob/293dbe4f/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index cef73a0..424e28a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -147,6 +147,7 @@ <cxf.servlet-api.group>javax.servlet</cxf.servlet-api.group> <cxf.servlet-api.artifact>javax.servlet-api</cxf.servlet-api.artifact> <cxf.servlet-api.version>3.1.0</cxf.servlet-api.version> + <cxf.snakeyaml.version>1.17</cxf.snakeyaml.version> <cxf.geronimo.servlet25.version>1.2</cxf.geronimo.servlet25.version> <cxf.servlet-api-2.5.artifact>geronimo-servlet_2.5_spec</cxf.servlet-api-2.5.artifact> <cxf.servlet-api-2.5.version>1.2</cxf.servlet-api-2.5.version> @@ -1565,6 +1566,11 @@ <version>${cxf.jackson.version}</version> </dependency> <dependency> + <groupId>org.yaml</groupId> + <artifactId>snakeyaml</artifactId> + <version>${cxf.snakeyaml.version}</version> + </dependency> + <dependency> <groupId>${cxf.asm.groupId}</groupId> <artifactId>${cxf.asm.artifactId}</artifactId> <version>${cxf.asm.version}</version> @@ -1637,7 +1643,7 @@ <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-j2ee-management_1.1_spec</artifactId> - <version>1.0.1</version> + <version>${cxf.geronimo.j2ee.management.version}</version> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> http://git-wip-us.apache.org/repos/asf/cxf/blob/293dbe4f/systests/jaxrs/pom.xml ---------------------------------------------------------------------- diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml index 635cba7..b515011 100644 --- a/systests/jaxrs/pom.xml +++ b/systests/jaxrs/pom.xml @@ -516,7 +516,6 @@ <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> - <version>1.15</version> <scope>test</scope> </dependency> <dependency>
