servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r1471233 - in /servicemix/smx5/trunk: assemblies/shared/pom.xml assemblies/shared/src/main/resources/common-bin.xml assemblies/shared/src/main/resources/etc/jre.properties parent/pom.xml
Date Wed, 24 Apr 2013 03:16:47 GMT
Author: ffang
Date: Wed Apr 24 03:16:47 2013
New Revision: 1471233

URL: http://svn.apache.org/r1471233
Log:
[SM-2196]need also endorse activation-api spec jar

Modified:
    servicemix/smx5/trunk/assemblies/shared/pom.xml
    servicemix/smx5/trunk/assemblies/shared/src/main/resources/common-bin.xml
    servicemix/smx5/trunk/assemblies/shared/src/main/resources/etc/jre.properties
    servicemix/smx5/trunk/parent/pom.xml

Modified: servicemix/smx5/trunk/assemblies/shared/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/shared/pom.xml?rev=1471233&r1=1471232&r2=1471233&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/shared/pom.xml (original)
+++ servicemix/smx5/trunk/assemblies/shared/pom.xml Wed Apr 24 03:16:47 2013
@@ -51,6 +51,10 @@
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
+            <artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.specs</groupId>
             <artifactId>org.apache.servicemix.specs.activator</artifactId>
         </dependency>
     </dependencies>

Modified: servicemix/smx5/trunk/assemblies/shared/src/main/resources/common-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/shared/src/main/resources/common-bin.xml?rev=1471233&r1=1471232&r2=1471233&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/shared/src/main/resources/common-bin.xml (original)
+++ servicemix/smx5/trunk/assemblies/shared/src/main/resources/common-bin.xml Wed Apr 24 03:16:47
2013
@@ -50,6 +50,7 @@
                 <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxb-api-2.2</include>
                 <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxws-api-2.2</include>
                 <include>org.apache.servicemix.specs:org.apache.servicemix.specs.saaj-api-1.3</include>
+                <include>org.apache.servicemix.specs:org.apache.servicemix.specs.activation-api-1.1</include>
                 <include>xalan:xalan</include>
                 <include>xalan:serializer</include>
             </includes>

Modified: servicemix/smx5/trunk/assemblies/shared/src/main/resources/etc/jre.properties
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/shared/src/main/resources/etc/jre.properties?rev=1471233&r1=1471232&r2=1471233&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/shared/src/main/resources/etc/jre.properties (original)
+++ servicemix/smx5/trunk/assemblies/shared/src/main/resources/etc/jre.properties Wed Apr
24 03:16:47 2013
@@ -25,7 +25,7 @@
 #   - javax.transaction* is exported with a mandatory attribute
 jre-1.6= \
  javax.accessibility, \
- #javax.activation;version="1.1", \
+ javax.activation;version="1.1", \
  javax.activity, \
  javax.annotation;version="1.1", \
  javax.annotation.processing;version="1.1", \
@@ -188,7 +188,7 @@ jre-1.6= \
 #   - javax.transaction* is exported with a mandatory attribute
 jre-1.7= \
  javax.accessibility, \
- #javax.activation;version="1.1", \
+ javax.activation;version="1.1", \
  javax.activity, \
  javax.annotation;version="1.1", \
  javax.annotation.processing;version="1.1", \

Modified: servicemix/smx5/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/parent/pom.xml?rev=1471233&r1=1471232&r2=1471233&view=diff
==============================================================================
--- servicemix/smx5/trunk/parent/pom.xml (original)
+++ servicemix/smx5/trunk/parent/pom.xml Wed Apr 24 03:16:47 2013
@@ -53,7 +53,7 @@
     <scala.version>2.10.0</scala.version>
     <typesafe-config.version>1.0.0</typesafe-config.version>
 
-    <servicemix.specs.version>2.2.0</servicemix.specs.version>
+    <servicemix.specs.version>2.3-SNAPSHOT</servicemix.specs.version>
   </properties>
 
   <!-- Managed dependencies -->
@@ -447,6 +447,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.servicemix.specs</groupId>
+        <artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
+        <version>${servicemix.specs.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.servicemix.specs</groupId>
         <artifactId>org.apache.servicemix.specs.activator</artifactId>
         <version>${servicemix.specs.version}</version>
       </dependency>



Mime
View raw message