Author: cschneider
Date: Fri Nov 16 22:45:47 2012
New Revision: 1410610
URL: http://svn.apache.org/viewvc?rev=1410610&view=rev
Log:
DOSGI-143 Removing all repositories except for apache snapshots
Modified:
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml
cxf/dosgi/trunk/discovery/distributed/zookeeper-server/pom.xml
cxf/dosgi/trunk/discovery/local/pom.xml
cxf/dosgi/trunk/distribution/multi-bundle/pom.xml
cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml
cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_discovery_bundles.xml
cxf/dosgi/trunk/distribution/single-bundle/pom.xml
cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml
cxf/dosgi/trunk/felix/profiles/pom.xml
cxf/dosgi/trunk/parent/pom.xml
cxf/dosgi/trunk/systests/multi_bundle_distro/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/TestDiscoveryExport.java
cxf/dosgi/trunk/systests2/single-bundle/pom.xml
cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestDiscoveryRountrip.java
Modified: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml?rev=1410610&r1=1410609&r2=1410610&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml (original)
+++ cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml Fri Nov 16
22:45:47 2012
@@ -30,21 +30,12 @@
<dependencies>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>${felix.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.foundation</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
-
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.enterprise</artifactId>
- <version>${osgi.version}</version>
</dependency>
<dependency>
@@ -66,6 +57,13 @@
</exclusion>
</exclusions>
</dependency>
+
+ <!-- We need the newer log4j as the one from zookeeper has some ugly
dependencies -->
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.cxf.dosgi</groupId>
@@ -74,14 +72,6 @@
<scope>provided</scope>
</dependency>
- <!-- This is a zookeeper dependency that we apparently have to list
- here -->
- <dependency>
- <groupId>org.apache.log4j</groupId>
- <artifactId>com.springsource.org.apache.log4j</artifactId>
- <version>${log4j.version}</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Modified: cxf/dosgi/trunk/discovery/distributed/zookeeper-server/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/zookeeper-server/pom.xml?rev=1410610&r1=1410609&r2=1410610&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/zookeeper-server/pom.xml (original)
+++ cxf/dosgi/trunk/discovery/distributed/zookeeper-server/pom.xml Fri Nov 16
22:45:47 2012
@@ -36,25 +36,15 @@
</properties>
<dependencies>
-
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.enterprise</artifactId>
- <version>${osgi.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>${felix.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.foundation</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
@@ -68,19 +58,14 @@
<groupId>com.sun.jmx</groupId>
<artifactId>jmxri</artifactId>
</exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
</exclusions>
</dependency>
-
- <!-- This is a zookeeper dependency that we apparently have to list
here -->
- <dependency>
- <groupId>org.apache.log4j</groupId>
- <artifactId>com.springsource.org.apache.log4j</artifactId>
+
+ <!-- We need the newer log4j as the one from zookeeper has some ugly
dependencies -->
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
<version>${log4j.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
Modified: cxf/dosgi/trunk/discovery/local/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/local/pom.xml?rev=1410610&r1=1410609&r2=1410610&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/local/pom.xml (original)
+++ cxf/dosgi/trunk/discovery/local/pom.xml Fri Nov 16 22:45:47 2012
@@ -48,9 +48,9 @@
</dependency>
<dependency>
- <groupId>org.jdom</groupId>
- <artifactId>com.springsource.org.jdom</artifactId>
- <version>1.1.0</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jdom</artifactId>
+ <version>${jdom.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: cxf/dosgi/trunk/distribution/multi-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/pom.xml?rev=1410610&r1=1410609&r2=1410610&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/multi-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/distribution/multi-bundle/pom.xml Fri Nov 16 22:45:47 2012
@@ -69,19 +69,14 @@
<version>1.0</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
-
<artifactId>com.springsource.org.apache.commons.logging</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>
<dependency>
- <groupId>org.jdom</groupId>
- <artifactId>com.springsource.org.jdom</artifactId>
- <version>1.1.0</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jdom</artifactId>
+ <version>${jdom.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -335,11 +330,6 @@
</dependency>
<dependency>
- <groupId>org.apache.log4j</groupId>
- <artifactId>com.springsource.org.apache.log4j</artifactId>
- <version>${log4j.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>${zookeeper.version}</version>
Modified:
cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml?rev=1410610&r1=1410609&r2=1410610&view=diff
==============================================================================
---
cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml
(original)
+++
cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml
Fri Nov 16 22:45:47 2012
@@ -6,8 +6,7 @@
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/geronimo-javamail_1.4_spec-1.7.1.jar</bundle>
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/geronimo-servlet_3.0_spec-1.0.jar</bundle>
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/geronimo-ws-metadata_2.0_spec-1.1.3.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/com.springsource.org.apache.commons.logging-1.1.1.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/com.springsource.org.jdom-1.1.0.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.jdom-${jdom.version}.jar</bundle>
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/commons-lang-2.6.jar</bundle>
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-core-${spring.version}.jar</bundle>
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-beans-${spring.version}.jar</bundle>
Modified:
cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_discovery_bundles.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_discovery_bundles.xml?rev=1410610&r1=1410609&r2=1410610&view=diff
==============================================================================
---
cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_discovery_bundles.xml
(original)
+++
cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_discovery_bundles.xml
Fri Nov 16 22:45:47 2012
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<bundles>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/com.springsource.org.apache.log4j-${log4j.version}.jar</bundle>
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/zookeeper-${zookeeper.version}.jar</bundle>
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-dosgi-ri-discovery-distributed-${project.version}.jar</bundle>
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-dosgi-ri-discovery-distributed-zookeeper-server-${project.version}.jar</bundle>
Modified: cxf/dosgi/trunk/distribution/single-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/single-bundle/pom.xml?rev=1410610&r1=1410609&r2=1410610&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/single-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/distribution/single-bundle/pom.xml Fri Nov 16 22:45:47 2012
@@ -20,10 +20,9 @@
-->
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-ri-singlebundle-distribution</artifactId>
- <version>1.4-SNAPSHOT</version>
- <packaging>bundle</packaging>
+ <artifactId>cxf-dosgi-ri-singlebundle-distribution</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ <packaging>bundle</packaging>
<name>Distributed OSGI Single-Bundle Distribution</name>
<url>http://cxf.apache.org</url>
@@ -64,11 +63,6 @@
<artifactId>geronimo-servlet_${servlet.version}_spec</artifactId>
<version>1.0</version>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>com.springsource.org.apache.commons.logging</artifactId>
- <version>1.1.1</version>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -78,11 +72,6 @@
<artifactId>slf4j-jcl</artifactId>
</dependency>
<dependency>
- <groupId>org.jdom</groupId>
- <artifactId>com.springsource.org.jdom</artifactId>
- <version>1.1.0</version>
- </dependency>
- <dependency>
<groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-runtime</artifactId>
<version>${pax.web.version}</version>
@@ -185,12 +174,6 @@
<artifactId>org.apache.felix.fileinstall</artifactId>
<version>3.1.10</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.log4j</groupId>
- <artifactId>com.springsource.org.apache.log4j</artifactId>
- <version>${log4j.version}</version>
- </dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
@@ -314,9 +297,13 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.enterprise</artifactId>
- <version>${osgi.version}</version>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.enterprise</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jdom</artifactId>
+ <version>${jdom.version}</version>
</dependency>
<dependency>
Modified: cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml?rev=1410610&r1=1410609&r2=1410610&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml Fri Nov 16 22:45:47 2012
@@ -91,9 +91,9 @@
</dependency>
<dependency>
- <groupId>org.jdom</groupId>
- <artifactId>com.springsource.org.jdom</artifactId>
- <version>1.1.0</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jdom</artifactId>
+ <version>${jdom.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: cxf/dosgi/trunk/felix/profiles/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/felix/profiles/pom.xml?rev=1410610&r1=1410609&r2=1410610&view=diff
==============================================================================
--- cxf/dosgi/trunk/felix/profiles/pom.xml (original)
+++ cxf/dosgi/trunk/felix/profiles/pom.xml Fri Nov 16 22:45:47 2012
@@ -35,12 +35,6 @@
</properties>
<dependencies>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>com.springsource.org.apache.commons.logging</artifactId>
- <version>1.1.1</version>
- </dependency>
-
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
@@ -146,12 +140,6 @@
<version>${woodstox.bundle.version}</version>
</dependency>
- <dependency>
- <groupId>org.aopalliance</groupId>
- <artifactId>com.springsource.org.aopalliance</artifactId>
- <version>1.0.0</version>
- </dependency>
-
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
Modified: cxf/dosgi/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/parent/pom.xml?rev=1410610&r1=1410609&r2=1410610&view=diff
==============================================================================
--- cxf/dosgi/trunk/parent/pom.xml (original)
+++ cxf/dosgi/trunk/parent/pom.xml Fri Nov 16 22:45:47 2012
@@ -34,9 +34,9 @@
<servicemix.specs.version>2.1.0</servicemix.specs.version>
<pax.web.version>1.0.11</pax.web.version>
- <pax.logging.version>1.1.1</pax.logging.version>
+ <pax.logging.version>1.7.0</pax.logging.version>
<servlet.version>3.0</servlet.version>
- <log4j.version>1.2.15</log4j.version>
+ <log4j.version>1.2.17</log4j.version>
<jetty.version>7.4.2.v20110526</jetty.version>
<xmlschema.bundle.version>2.0.3</xmlschema.bundle.version>
<xmlresolver.bundle.version>1.2_5</xmlresolver.bundle.version>
@@ -50,6 +50,7 @@
<slf4j.version>1.6.4</slf4j.version>
<felix.plugin.version>2.3.4</felix.plugin.version>
<exam.version>2.6.0</exam.version>
+ <jdom.version>1.1.2_1</jdom.version>
</properties>
<dependencyManagement>
@@ -230,113 +231,7 @@
</snapshots>
</repository>
- <!-- I21 repository -->
- <repository>
- <id>i21-s3-maven-repo</id>
- <name>i21 S3 milestone repo</name>
-
<url>http://s3.amazonaws.com/maven.springframework.org/milestone</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
-
- <repository>
- <id>com.springsource.repository.bundles.release</id>
- <name>SpringSource Enterprise Bundle Repository - SpringSource
Bundle Releases</name>
-
<url>http://repository.springsource.com/maven/bundles/release</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
-
- <repository>
- <id>com.springsource.repository.bundles.external</id>
- <name>SpringSource Enterprise Bundle Repository - External Bundle
Releases</name>
-
<url>http://repository.springsource.com/maven/bundles/external</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
-
- <repository>
- <id>central</id>
- <name>Default maven repo</name>
- <url>http://repo1.maven.org/maven2</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
-
- <!-- ServiceMix repo -->
- <repository>
- <id>servicemix</id>
- <name>ServiceMix Repository</name>
- <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
-
- <!-- OPS4j repository -->
- <repository>
- <id>ops4j</id>
- <name>OPS4j repo</name>
- <url>http://repository.ops4j.org/maven2</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
-
- <repository>
- <id>spring-osgified-artifacts</id>
- <name>Springframework Maven OSGified Artifacts Repository</name>
- <url>http://s3.amazonaws.com/maven.springframework.org/osgi</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
-
- <repository>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>springframework.org</id>
- <name>Springframework Maven SNAPSHOT Repository</name>
-
<url>http://s3.amazonaws.com/maven.springframework.org/snapshot</url>
- </repository>
-
- <repository>
- <id>apache-incubating</id>
- <name>Apache Incubating Repository</name>
- <url>http://people.apache.org/repo/m2-incubating-repository/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
+
</repositories>
<pluginRepositories>
Modified: cxf/dosgi/trunk/systests/multi_bundle_distro/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests/multi_bundle_distro/pom.xml?rev=1410610&r1=1410609&r2=1410610&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests/multi_bundle_distro/pom.xml (original)
+++ cxf/dosgi/trunk/systests/multi_bundle_distro/pom.xml Fri Nov 16 22:45:47
2012
@@ -128,17 +128,6 @@
<artifactId>slf4j-log4j</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
-
<artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.log4j</groupId>
- <artifactId>com.springsource.org.apache.log4j</artifactId>
- <version>1.2.15</version>
- </dependency>
<dependency>
<groupId>junit</groupId>
@@ -146,4 +135,27 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>ci-build-profile</id>
+ <activation>
+ <property>
+ <name>maven.repo.local</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- when the local repo location has been
specified, we need to pass on this information to PAX mvn url -->
+
<argLine>-Dorg.ops4j.pax.url.mvn.localRepository=${maven.repo.local}</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: cxf/dosgi/trunk/systests2/multi-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/pom.xml?rev=1410610&r1=1410609&r2=1410610&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/multi-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/systests2/multi-bundle/pom.xml Fri Nov 16 22:45:47 2012
@@ -18,11 +18,6 @@
<name>Distributed OSGi System Tests Multi-Bundle</name>
- <properties>
- <!-- this is temporary! -->
- <!-- <maven.test.skip>true</maven.test.skip> -->
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -109,12 +104,6 @@
<version>${cxf.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.log4j</groupId>
- <artifactId>com.springsource.org.apache.log4j</artifactId>
- <version>${log4j.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>${zookeeper.version}</version>
Modified:
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryExport.java
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryExport.java?rev=1410610&r1=1410609&r2=1410610&view=diff
==============================================================================
---
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryExport.java
(original)
+++
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryExport.java
Fri Nov 16 22:45:47 2012
@@ -61,9 +61,7 @@ public class TestDiscoveryExport extends
for (Map.Entry<Integer, String> entry : bundles.entrySet()) {
String bundleUri = entry.getValue();
- if (!bundleUri.contains("pax-logging")) {
- opts.add(CoreOptions.bundle(bundleUri));
- }
+ opts.add(CoreOptions.bundle(bundleUri));
}
opts.add(CoreOptions.mavenBundle().groupId("org.apache.servicemix.bundles")
.artifactId("org.apache.servicemix.bundles.junit").version("4.9_2"));
Modified: cxf/dosgi/trunk/systests2/single-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/single-bundle/pom.xml?rev=1410610&r1=1410609&r2=1410610&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/single-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/systests2/single-bundle/pom.xml Fri Nov 16 22:45:47 2012
@@ -13,7 +13,6 @@
<groupId>org.apache.cxf.dosgi.systests</groupId>
<artifactId>cxf-dosgi-ri-systests2-singlebundle</artifactId>
- <version>1.4-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Distributed OSGi System Tests Single-Bundle</name>
@@ -42,14 +41,11 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>${osgi.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.enterprise</artifactId>
- <version>${osgi.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf.dosgi.systests</groupId>
@@ -70,12 +66,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.log4j</groupId>
- <artifactId>com.springsource.org.apache.log4j</artifactId>
- <version>${log4j.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
@@ -115,16 +105,15 @@
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.6.1</version>
+ </dependency>
</dependencies>
<build>
Modified:
cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestDiscoveryRountrip.java
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestDiscoveryRountrip.java?rev=1410610&r1=1410609&r2=1410610&view=diff
==============================================================================
---
cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestDiscoveryRountrip.java
(original)
+++
cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestDiscoveryRountrip.java
Fri Nov 16 22:45:47 2012
@@ -18,6 +18,10 @@
*/
package org.apache.cxf.dosgi.systests2.single;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.provision;
+import static org.ops4j.pax.exam.CoreOptions.wrappedBundle;
+
import org.apache.cxf.dosgi.systests2.common.AbstractTestDiscoveryRoundtrip;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -26,6 +30,7 @@ import org.ops4j.pax.exam.Inject;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.Configuration;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.options.MavenArtifactUrlReference;
import org.osgi.framework.BundleContext;
@RunWith( JUnit4TestRunner.class )
@@ -42,20 +47,17 @@ public class TestDiscoveryRountrip exten
// // setting timeout to 0 means wait as long as the remote
service comes available.
// waitForFrameworkStartup(),
- // Run this one in Felix
CoreOptions.frameworks(CoreOptions.felix()),
-
-
CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi").artifactId("cxf-dosgi-ri-singlebundle-distribution").versionAsInProject(),
-
-
CoreOptions.mavenBundle().groupId("org.apache.log4j").artifactId("com.springsource.org.apache.log4j").versionAsInProject(),
-
CoreOptions.mavenBundle().groupId("org.apache.zookeeper").artifactId("zookeeper").versionAsInProject(),
-
CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi").artifactId("cxf-dosgi-ri-discovery-distributed-zookeeper-server").versionAsInProject(),
+
mavenBundle().groupId("org.apache.cxf.dosgi").artifactId("cxf-dosgi-ri-singlebundle-distribution").versionAsInProject(),
+ wrappedBundle(new
MavenArtifactUrlReference().groupId("log4j").artifactId("log4j").versionAsInProject()),
+
mavenBundle().groupId("org.apache.zookeeper").artifactId("zookeeper").versionAsInProject(),
+
mavenBundle().groupId("org.apache.cxf.dosgi").artifactId("cxf-dosgi-ri-discovery-distributed-zookeeper-server").versionAsInProject(),
// This bundle contains the common system testing code
-
CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi.systests").artifactId("cxf-dosgi-ri-systests2-common").versionAsInProject(),
+
mavenBundle().groupId("org.apache.cxf.dosgi.systests").artifactId("cxf-dosgi-ri-systests2-common").versionAsInProject(),
- CoreOptions.provision(getClientBundle()),
- CoreOptions.provision(getServerBundle())
+ provision(getClientBundle()),
+ provision(getServerBundle())
);
}
