You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2015/08/18 08:54:10 UTC

servicemix-bundles git commit: [SM-2649]need use jta 1.2 spec for the spring-aspects 4.x

Repository: servicemix-bundles
Updated Branches:
  refs/heads/master 786b0fce5 -> 677ce9416


[SM-2649]need use jta 1.2 spec for the spring-aspects 4.x


Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/677ce941
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/677ce941
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/677ce941

Branch: refs/heads/master
Commit: 677ce9416520f1a5b05bd0c1b8901f5608332c13
Parents: 786b0fc
Author: Freeman Fang <fr...@gmail.com>
Authored: Tue Aug 18 14:53:28 2015 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Tue Aug 18 14:53:28 2015 +0800

----------------------------------------------------------------------
 spring-aspects-4.0.1.RELEASE/pom.xml | 2 +-
 spring-aspects-4.0.2.RELEASE/pom.xml | 2 +-
 spring-aspects-4.0.3.RELEASE/pom.xml | 2 +-
 spring-aspects-4.0.5.RELEASE/pom.xml | 2 +-
 spring-aspects-4.0.6.RELEASE/pom.xml | 2 +-
 spring-aspects-4.0.7.RELEASE/pom.xml | 2 +-
 spring-aspects-4.1.0.RELEASE/pom.xml | 2 +-
 spring-aspects-4.1.1.RELEASE/pom.xml | 2 +-
 spring-aspects-4.1.2.RELEASE/pom.xml | 2 +-
 spring-aspects-4.1.4.RELEASE/pom.xml | 2 +-
 spring-aspects-4.1.5.RELEASE/pom.xml | 2 +-
 spring-aspects-4.1.6.RELEASE/pom.xml | 2 +-
 spring-aspects-4.1.7.RELEASE/pom.xml | 2 +-
 spring-aspects-4.2.0.RELEASE/pom.xml | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/677ce941/spring-aspects-4.0.1.RELEASE/pom.xml
----------------------------------------------------------------------
diff --git a/spring-aspects-4.0.1.RELEASE/pom.xml b/spring-aspects-4.0.1.RELEASE/pom.xml
index 2969207..116277d 100644
--- a/spring-aspects-4.0.1.RELEASE/pom.xml
+++ b/spring-aspects-4.0.1.RELEASE/pom.xml
@@ -44,7 +44,7 @@
         <servicemix.osgi.import.pkg>
             javax.cache.annotation;resolution:=optional,
             javax.interceptor;resolution:=optional,
-            javax.transaction;resolution:=optional,
+            javax.transaction;version="[1.2,2)";resolution:=optional,
             org.aspectj.internal.lang.annotation;version="[1.7.1,2)";resolution:=optional,
             org.aspectj.lang;version="[1.7.1,2)";resolution:=optional,
             org.aspectj.lang.annotation;version="[1.7.1,2)";resolution:=optional,

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/677ce941/spring-aspects-4.0.2.RELEASE/pom.xml
----------------------------------------------------------------------
diff --git a/spring-aspects-4.0.2.RELEASE/pom.xml b/spring-aspects-4.0.2.RELEASE/pom.xml
index 6381520..f54eb49 100644
--- a/spring-aspects-4.0.2.RELEASE/pom.xml
+++ b/spring-aspects-4.0.2.RELEASE/pom.xml
@@ -44,7 +44,7 @@
         <servicemix.osgi.import.pkg>
             javax.cache.annotation;resolution:=optional,
             javax.interceptor;resolution:=optional,
-            javax.transaction;resolution:=optional,
+            javax.transaction;version="[1.2,2)";resolution:=optional,
             org.aspectj.internal.lang.annotation;version="[1.7.1,2)";resolution:=optional,
             org.aspectj.lang;version="[1.7.1,2)";resolution:=optional,
             org.aspectj.lang.annotation;version="[1.7.1,2)";resolution:=optional,

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/677ce941/spring-aspects-4.0.3.RELEASE/pom.xml
----------------------------------------------------------------------
diff --git a/spring-aspects-4.0.3.RELEASE/pom.xml b/spring-aspects-4.0.3.RELEASE/pom.xml
index 0e97619..ba7cfbe 100644
--- a/spring-aspects-4.0.3.RELEASE/pom.xml
+++ b/spring-aspects-4.0.3.RELEASE/pom.xml
@@ -44,7 +44,7 @@
         <servicemix.osgi.import.pkg>
             javax.cache.annotation;resolution:=optional,
             javax.interceptor;resolution:=optional,
