You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2019/05/24 19:28:19 UTC

[aries-jax-rs-whiteboard] branch master updated: Flatten the CXF and Aries dependencies into the Whiteboard JAR

This is an automated email from the ASF dual-hosted git repository.

csierra pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git


The following commit(s) were added to refs/heads/master by this push:
     new 4a473ea  Flatten the CXF and Aries dependencies into the Whiteboard JAR
4a473ea is described below

commit 4a473ea7bd6dd403ac9a309ceeb170d868469c60
Author: Tim Ward <ti...@apache.org>
AuthorDate: Fri May 24 15:59:21 2019 +0100

    Flatten the CXF and Aries dependencies into the Whiteboard JAR
    
    Signed-off-by: Tim Ward <ti...@apache.org>
---
 jax-rs.whiteboard/bnd.bnd                          |   8 +-
 jax-rs.whiteboard/pom.xml                          |   5 +
 org.apache.aries.jax.rs.cxf.repackage/pom.xml      | 110 +++++++++++++++++++++
 .../src/main/resources/META-INF/MANIFEST.MF        |   1 +
 pom.xml                                            |   1 +
 5 files changed, 118 insertions(+), 7 deletions(-)

diff --git a/jax-rs.whiteboard/bnd.bnd b/jax-rs.whiteboard/bnd.bnd
index 26d280e..160e4c9 100644
--- a/jax-rs.whiteboard/bnd.bnd
+++ b/jax-rs.whiteboard/bnd.bnd
@@ -52,13 +52,7 @@ Import-Package:\
     *
 
 -includeresource:\
-    lib/component-dsl.jar=org.apache.aries.component-dsl.component-dsl-*.jar;lib:=true,\
-    lib/cxf-core.jar=cxf-core-*.jar;lib:=true,\
-    lib/cxf-rt-frontend-jaxrs.jar=cxf-rt-frontend-jaxrs-*.jar;lib:=true,\
-    lib/cxf-rt-rs-client.jar=cxf-rt-rs-client-*.jar;lib:=true,\
-    lib/cxf-rt-rs-sse.jar=cxf-rt-rs-sse-*.jar;lib:=true,\
-    lib/cxf-rt-transports-http.jar=cxf-rt-transports-http-*.jar;lib:=true,\
-    lib/cxf-tools-common.jar=cxf-tools-common-*.jar;lib:=true,\
+    @org.apache.aries.jax.rs.cxf.repackage-*.jar,\
     lib/stax2-api.jar=stax2-api-*.jar;lib:=true,\
     lib/woodstox-core.jar=woodstox-core-*.jar;lib:=true,\
     lib/xmlschema-core.jar=xmlschema-core-*.jar;lib:=true
diff --git a/jax-rs.whiteboard/pom.xml b/jax-rs.whiteboard/pom.xml
index 8cc106a..97cd629 100644
--- a/jax-rs.whiteboard/pom.xml
+++ b/jax-rs.whiteboard/pom.xml
@@ -95,6 +95,11 @@
             <artifactId>org.osgi.util.function</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.apache.aries.jax.rs.cxf.repackage</groupId>
+            <artifactId>org.apache.aries.jax.rs.cxf.repackage</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <version>1.7.2</version>
diff --git a/org.apache.aries.jax.rs.cxf.repackage/pom.xml b/org.apache.aries.jax.rs.cxf.repackage/pom.xml
new file mode 100644
index 0000000..5ec66ed
--- /dev/null
+++ b/org.apache.aries.jax.rs.cxf.repackage/pom.xml
@@ -0,0 +1,110 @@
+<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">
+  <modelVersion>4.0.0</modelVersion>
+    <parent>
+      <groupId>org.apache.aries.jax.rs</groupId>
+      <artifactId>org.apache.aries.jax.rs</artifactId>
+      <version>1.0.5-SNAPSHOT</version>
+    </parent>
+  
+    <groupId>org.apache.aries.jax.rs.cxf.repackage</groupId>
+    <artifactId>org.apache.aries.jax.rs.cxf.repackage</artifactId>
+    <description>This project extracts and repackages CXF so that the whiteboard can be more easily built</description>
+    <name>Aries JAX-RS Whiteboard CXF dependency repackaging</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.aries.component-dsl</groupId>
+            <artifactId>org.apache.aries.component-dsl.component-dsl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-rs-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-rs-sse</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-transports-http</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-tools-common</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                
+                <executions>
+                    <execution>
+                        <id>extract-classes</id>
+                        <goals>
+                            <goal>unpack-dependencies</goal>
+                        </goals>
+                        <configuration>
+                           <includes>**/*.class,**/Messages.properties,META-INF/services/*,org/apache/cxf/version/version.properties</includes>
+                           <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+                           <markersDirectory>${project.build.directory}/dependency-maven-plugin-markers-classes</markersDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>extract-bus-extensions</id>
+                        <goals>
+                            <goal>unpack-dependencies</goal>
+                        </goals>
+                        <configuration>
+                           <includeGroupIds>org.apache.cxf</includeGroupIds>
+                           <includes>META-INF/cxf/bus-extensions.txt</includes>
+                           <outputDirectory>${project.build.directory}/cxf-bus</outputDirectory>
+                           <useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact>
+                           <markersDirectory>${project.build.directory}/dependency-maven-plugin-markers-extensions</markersDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                	<excludeTransitive>true</excludeTransitive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>create-merged-extensions</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <concat destfile="${project.build.outputDirectory}/META-INF/cxf/bus-extensions.txt"
+                                        fixlastline="true">
+                                    <fileset dir="${project.build.directory}/cxf-bus">
+                                        <include name="**/bus-extensions.txt"></include>
+                                    </fileset>
+                                    <filterchain>
+                                        <tokenfilter> <trim/> </tokenfilter>
+                                        <tokenfilter> <ignoreblank/> </tokenfilter>
+                                    </filterchain>
+                                </concat>
+                            </target>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/org.apache.aries.jax.rs.cxf.repackage/src/main/resources/META-INF/MANIFEST.MF b/org.apache.aries.jax.rs.cxf.repackage/src/main/resources/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..348f1bd
--- /dev/null
+++ b/org.apache.aries.jax.rs.cxf.repackage/src/main/resources/META-INF/MANIFEST.MF
@@ -0,0 +1 @@
+Manifest-Version: 1.0
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 4987c57..88fa60f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,7 @@
         <module>jax-rs.itests-fragment</module>
         <module>jax-rs.itests</module>
         <module>jax-rs.features</module>
+        <module>org.apache.aries.jax.rs.cxf.repackage</module>
     </modules>
 
     <dependencyManagement>