From 9d9e6b4e6aceb1e4f322babc481b04b42a4aa3be Mon Sep 17 00:00:00 2001
From: Raul Kripalani <raulk@apache.org>
Date: Mon, 17 Feb 2014 00:14:12 +0000
Subject: [PATCH] SM-2240 Fix duplication of some endorsed libraries.

---
 .../src/main/filtered-resources/features.xml  | 14 +++++++-------
 .../src/main/resources/common-unix-bin.xml    |  1 +
 .../src/main/resources/common-windows-bin.xml |  1 +
 parent/pom.xml                                | 19 ++++++++++---------
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/assemblies/apache-servicemix/src/main/filtered-resources/features.xml b/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
index 9aec6fa..44c33c9 100644
--- a/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
+++ b/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
@@ -46,7 +46,7 @@
     </feature>
     <feature name="examples-cxf-osgi" version="${version}" resolver="(obr)">
         <feature version="${cxf.version}">cxf</feature>
-        <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version.added}</bundle>
         <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
         <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
         <bundle>mvn:org.apache.servicemix.examples/cxf-osgi/${version}</bundle>
@@ -119,25 +119,25 @@
     </feature>
     <feature name="examples-cxf-ws-addressing" version="${version}" resolver="(obr)">
         <feature version="${cxf.version}">cxf</feature>
-        <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version.added}</bundle>
         <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
         <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
         <bundle>mvn:org.apache.servicemix.examples/cxf-ws-addressing/${version}</bundle>
     </feature>
     <feature name="examples-cxf-ws-security-osgi" version="${version}" resolver="(obr)">
         <feature version="${cxf.version}">cxf</feature>
-        <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version.added}</bundle>
         <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
         <bundle>mvn:org.apache.servicemix.examples/cxf-ws-security-osgi/${version}</bundle>
     </feature>
     <feature name="examples-cxf-ws-security-blueprint" version="${version}" resolver="(obr)">
         <feature version="${cxf.version}">cxf</feature>
-        <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version.added}</bundle>
         <bundle>mvn:org.apache.servicemix.examples/cxf-ws-security-blueprint/${version}</bundle>
     </feature>
     <feature name="examples-cxf-ws-security-signature" version="${version}" resolver="(obr)">
         <feature version="${cxf.version}">cxf</feature>
-        <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version.added}</bundle>
         <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
         <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
         <bundle>mvn:org.apache.servicemix.examples/cxf-ws-security-signature/${version}</bundle>
@@ -183,7 +183,7 @@
         <feature version="${camel.version}">camel</feature>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.bundle.version}</bundle>
         <bundle dependency="true">mvn:org.mybatis/mybatis/${mybatis.version}/</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix.specs.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix.specs.version.added}</bundle>
         <bundle dependency="true">mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
         <bundle dependency="true">mvn:com.h2database/h2/${h2.version}</bundle>
         <bundle>mvn:org.activiti/activiti-engine/${activiti.version}</bundle>
@@ -208,7 +208,7 @@
 
     <!-- workaround before SM-2179 get addressed on CXF side-->
     <feature name="jaxrs-api">
-        <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr339-api-m10/${servicemix.specs.version}</bundle>
+        <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr339-api-m10/${servicemix.specs.version.added}</bundle>
     </feature>
     <feature name="swagger" version="${version}" resolver="(obr)">
         <bundle dependency='true'>mvn:org.scala-lang/scala-library/${scala.version}</bundle>
diff --git a/assemblies/shared/src/main/resources/common-unix-bin.xml b/assemblies/shared/src/main/resources/common-unix-bin.xml
index f67111c..321df20 100644
--- a/assemblies/shared/src/main/resources/common-unix-bin.xml
+++ b/assemblies/shared/src/main/resources/common-unix-bin.xml
@@ -33,6 +33,7 @@
               <exclude>etc/custom.properties</exclude>
               <exclude>etc/jre.properties</exclude>
               <exclude>etc/jre.properties.cxf</exclude>
+              <exclude>lib/endorsed/*-${servicemix.specs.version.removed}.jar</exclude>
               <exclude>system/**</exclude>
               <exclude>LICENSE</exclude>
               <exclude>NOTICE</exclude>
diff --git a/assemblies/shared/src/main/resources/common-windows-bin.xml b/assemblies/shared/src/main/resources/common-windows-bin.xml
index c4257ae..be025fc 100644
--- a/assemblies/shared/src/main/resources/common-windows-bin.xml
+++ b/assemblies/shared/src/main/resources/common-windows-bin.xml
@@ -32,6 +32,7 @@
              <exclude>etc/custom.properties</exclude>
              <exclude>etc/jre.properties</exclude>
              <exclude>etc/jre.properties.cxf</exclude>
+             <exclude>lib/endorsed/*-${servicemix.specs.version.removed}.jar</exclude>
              <exclude>system/**</exclude>
              <exclude>LICENSE</exclude>
              <exclude>NOTICE</exclude>
diff --git a/parent/pom.xml b/parent/pom.xml
index 1b5342d..3769634 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -55,7 +55,8 @@
     <fasterxml.jackson.version>2.2.1</fasterxml.jackson.version>
     <typesafe-config.version>1.0.0</typesafe-config.version>
 
-    <servicemix.specs.version>2.4.0</servicemix.specs.version>
+    <servicemix.specs.version.added>2.4.0</servicemix.specs.version.added>
+    <servicemix.specs.version.removed>2.2.0</servicemix.specs.version.removed>
   </properties>
 
   <!-- Managed dependencies -->
@@ -425,42 +426,42 @@
       <dependency>
         <groupId>org.apache.servicemix.specs</groupId>
         <artifactId>org.apache.servicemix.specs.jsr311-api-1.1.1</artifactId>
-        <version>${servicemix.specs.version}</version>
+        <version>${servicemix.specs.version.added}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.servicemix.specs</groupId>
         <artifactId>org.apache.servicemix.specs.java-persistence-api-2.0</artifactId>
-        <version>${servicemix.specs.version}</version>
+        <version>${servicemix.specs.version.added}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.servicemix.specs</groupId>
         <artifactId>org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}</artifactId>
-        <version>${servicemix.specs.version}</version>
+        <version>${servicemix.specs.version.added}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.servicemix.specs</groupId>
         <artifactId>org.apache.servicemix.specs.jaxp-api-1.4</artifactId>
-        <version>${servicemix.specs.version}</version>
+        <version>${servicemix.specs.version.added}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.servicemix.specs</groupId>
         <artifactId>org.apache.servicemix.specs.jaxws-api-2.2</artifactId>
-        <version>${servicemix.specs.version}</version>
+        <version>${servicemix.specs.version.added}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.servicemix.specs</groupId>
         <artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
-        <version>${servicemix.specs.version}</version>
+        <version>${servicemix.specs.version.added}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.servicemix.specs</groupId>
         <artifactId>org.apache.servicemix.specs.activator</artifactId>
-        <version>${servicemix.specs.version}</version>
+        <version>${servicemix.specs.version.added}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.servicemix.specs</groupId>
         <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
-        <version>${servicemix.specs.version}</version>
+        <version>${servicemix.specs.version.added}</version>
       </dependency>
 
     </dependencies>