-            javax.transaction;resolution:=optional,
+            javax.transaction;version="[1.2,2)";resolution:=optional,
             org.aspectj.internal.lang.annotation;version="[1.7.1,2)";resolution:=optional,
             org.aspectj.lang;version="[1.7.1,2)";resolution:=optional,
             org.aspectj.lang.annotation;version="[1.7.1,2)";resolution:=optional,

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/677ce941/spring-aspects-4.0.5.RELEASE/pom.xml
----------------------------------------------------------------------
diff --git a/spring-aspects-4.0.5.RELEASE/pom.xml b/spring-aspects-4.0.5.RELEASE/pom.xml
index 21644e2..c2bb814 100644
--- a/spring-aspects-4.0.5.RELEASE/pom.xml
+++ b/spring-aspects-4.0.5.RELEASE/pom.xml
@@ -44,7 +44,7 @@
         <servicemix.osgi.import.pkg>
             javax.cache.annotation;resolution:=optional,
             javax.interceptor;resolution:=optional,
-            javax.transaction;resolution:=optional,
+            javax.transaction;version="[1.2,2)";resolution:=optional,
             org.aspectj.internal.lang.annotation;version="[1.7.1,2)";resolution:=optional,
             org.aspectj.lang;version="[1.7.1,2)";resolution:=optional,
             org.aspectj.lang.annotation;version="[1.7.1,2)";resolution:=optional,

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/677ce941/spring-aspects-4.0.6.RELEASE/pom.xml
----------------------------------------------------------------------
diff --git a/spring-aspects-4.0.6.RELEASE/pom.xml b/spring-aspects-4.0.6.RELEASE/pom.xml
index c8c30db..4656a00 100644
--- a/spring-aspects-4.0.6.RELEASE/pom.xml
+++ b/spring-aspects-4.0.6.RELEASE/pom.xml
@@ -44,7 +44,7 @@
         <servicemix.osgi.import.pkg>
             javax.cache.annotation;resolution:=optional,
             javax.interceptor;resolution:=optional,
-            javax.transaction;resolution:=optional,
+            javax.transaction;version="[1.2,2)";resolution:=optional,
             org.aspectj.internal.lang.annotation;version="[1.7.1,2)";resolution:=optional,
             org.aspectj.lang;version="[1.7.1,2)";resolution:=optional,
             org.aspectj.lang.annotation;version="[1.7.1,2)";resolution:=optional,

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/677ce941/spring-aspects-4.0.7.RELEASE/pom.xml
----------------------------------------------------------------------
diff --git a/spring-aspects-4.0.7.RELEASE/pom.xml b/spring-aspects-4.0.7.RELEASE/pom.xml
index ec6a067..ac92f49 100644
--- a/spring-aspects-4.0.7.RELEASE/pom.xml
+++ b/spring-aspects-4.0.7.RELEASE/pom.xml
@@ -44,7 +44,7 @@
         <servicemix.osgi.import.pkg>
             javax.cache.annotation;resolution:=optional,
             javax.interceptor;resolution:=optional,
