This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch CXF-8377 in repository https://gitbox.apache.org/repos/asf/cxf.git
commit b8b531342567b9210ceb695352a5a459997dd04b Author: reta <[email protected]> AuthorDate: Tue Apr 6 07:32:43 2021 -0400 CXF-8377: Update to Apache Karaf 4.3.1 (refactored to use servlet compatibility fragment and feature processing) --- osgi/bundle/pom.xml | 1 + osgi/bundle/servlet-compatible/pom.xml | 66 ++++++++++++++++++++++ osgi/karaf/features/pom.xml | 6 ++ .../karaf/features/src/main/resources/features.xml | 3 +- .../main/resources/org.apache.karaf.features.xml} | 28 ++++----- 5 files changed, 84 insertions(+), 20 deletions(-) diff --git a/osgi/bundle/pom.xml b/osgi/bundle/pom.xml index da7c033..99193f2 100644 --- a/osgi/bundle/pom.xml +++ b/osgi/bundle/pom.xml @@ -32,5 +32,6 @@ </parent> <modules> <module>compatible</module> + <module>servlet-compatible</module> </modules> </project> diff --git a/osgi/bundle/servlet-compatible/pom.xml b/osgi/bundle/servlet-compatible/pom.xml new file mode 100644 index 0000000..f18eed3 --- /dev/null +++ b/osgi/bundle/servlet-compatible/pom.xml @@ -0,0 +1,66 @@ +<?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-servlet-compatible</artifactId> + <packaging>bundle</packaging> + <name>Apache CXF Servlet Compatibility Bundle Jar</name> + <description>Apache CXF Servlet Compatibility Bundle Jar</description> + <url>https://cxf.apache.org</url> + <parent> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-bundle-parent</artifactId> + <version>3.5.0-SNAPSHOT</version> + </parent> + + <properties> + <cxf.osgi.symbolic.name>${project.groupId}.bundle.servlet</cxf.osgi.symbolic.name> + <cxf.module.name>org.apache.cxf.bundle.servlet</cxf.module.name> + </properties> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-SymbolicName>${cxf.osgi.symbolic.name}</Bundle-SymbolicName> + <Implementation-Title>Apache CXF Servlet Compatibility Bundle</Implementation-Title> + <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor> + <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id> + <Implementation-Version>${cxf.osgi.version.clean}</Implementation-Version> + <Specification-Title>Apache CXF Servlet Compatibility Bundle</Specification-Title> + <Specification-Vendor>The Apache Software Foundation</Specification-Vendor> + <Specification-Version>${cxf.osgi.version.clean}</Specification-Version> + <Fragment-Host>javax.servlet-api</Fragment-Host> + <Export-Package> + javax.servlet;uses:="javax.servlet.annotation,javax.servlet.descriptor";version=3.1.0, + javax.servlet.annotation;uses:=javax.servlet;version=3.1.0, + javax.servlet.http;uses:=javax.servlet;version=3.1.0, + javax.servlet.descriptor;version=3.1.0 + </Export-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> +</project> diff --git a/osgi/karaf/features/pom.xml b/osgi/karaf/features/pom.xml index 326f2d5..1b3c6bc 100644 --- a/osgi/karaf/features/pom.xml +++ b/osgi/karaf/features/pom.xml @@ -102,6 +102,11 @@ <artifactId>cxf-rt-ws-security</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-servlet-compatible</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> <build> <resources> @@ -158,6 +163,7 @@ <goal>verify</goal> </goals> <configuration> + <featureProcessingInstructions>${project.build.directory}/classes/org.apache.karaf.features.xml</featureProcessingInstructions> <descriptors> <descriptor>mvn:org.apache.karaf.features/framework/${cxf.karaf.version}/xml/features</descriptor> <descriptor>mvn:org.apache.karaf.features/standard/${cxf.karaf.version}/xml/features</descriptor> diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml index 66d46d0..5ffc45c 100644 --- a/osgi/karaf/features/src/main/resources/features.xml +++ b/osgi/karaf/features/src/main/resources/features.xml @@ -216,9 +216,8 @@ </capability> </feature> <feature name="cxf-http-undertow" version="${project.version}"> - <feature version="${project.version}">cxf-core</feature> + <feature version="${project.version}">cxf-http</feature> <feature>pax-http-undertow</feature> - <bundle dependency="true" start-level="40">mvn:org.apache.cxf/cxf-rt-transports-http/${project.version}</bundle> <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-http-undertow/${project.version}</bundle> <capability> cxf.http.provider;name=undertow diff --git a/osgi/bundle/pom.xml b/osgi/karaf/features/src/main/resources/org.apache.karaf.features.xml similarity index 50% copy from osgi/bundle/pom.xml copy to osgi/karaf/features/src/main/resources/org.apache.karaf.features.xml index da7c033..ebf40d5 100644 --- a/osgi/bundle/pom.xml +++ b/osgi/karaf/features/src/main/resources/org.apache.karaf.features.xml @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?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 @@ -17,20 +17,12 @@ 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-bundle-parent</artifactId> - <packaging>pom</packaging> - <name>Apache CXF Bundle Parent</name> - <description>Apache CXF Bundle Parent</description> - <url>https://cxf.apache.org</url> - <parent> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-parent</artifactId> - <version>3.5.0-SNAPSHOT</version> - <relativePath>../../parent</relativePath> - </parent> - <modules> - <module>compatible</module> - </modules> -</project> +<featuresProcessing xmlns="http://karaf.apache.org/xmlns/features-processing/v1.0.0"; xmlns:f="http://karaf.apache.org/xmlns/features/v1.6.0";> + <featureReplacements> + <replacement mode="merge"> + <feature name="pax-http-undertow" version="7.3.13"> + <f:bundle start-level="35">mvn:org.apache.cxf/cxf-servlet-compatible/${project.version}</f:bundle> + </feature> + </replacement> + </featureReplacements> +</featuresProcessing> \ No newline at end of file
