This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 11502cd9e0 Getting ready to Apache Karaf 4.4.0 release
11502cd9e0 is described below
commit 11502cd9e0f85ded3ae83b3df7226d2e107159ab
Author: Andriy Redko <[email protected]>
AuthorDate: Mon Apr 18 18:06:33 2022 -0400
Getting ready to Apache Karaf 4.4.0 release
---
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, 2 insertions(+), 102 deletions(-)
diff --git a/osgi/bundle/pom.xml b/osgi/bundle/pom.xml
index b1aec77e59..d8d15573e6 100644
--- a/osgi/bundle/pom.xml
+++ b/osgi/bundle/pom.xml
@@ -32,6 +32,5 @@
</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
deleted file mode 100644
index 4c7da283cb..0000000000
--- a/osgi/bundle/servlet-compatible/pom.xml
+++ /dev/null
@@ -1,66 +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-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>4.0.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 5d14f18846..96fb3a9901 100644
--- a/osgi/karaf/features/pom.xml
+++ b/osgi/karaf/features/pom.xml
@@ -102,11 +102,6 @@
<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>
@@ -163,7 +158,6 @@
<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 a9220683c0..0c0a196786 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -205,7 +205,7 @@
</feature>
<feature name="cxf-http-undertow" version="${project.version}">
<feature version="${project.version}">cxf-http</feature>
- <feature>pax-http-undertow</feature>
+ <feature>pax-web-http-undertow</feature>
<bundle
start-level="40">mvn:org.apache.cxf/cxf-rt-transports-http-undertow/${project.version}</bundle>
<capability>
cxf.http.provider;name=undertow
@@ -520,6 +520,7 @@
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/1.0_6</bundle>
<bundle
dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${cxf.geronimo.jms.version}</bundle>
<bundle
dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/${cxf.geronimo.j2ee.management.version}</bundle>
+ <bundle
dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${cxf.geronimo.jta.version}</bundle>
<bundle
dependency="true">mvn:org.apache.activemq/activemq-osgi/${cxf.activemq.version}</bundle>
<bundle>mvn:org.apache.cxf.services.wsn/cxf-services-wsn-core/${project.version}</bundle>
</feature>
diff --git
a/osgi/karaf/features/src/main/resources/org.apache.karaf.features.xml
b/osgi/karaf/features/src/main/resources/org.apache.karaf.features.xml
deleted file mode 100644
index 3c8c8ae02c..0000000000
--- a/osgi/karaf/features/src/main/resources/org.apache.karaf.features.xml
+++ /dev/null
@@ -1,28 +0,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
- 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.
--->
-<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.23">
- <f:bundle
start-level="35">mvn:org.apache.cxf/cxf-servlet-compatible/${project.version}</f:bundle>
- </feature>
- </replacement>
- </featureReplacements>
-</featuresProcessing>