-            javax.transaction;resolution:=optional,
+            javax.transaction;version="[1.2,2)";resolution:=optional,
             org.aspectj.internal.lang.annotation;version="[1.7.1,2)";resolution:=optional,
             org.aspectj.lang;version="[1.7.1,2)";resolution:=optional,
             org.aspectj.lang.annotation;version="[1.7.1,2)";resolution:=optional,

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/677ce941/spring-aspects-4.1.0.RELEASE/pom.xml
----------------------------------------------------------------------
diff --git a/spring-aspects-4.1.0.RELEASE/pom.xml b/spring-aspects-4.1.0.RELEASE/pom.xml
index e40e270..2b3a71a 100644
--- a/spring-aspects-4.1.0.RELEASE/pom.xml
+++ b/spring-aspects-4.1.0.RELEASE/pom.xml
@@ -44,7 +44,7 @@
         <servicemix.osgi.import.pkg>
             javax.cache.annotation;resolution:=optional,
             javax.interceptor;resolution:=optional,
-            javax.transaction;resolution:=optional,
+            javax.transaction;version="[1.2,2)";resolution:=optional,
             org.aspectj.internal.lang.annotation;version="[1.8.2,2)";resolution:=optional,
             org.aspectj.lang;version="[1.8.2,2)";resolution:=optional,
             org.aspectj.lang.annotation;version="[1.8.2,2)";resolution:=optional,

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/677ce941/spring-aspects-4.1.1.RELEASE/pom.xml
----------------------------------------------------------------------
diff --git a/spring-aspects-4.1.1.RELEASE/pom.xml b/spring-aspects-4.1.1.RELEASE/pom.xml
index 4ac17ec..9b99e92 100644
--- a/spring-aspects-4.1.1.RELEASE/pom.xml
+++ b/spring-aspects-4.1.1.RELEASE/pom.xml
@@ -44,7 +44,7 @@
         <servicemix.osgi.import.pkg>
             javax.cache.annotation;resolution:=optional,
             javax.interceptor;resolution:=optional,
-            javax.transaction;resolution:=optional,
+            javax.transaction;version="[1.2,2)";resolution:=optional,
             org.aspectj.internal.lang.annotation;version="[1.8.2,2)";resolution:=optional,
             org.aspectj.lang;version="[1.8.2,2)";resolution:=optional,
             org.aspectj.lang.annotation;version="[1.8.2,2)";resolution:=optional,

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/677ce941/spring-aspects-4.1.2.RELEASE/pom.xml
----------------------------------------------------------------------
diff --git a/spring-aspects-4.1.2.RELEASE/pom.xml b/spring-aspects-4.1.2.RELEASE/pom.xml
index 1809b7e..9766142 100644
--- a/spring-aspects-4.1.2.RELEASE/pom.xml
+++ b/spring-aspects-4.1.2.RELEASE/pom.xml
@@ -44,7 +44,7 @@
         <servicemix.osgi.import.pkg>
             javax.cache.annotation;resolution:=optional,
             javax.interceptor;resolution:=optional,
-            javax.transaction;resolution:=optional,
+            javax.transaction;version="[1.2,2)";resolution:=optional,
             org.aspectj.internal.lang.annotation;version="[1.8.2,2)";resolution:=optional,
             org.aspectj.lang;version="[1.8.2,2)";resolution:=optional,
             org.aspectj.lang.annotation;version="[1.8.2,2)";resolution:=optional,

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/677ce941/spring-aspects-4.1.4.RELEASE/pom.xml
----------------------------------------------------------------------
diff --git a/spring-aspects-4.1.4.RELEASE/pom.xml b/spring-aspects-4.1.4.RELEASE/pom.xml
index 23eb279..c6e52fe 100644
--- a/spring-aspects-4.1.4.RELEASE/pom.xml
+++ b/spring-aspects-4.1.4.RELEASE/pom.xml
@@ -44,7 +44,7 @@
         <servicemix.osgi.import.pkg>
             javax.cache.annotation;resolution:=optional,
             javax.interceptor;resolution:=optional,
