You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2011/10/11 06:37:06 UTC
svn commit: r1181621 - in /cxf/branches/2.4.x-fixes: ./
osgi/karaf/features/pom.xml
osgi/karaf/features/src/main/resources/features.xml
Author: ningjiang
Date: Tue Oct 11 04:37:06 2011
New Revision: 1181621
URL: http://svn.apache.org/viewvc?rev=1181621&view=rev
Log:
Merged revisions 1181612 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1181612 | ningjiang | 2011-10-11 10:36:08 +0800 (Tue, 11 Oct 2011) | 1 line
CXF-3852 Enabled the validate profile of karaf feature
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/osgi/karaf/features/pom.xml
cxf/branches/2.4.x-fixes/osgi/karaf/features/src/main/resources/features.xml
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 11 04:37:06 2011
@@ -1 +1 @@
-/cxf/trunk:1179846,1180649,1180653,1181611
+/cxf/trunk:1179846,1180649,1180653,1181611-1181612
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/osgi/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/osgi/karaf/features/pom.xml?rev=1181621&r1=1181620&r2=1181621&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/osgi/karaf/features/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/osgi/karaf/features/pom.xml Tue Oct 11 04:37:06 2011
@@ -66,9 +66,16 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>${cxf.javax.mail.version}</version>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint</artifactId>
+ <version>${cxf.aries.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- The dependency for cxf karaf command console -->
+ <dependency>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.console</artifactId>
+ <version>${cxf.karaf.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -133,8 +140,6 @@
<profiles>
<profile>
- <!-- this profile doesn't work right now. Requires an update to the features plugin. -->
- <!-- See https://issues.apache.org/jira/browse/KARAF-651 -->
<id>validate</id>
<build>
<plugins>
@@ -145,6 +150,7 @@
<configuration>
<file>${project.build.directory}/classes/features.xml</file>
<karafConfig>${project.build.directory}/classes/config.properties</karafConfig>
+ <jreVersion>jre-1.6</jreVersion>
</configuration>
<executions>
<execution>
@@ -155,13 +161,6 @@
</goals>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.4.3</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
Modified: cxf/branches/2.4.x-fixes/osgi/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/osgi/karaf/features/src/main/resources/features.xml?rev=1181621&r1=1181620&r2=1181621&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/branches/2.4.x-fixes/osgi/karaf/features/src/main/resources/features.xml Tue Oct 11 04:37:06 2011
@@ -17,11 +17,6 @@
limitations under the License.
-->
<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0" name="cxf-${project.version}">
- <feature name="saaj-impl" version="${cxf.saaj.impl.version}" resolver='(obr)'>
- <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${cxf.servicemix.specs.version}</bundle>
- <bundle start-level='25'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${cxf.saaj-impl.bundle.version}</bundle>
- </feature>
-
<feature name="cxf-specs" version="${project.version}" resolver='(obr)'>
<bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${cxf.servicemix.specs.version}</bundle>
<bundle start-level='10'>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${cxf.geronimo.annotation.version}</bundle>
@@ -29,6 +24,7 @@
<bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${cxf.servicemix.specs.version}</bundle>
<bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/${cxf.servicemix.specs.version}</bundle>
<bundle start-level='10'>mvn:org.apache.geronimo.specs/geronimo-jaxws_2.2_spec/${cxf.specs.jaxws.api.version}</bundle>
+ <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${cxf.servicemix.specs.version}</bundle>
<bundle>mvn:http://download.java.net/maven/2!javax.mail/mail/${cxf.javax.mail.version}</bundle>
<bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.1/${cxf.servicemix.specs.version}</bundle>
</feature>
@@ -45,7 +41,6 @@
<bundle>mvn:org.apache.ws.commons.axiom/axiom-api/${cxf.axiom.version}</bundle>
<bundle>mvn:org.apache.abdera/abdera-core/${cxf.abdera.version}</bundle>
- <!--bundle>mvn:org.apache.abdera/abdera-extensions-json/${cxf.abdera.version}</bundle-->
<bundle>mvn:org.apache.abdera/abdera-extensions-main/${cxf.abdera.version}</bundle>
<bundle>mvn:org.apache.abdera/abdera-i18n/${cxf.abdera.version}</bundle>
<bundle>mvn:org.apache.abdera/abdera-parser/${cxf.abdera.version}</bundle>
@@ -66,6 +61,11 @@
<bundle>mvn:org.apache.ws.security/wss4j/${cxf.wss4j.version}</bundle>
</feature>
+ <feature name="saaj-impl" version="${cxf.saaj.impl.version}" resolver='(obr)'>
+ <feature version="${project.version}">cxf-specs</feature>
+ <bundle start-level='25'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${cxf.saaj-impl.bundle.version}</bundle>
+ </feature>
+
<feature name="cxf" version="${project.version}" resolver='(obr)'>
<feature version="${project.version}">cxf-specs</feature>
<bundle>mvn:commons-lang/commons-lang/${cxf.commons-lang.version}</bundle>