[release-tools] creating tag for tomee-1.6.0

git-svn-id: https://svn.apache.org/repos/asf/tomee/tomee/tags/tomee-1.6.0@1542691 13f79535-47bb-0310-9956-ffa450edef68
apache · Nov 17, 2013 · 556ccad · 556ccad
2 parents 6a46e12 + c780ba2
commit 556ccad
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 30 deletions.
diff --git a/arquillian/arquillian-tomee-common/pom.xml b/arquillian/arquillian-tomee-common/pom.xml
@@ -179,7 +179,7 @@
         </exclusion>
         <exclusion>
           <artifactId>openjpa</artifactId>
-          <groupId>org.apache.openjpa</groupId>
+          <groupId>org.apache.openejb.patch</groupId>
         </exclusion>
         <exclusion>
           <artifactId>openwebbeans-web</artifactId>

diff --git a/arquillian/arquillian-tomee-webapp-remote/pom.xml b/arquillian/arquillian-tomee-webapp-remote/pom.xml
@@ -203,7 +203,7 @@
         </exclusion>
         <exclusion>
           <artifactId>openjpa</artifactId>
-          <groupId>org.apache.openjpa</groupId>
+          <groupId>org.apache.openejb.patch</groupId>
         </exclusion>
         <exclusion>
           <artifactId>openwebbeans-web</artifactId>

diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
@@ -615,7 +615,7 @@
       <artifactId>openwebbeans-web</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openjpa</groupId>
+      <groupId>org.apache.openejb.patch</groupId>
       <artifactId>openjpa</artifactId>
     </dependency>
     <!--

diff --git a/pom.xml b/pom.xml
@@ -93,7 +93,7 @@
     <openejb.version>4.6.0</openejb.version>
     <tomee.version>1.6.0</tomee.version>
 
-    <openjpa.version>2.3.0</openjpa.version>
+    <openjpa.version>2.3.0-nonfinal-1540826</openjpa.version>
     <org.apache.openwebbeans.version>1.2.1</org.apache.openwebbeans.version>
 
     <!-- Maven module versions -->
@@ -555,29 +555,7 @@
     <repository>
       <id>xbean</id>
       <name>Apache OpenJPA 2.3.0 staging repository</name>
-      <url>https://repository.apache.org/content/repositories/orgapacheopenjpa-117/</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>openwebbeans</id>
-      <name>Apache OpenWebBeans 1.2.1 staging epository</name>
-      <url>https://repository.apache.org/content/repositories/orgapacheopenwebbeans-091/</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>openjpa</id>
-      <name>Patched Apache OpenJPA 2.3.0 staging epository</name>
-      <url>https://repository.apache.org/content/repositories/orgapachetomee-102/</url>
+      <url>https://repository.apache.org/content/repositories/orgapachetomee-147/</url>
       <releases>
         <enabled>true</enabled>
       </releases>
@@ -1297,7 +1275,7 @@
         <scope>provided</scope>
       </dependency>
       <dependency>
-        <groupId>org.apache.openjpa</groupId>
+        <groupId>org.apache.openejb.patch</groupId>
         <artifactId>openjpa</artifactId>
         <version>${openjpa.version}</version>
         <exclusions>

diff --git a/tomee/pom.xml b/tomee/pom.xml
@@ -118,7 +118,7 @@
           <version>${openejb.version}</version>
           <exclusions>
             <exclusion>
-              <groupId>org.apache.openjpa</groupId>
+              <groupId>org.apache.openejb.patch</groupId>
               <artifactId>openjpa</artifactId>
             </exclusion>
             <exclusion>

diff --git a/utils/openejb-core-hibernate/pom.xml b/utils/openejb-core-hibernate/pom.xml
@@ -35,7 +35,7 @@
       <version>${project.version}</version>
       <exclusions>
         <exclusion>
-          <groupId>org.apache.openjpa</groupId>
+          <groupId>org.apache.openejb.patch</groupId>
           <artifactId>openjpa</artifactId>
         </exclusion>
         <exclusion>