-            javax.transaction;resolution:=optional,
+            javax.transaction;version="[1.2,2)";resolution:=optional,
             org.aspectj.internal.lang.annotation;version="[1.8.2,2)";resolution:=optional,
             org.aspectj.lang;version="[1.8.2,2)";resolution:=optional,
             org.aspectj.lang.annotation;version="[1.8.2,2)";resolution:=optional,

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/677ce941/spring-aspects-4.1.5.RELEASE/pom.xml
----------------------------------------------------------------------
diff --git a/spring-aspects-4.1.5.RELEASE/pom.xml b/spring-aspects-4.1.5.RELEASE/pom.xml
index f95a640..8f8a8f0 100644
--- a/spring-aspects-4.1.5.RELEASE/pom.xml
+++ b/spring-aspects-4.1.5.RELEASE/pom.xml
@@ -51,7 +51,7 @@
         <servicemix.osgi.import.pkg>
             javax.cache.annotation;resolution:=optional,
             javax.interceptor;resolution:=optional,
-            javax.transaction;resolution:=optional,
+            javax.transaction;version="[1.2,2)";resolution:=optional,
             org.aspectj.internal.lang.annotation;version="[1.8.2,2)";resolution:=optional,
             org.aspectj.lang;version="[1.8.2,2)";resolution:=optional,
             org.aspectj.lang.annotation;version="[1.8.2,2)";resolution:=optional,

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/677ce941/spring-aspects-4.1.6.RELEASE/pom.xml
----------------------------------------------------------------------
diff --git a/spring-aspects-4.1.6.RELEASE/pom.xml b/spring-aspects-4.1.6.RELEASE/pom.xml
index 1c0ebb4..9405891 100644
--- a/spring-aspects-4.1.6.RELEASE/pom.xml
+++ b/spring-aspects-4.1.6.RELEASE/pom.xml
@@ -51,7 +51,7 @@
         <servicemix.osgi.import.pkg>
             javax.cache.annotation;resolution:=optional,
             javax.interceptor;resolution:=optional,
-            javax.transaction;resolution:=optional,
+            javax.transaction;version="[1.2,2)";resolution:=optional,
             org.aspectj.internal.lang.annotation;version="[1.8.2,2)";resolution:=optional,
             org.aspectj.lang;version="[1.8.2,2)";resolution:=optional,
             org.aspectj.lang.annotation;version="[1.8.2,2)";resolution:=optional,

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/677ce941/spring-aspects-4.1.7.RELEASE/pom.xml
----------------------------------------------------------------------
diff --git a/spring-aspects-4.1.7.RELEASE/pom.xml b/spring-aspects-4.1.7.RELEASE/pom.xml
index b4bab3f..1abb726 100644
--- a/spring-aspects-4.1.7.RELEASE/pom.xml
+++ b/spring-aspects-4.1.7.RELEASE/pom.xml
@@ -51,7 +51,7 @@
         <servicemix.osgi.import.pkg>
             javax.cache.annotation;resolution:=optional,
             javax.interceptor;resolution:=optional,
-            javax.transaction;resolution:=optional,
+            javax.transaction;version="[1.2,2)";resolution:=optional,
             org.aspectj.internal.lang.annotation;version="[1.8.2,2)";resolution:=optional,
             org.aspectj.lang;version="[1.8.2,2)";resolution:=optional,
             org.aspectj.lang.annotation;version="[1.8.2,2)";resolution:=optional,

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/677ce941/spring-aspects-4.2.0.RELEASE/pom.xml
----------------------------------------------------------------------
diff --git a/spring-aspects-4.2.0.RELEASE/pom.xml b/spring-aspects-4.2.0.RELEASE/pom.xml
index b945383..21087c6 100644
--- a/spring-aspects-4.2.0.RELEASE/pom.xml
+++ b/spring-aspects-4.2.0.RELEASE/pom.xml
@@ -51,7 +51,7 @@
         <servicemix.osgi.import.pkg>
             javax.cache.annotation;resolution:=optional,
             javax.interceptor;resolution:=optional,
-            javax.transaction;resolution:=optional,
+            javax.transaction;version="[1.2,2)";resolution:=optional,
             org.aspectj.internal.lang.annotation;version="[1.8.6,2)";resolution:=optional,
             org.aspectj.lang;version="[1.8.6,2)";resolution:=optional,
             org.aspectj.lang.annotation;version="[1.8.6,2)";resolution:=optional,