This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.3.x-fixes by this push:
new e39ee0a fix OSGi test after Karaf upgrade (#631)
e39ee0a is described below
commit e39ee0a99e53f3778e08cb9f3d86daf32030cb51
Author: Alexey Markevich <[email protected]>
AuthorDate: Sat Jan 25 10:04:00 2020 +0300
fix OSGi test after Karaf upgrade (#631)
---
osgi/itests/pom.xml | 82 ++++++++++++++++------
.../apache/cxf/osgi/itests/CXFOSGiTestSupport.java | 8 +--
services/sts/systests/sts-itests/pom.xml | 25 +++++--
.../sts/itests/BasicSTSIntegrationTest.java | 4 +-
services/xkms/xkms-itests/pom.xml | 26 +++++--
5 files changed, 106 insertions(+), 39 deletions(-)
diff --git a/osgi/itests/pom.xml b/osgi/itests/pom.xml
index 3cb728a..1eb9d68 100644
--- a/osgi/itests/pom.xml
+++ b/osgi/itests/pom.xml
@@ -1,22 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.cxf</groupId>
@@ -27,8 +28,9 @@
<groupId>org.apache.cxf.osgi.itests</groupId>
<artifactId>org.apache.cxf.osgi.itests</artifactId>
<name>Apache CXF :: OSGi :: Integration Tests</name>
- <packaging>jar</packaging>
-
+ <properties>
+ <cxf.module.name>org.apache.cxf.osgi.itests</cxf.module.name>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -112,6 +114,7 @@
</exclusion>
</exclusions>
</dependency>
+
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.jsr303-api-1.1.0</artifactId>
@@ -129,10 +132,6 @@
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
<version>${cxf.geronimo.inject.version}</version>
@@ -207,5 +206,42 @@
</configuration>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e
settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.servicemix.tooling
+ </groupId>
+ <artifactId>
+ depends-maven-plugin
+ </artifactId>
+ <versionRange>
+ [1.2,)
+ </versionRange>
+ <goals>
+ <goal>
+ generate-depends-file
+ </goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
diff --git
a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
index e993bd6..6ff90f3 100644
---
a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
+++
b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
@@ -76,11 +76,11 @@ public class CXFOSGiTestSupport {
final Option[] basicOptions = new Option[] {
karafDistributionConfiguration()
- .frameworkUrl(
-
maven().groupId("org.apache.karaf").artifactId("apache-karaf").versionAsInProject().type("tar.gz"))
+ .frameworkUrl(
+
maven().groupId("org.apache.karaf").artifactId("apache-karaf").versionAsInProject().type("tar.gz"))
.name("Apache Karaf")
- .useDeployFolder(false)
- .unpackDirectory(new File("target/paxexam/")),
+ .useDeployFolder(false)
+ .unpackDirectory(new File("target/paxexam/")),
//DO NOT COMMIT WITH THIS LINE ENABLED!!!
//KarafDistributionOption.keepRuntimeFolder(),
//debugConfiguration(), // nor this
diff --git a/services/sts/systests/sts-itests/pom.xml
b/services/sts/systests/sts-itests/pom.xml
index 4be9316..9e11f73 100644
--- a/services/sts/systests/sts-itests/pom.xml
+++ b/services/sts/systests/sts-itests/pom.xml
@@ -69,18 +69,34 @@
<groupId>org.apache.cxf.karaf</groupId>
<artifactId>apache-cxf</artifactId>
<version>${project.version}</version>
- <type>pom</type>
- <scope>test</scope>
+ <type>xml</type>
+ <classifier>features</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf.karaf</groupId>
<artifactId>cxf-karaf-commands</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>org.apache.karaf.features.core</artifactId>
+ <version>${cxf.karaf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
<version>${cxf.pax.exam.version}</version>
@@ -129,7 +145,6 @@
<artifactId>depends-maven-plugin</artifactId>
<executions>
<execution>
- <phase>generate-resources</phase>
<id>generate-depends-file</id>
<goals>
<goal>generate-depends-file</goal>
diff --git
a/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/BasicSTSIntegrationTest.java
b/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/BasicSTSIntegrationTest.java
index 0224563..2371ae3 100644
---
a/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/BasicSTSIntegrationTest.java
+++
b/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/BasicSTSIntegrationTest.java
@@ -72,7 +72,8 @@ public class BasicSTSIntegrationTest {
// editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
// "org.ops4j.pax.url.mvn.repositories", REPOS),
- copy("clientKeystore.properties"), copy("clientstore.jks"),
+ copy("clientKeystore.properties"),
+ copy("clientstore.jks"),
editConfigurationFilePut("etc/org.ops4j.pax.web.cfg",
"org.osgi.service.http.port", port),
when(localRepository != null)
@@ -81,7 +82,6 @@ public class BasicSTSIntegrationTest {
localRepository)),
features(stsFeatures, "cxf-sts-service"),
configureConsole().ignoreLocalConsole().ignoreRemoteShell(),
-
};
if (JavaVersionUtil.getMajorVersion() >= 9) {
final String karafVersion =
MavenUtils.getArtifactVersion("org.apache.karaf", "apache-karaf");
diff --git a/services/xkms/xkms-itests/pom.xml
b/services/xkms/xkms-itests/pom.xml
index 83b51b6..300973c 100644
--- a/services/xkms/xkms-itests/pom.xml
+++ b/services/xkms/xkms-itests/pom.xml
@@ -75,21 +75,38 @@
<groupId>org.apache.cxf.karaf</groupId>
<artifactId>apache-cxf</artifactId>
<version>${project.version}</version>
- <type>pom</type>
- <scope>test</scope>
+ <type>xml</type>
+ <classifier>features</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf.karaf</groupId>
<artifactId>cxf-karaf-commands</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>org.apache.karaf.features.core</artifactId>
+ <version>${cxf.karaf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
<version>${cxf.geronimo.inject.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
@@ -145,7 +162,6 @@
<artifactId>depends-maven-plugin</artifactId>
<executions>
<execution>
- <phase>generate-resources</phase>
<id>generate-depends-file</id>
<goals>
<goal>generate-depends-file</goal>
