You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2019/08/08 14:33:55 UTC
[cxf] branch 3.2.x-fixes updated: Use non-snapshot karaf version,
delete directory/module with nothing in it
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.2.x-fixes by this push:
new 5568415 Use non-snapshot karaf version, delete directory/module with nothing in it
5568415 is described below
commit 55684158933b25e9a44876f1d6559d88ee779f9a
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Thu Aug 8 10:33:12 2019 -0400
Use non-snapshot karaf version, delete directory/module with nothing in it
---
osgi/itests-felix/pom.xml | 2 +-
parent/pom.xml | 2 +-
rt/rs/security/jcs-parent/jcs/pom.xml | 61 ----------------------
.../apache/cxf/rs/security/jcs/TempResource.java | 23 --------
.../apache/cxf/rs/security/jcs/TempResource.java | 23 --------
rt/rs/security/jcs-parent/pom.xml | 35 -------------
.../cxf/xkms/itests/BasicIntegrationTest.java | 2 +-
systests/wsdl_maven/java2ws/pom.xml | 2 +-
8 files changed, 4 insertions(+), 146 deletions(-)
diff --git a/osgi/itests-felix/pom.xml b/osgi/itests-felix/pom.xml
index 03071b3..13043cf 100644
--- a/osgi/itests-felix/pom.xml
+++ b/osgi/itests-felix/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>3.2.1-SNAPSHOT</version>
+ <version>3.2.10-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.cxf.osgi.itests</groupId>
diff --git a/parent/pom.xml b/parent/pom.xml
index db5d21e..50e5eb6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2913,7 +2913,7 @@
<id>java9-plus</id>
<properties>
<cxf.asm.version>6.2</cxf.asm.version>
- <cxf.karaf.version>4.2.1-SNAPSHOT</cxf.karaf.version>
+ <cxf.karaf.version>4.2.6</cxf.karaf.version>
<cxf.pax.exam.version>4.12.0</cxf.pax.exam.version>
<cxf.server.launcher.vmargs>-ea --patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-${cxf.javax.annotation-api.version}.jar --patch-module java.transaction=${project.basedir}/target/java9 --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2.runtime.reflect=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.in [...]
<cxf.surefire.fork.vmargs>-ea --patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-${cxf.javax.annotation-api.version}.jar --patch-module java.transaction=${project.basedir}/target/java9 --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2.run [...]
diff --git a/rt/rs/security/jcs-parent/jcs/pom.xml b/rt/rs/security/jcs-parent/jcs/pom.xml
deleted file mode 100644
index a056a15..0000000
--- a/rt/rs/security/jcs-parent/jcs/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-<!--
- 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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>cxf-rt-rs-security-jcs</artifactId>
- <packaging>bundle</packaging>
- <name>Apache CXF Runtime JSON Clear Signature Core</name>
- <description>Apache CXF Runtime JSON Clear Signature Core</description>
- <url>https://cxf.apache.org</url>
- <parent>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-parent</artifactId>
- <version>3.2.1-SNAPSHOT</version>
- <relativePath>../../../../../parent/pom.xml</relativePath>
- </parent>
- <properties>
- <cxf.module.name>org.apache.cxf.rs.security.jcs</cxf.module.name>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-security</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-ext-jdk15on</artifactId>
- <version>${cxf.bcprov.version}</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <!--test dependencies-->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/rt/rs/security/jcs-parent/jcs/src/main/java/org/apache/cxf/rs/security/jcs/TempResource.java b/rt/rs/security/jcs-parent/jcs/src/main/java/org/apache/cxf/rs/security/jcs/TempResource.java
deleted file mode 100644
index e0e1372..0000000
--- a/rt/rs/security/jcs-parent/jcs/src/main/java/org/apache/cxf/rs/security/jcs/TempResource.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * 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.
- */
-
-package org.apache.cxf.rs.security.jcs;
-
-public class TempResource {
-}
diff --git a/rt/rs/security/jcs-parent/jcs/src/test/java/org/apache/cxf/rs/security/jcs/TempResource.java b/rt/rs/security/jcs-parent/jcs/src/test/java/org/apache/cxf/rs/security/jcs/TempResource.java
deleted file mode 100644
index e0e1372..0000000
--- a/rt/rs/security/jcs-parent/jcs/src/test/java/org/apache/cxf/rs/security/jcs/TempResource.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * 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.
- */
-
-package org.apache.cxf.rs.security.jcs;
-
-public class TempResource {
-}
diff --git a/rt/rs/security/jcs-parent/pom.xml b/rt/rs/security/jcs-parent/pom.xml
deleted file mode 100644
index d269f45..0000000
--- a/rt/rs/security/jcs-parent/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!--
- 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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>cxf-rt-rs-security-jcs-parent</artifactId>
- <packaging>pom</packaging>
- <name>Apache CXF JSON Clear Signature parent</name>
- <description>Apache CXF JSON Clear Signature parent</description>
- <url>https://cxf.apache.org</url>
- <parent>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-security</artifactId>
- <version>3.2.1-SNAPSHOT</version>
- </parent>
- <modules>
- <module>jcs</module>
- </modules>
-</project>
diff --git a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
index 5d8e2ba..62ee789 100644
--- a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
+++ b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
@@ -65,7 +65,7 @@ public class BasicIntegrationTest {
System.setProperty("BasicIntegrationTest.PORT", port);
String xkmsEndpoint = "http://localhost:" + port + "/cxf/XKMS";
- String karafVersion = System.getProperty("karaf.version", "4.2.1-SNAPSHOT");
+ String karafVersion = System.getProperty("karaf.version", "4.2.6");
String localRepository = System.getProperty("localRepository");
MavenArtifactUrlReference karafUrl = maven() //
.groupId("org.apache.karaf") //
diff --git a/systests/wsdl_maven/java2ws/pom.xml b/systests/wsdl_maven/java2ws/pom.xml
index 1979b8b..302f7e3 100644
--- a/systests/wsdl_maven/java2ws/pom.xml
+++ b/systests/wsdl_maven/java2ws/pom.xml
@@ -109,7 +109,7 @@
cxf-java2ws-plugin
</artifactId>
<versionRange>
- [3.1.0-SNAPSHOT,)
+ [3.1.0,)
</versionRange>
<goals>
<goal>java2ws</goal>