You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by cs...@apache.org on 2013/10/28 08:51:55 UTC
svn commit: r1536277 - in /cxf/dosgi/trunk:
distribution/multi-bundle/pom.xml parent/pom.xml
systests2/multi-bundle/pom.xml
systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java
Author: cschneider
Date: Mon Oct 28 07:51:55 2013
New Revision: 1536277
URL: http://svn.apache.org/r1536277
Log:
Fix goal for multi bundle distro
Modified:
cxf/dosgi/trunk/distribution/multi-bundle/pom.xml
cxf/dosgi/trunk/parent/pom.xml
cxf/dosgi/trunk/systests2/multi-bundle/pom.xml
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java
Modified: cxf/dosgi/trunk/distribution/multi-bundle/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/pom.xml?rev=1536277&r1=1536276&r2=1536277&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/multi-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/distribution/multi-bundle/pom.xml Mon Oct 28 07:51:55 2013
@@ -55,17 +55,19 @@
<id>features-add-to-repository</id>
<phase>generate-resources</phase>
<goals>
- <goal>features-add-to-repository</goal>
+ <goal>features-export-meta-data</goal>
</goals>
<configuration>
<descriptors>
<descriptor>mvn:org.apache.karaf.assemblies.features/standard/2.3.2/xml/features</descriptor>
<descriptor>mvn:org.apache.cxf.dosgi/cxf-dosgi/${project.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.cxf.services.xkms/cxf-services-xkms-features/${cxf.version}/xml</descriptor>
</descriptors>
<features>
<feature>cxf-dosgi-base</feature>
<feature>cxf-dosgi-discovery-distributed</feature>
<feature>cxf-dosgi-zookeeper-server</feature>
+ <feature>cxf-xkms-client</feature>
</features>
<repository>target/distribution_bundles</repository>
<resolveDefinedRepositoriesRecursively>true</resolveDefinedRepositoriesRecursively>
Modified: cxf/dosgi/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/parent/pom.xml?rev=1536277&r1=1536276&r2=1536277&view=diff
==============================================================================
--- cxf/dosgi/trunk/parent/pom.xml (original)
+++ cxf/dosgi/trunk/parent/pom.xml Mon Oct 28 07:51:55 2013
@@ -41,7 +41,7 @@
<osgi.version>4.3.1</osgi.version>
<osgi.compendium.version>4.3.1</osgi.compendium.version>
- <cxf.version>2.7.6</cxf.version>
+ <cxf.version>2.7.7-SNAPSHOT</cxf.version>
<cxf.build-utils.version>2.5.0</cxf.build-utils.version>
<felix.version>4.2.1</felix.version>
<spring.version>3.0.6.RELEASE</spring.version>
@@ -65,7 +65,7 @@
<commons.pool.bundle.version>1.5.4_1</commons.pool.bundle.version>
<woodstox.bundle.version>4.1.4</woodstox.bundle.version>
<jaxbimpl.bundle.version>2.2.1.1_2</jaxbimpl.bundle.version>
- <slf4j.version>1.6.4</slf4j.version>
+ <slf4j.version>1.7.0</slf4j.version>
<felix.plugin.version>2.4.0</felix.plugin.version>
<exam.version>3.2.0</exam.version>
<cxf.resources.base.path />
@@ -359,41 +359,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.7.1</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.cxf.build-utils</groupId>
- <artifactId>cxf-buildtools</artifactId>
- <version>${cxf.build-utils.version}</version>
- </dependency>
- </dependencies>
- <configuration>
- <rulesets>
- <ruleset>${cxf.resources.base.path}cxf-pmd-ruleset.xml</ruleset>
- <ruleset>${cxf.resources.base.path}cxf-pmd-custom.xml</ruleset>
- </rulesets>
- <sourceEncoding>UTF-8</sourceEncoding>
- <targetJdk>1.6</targetJdk>
- <linkXRef>false</linkXRef>
- <includeTests>true</includeTests>
- <verbose>true</verbose>
- <excludeRoots>
- <excludeRoot>${basedir}/src/main/generated</excludeRoot>
- </excludeRoots>
- </configuration>
- <executions>
- <execution>
- <id>validate</id>
- <phase>validate</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
Modified: cxf/dosgi/trunk/systests2/multi-bundle/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/pom.xml?rev=1536277&r1=1536276&r2=1536277&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/multi-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/systests2/multi-bundle/pom.xml Mon Oct 28 07:51:55 2013
@@ -170,6 +170,24 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.cxf.services.xkms</groupId>
+ <artifactId>cxf-services-xkms-features</artifactId>
+ <version>${cxf.version}</version>
+ <type>xml</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.services.xkms</groupId>
+ <artifactId>cxf-services-xkms-common</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.services.xkms</groupId>
+ <artifactId>cxf-services-xkms-client</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified: cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java?rev=1536277&r1=1536276&r2=1536277&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java (original)
+++ cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java Mon Oct 28 07:51:55 2013
@@ -102,10 +102,10 @@ public final class MultiBundleTools {
System.out.println(bundleUri);
}
bundleJar.close();
- if (!bundleUri.contains("pax-logging")) {
- opts.add(CoreOptions.bundle(bundleUri));
- }
+
+ opts.add(CoreOptions.bundle(bundleUri));
}
+ System.out.println(opts);
return opts.toArray(new Option[opts.size()]);
}