tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andygumbre...@apache.org
Subject svn commit: r1004827 - in /openejb/trunk/openejb3: ./ container/openejb-activemq4/ container/openejb-core/ container/openejb-jee/ container/openejb-osgi-core/ container/openejb-osgi/ examples/jpa-hibernate/ examples/webapps/jsf/ server/openejb-axis/ se...
Date Tue, 05 Oct 2010 22:05:20 GMT
Author: andygumbrecht
Date: Tue Oct  5 22:05:19 2010
New Revision: 1004827

URL: http://svn.apache.org/viewvc?rev=1004827&view=rev
Log:
Fixed several more version conflicts.
OSGI project names.

The StatelessPoolStatsTest may fail on testAging and testAgingWithReplacement - Still trying
to work out where these are going pear shaped?

Modified:
    openejb/trunk/openejb3/container/openejb-activemq4/pom.xml
    openejb/trunk/openejb3/container/openejb-core/pom.xml
    openejb/trunk/openejb3/container/openejb-jee/pom.xml
    openejb/trunk/openejb3/container/openejb-osgi-core/pom.xml
    openejb/trunk/openejb3/container/openejb-osgi/pom.xml
    openejb/trunk/openejb3/examples/jpa-hibernate/pom.xml
    openejb/trunk/openejb3/examples/webapps/jsf/pom.xml
    openejb/trunk/openejb3/pom.xml
    openejb/trunk/openejb3/server/openejb-axis/pom.xml
    openejb/trunk/openejb3/server/openejb-axis2/pom.xml
    openejb/trunk/openejb3/server/openejb-webadmin/pom.xml
    openejb/trunk/openejb3/server/openejb-webservices/pom.xml

Modified: openejb/trunk/openejb3/container/openejb-activemq4/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-activemq4/pom.xml?rev=1004827&r1=1004826&r2=1004827&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-activemq4/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-activemq4/pom.xml Tue Oct  5 22:05:19 2010
@@ -174,6 +174,16 @@
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-core</artifactId>
       <version>4.1.1</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>backport-util-concurrent</artifactId>
+          <groupId>backport-util-concurrent</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <artifactId>backport-util-concurrent</artifactId>
+      <groupId>backport-util-concurrent</groupId>
     </dependency>
 		<!-- End ActiveMQ -->
     <dependency>

Modified: openejb/trunk/openejb3/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/pom.xml?rev=1004827&r1=1004826&r2=1004827&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-core/pom.xml Tue Oct  5 22:05:19 2010
@@ -752,7 +752,7 @@
                       <groupId>commons-collections</groupId>
                       <artifactId>commons-collections</artifactId>
                       <overWrite>true</overWrite>
-                      <version>2.1</version>
+                      <version>3.2.1</version>
                       <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
                     </artifactItem>
                                 <!-- commons-beanutils -->
@@ -776,7 +776,7 @@
                       <groupId>xml-apis</groupId>
                       <artifactId>xml-apis</artifactId>
                       <overWrite>true</overWrite>
-                      <version>1.0.b2</version>
+                      <version>1.3.04</version>
                       <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
                     </artifactItem>
                   </artifactItems>

Modified: openejb/trunk/openejb3/container/openejb-jee/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/pom.xml?rev=1004827&r1=1004826&r2=1004827&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-jee/pom.xml Tue Oct  5 22:05:19 2010
@@ -88,7 +88,7 @@
       <version>4.0.8</version>
       <exclusions>
         <exclusion>
-          <groupId>stax</groupId>
+          <groupId>javax.xml.stream</groupId>
           <artifactId>stax-api</artifactId>
         </exclusion>
       </exclusions>

Modified: openejb/trunk/openejb3/container/openejb-osgi-core/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-osgi-core/pom.xml?rev=1004827&r1=1004826&r2=1004827&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-osgi-core/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-osgi-core/pom.xml Tue Oct  5 22:05:19 2010
@@ -27,7 +27,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-osgi-core</artifactId>
   <packaging>bundle</packaging>
-  <name>OpenEJB :: Container :: Core :: OSGi</name>
+  <name>OpenEJB :: Container :: OSGi :: Core</name>
   <properties>
     <openejb.osgi.export>
         org.apache.openejb.osgi.core;version=${openejb.osgi.export.version}

Modified: openejb/trunk/openejb3/container/openejb-osgi/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-osgi/pom.xml?rev=1004827&r1=1004826&r2=1004827&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-osgi/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-osgi/pom.xml Tue Oct  5 22:05:19 2010
@@ -27,7 +27,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-core-osgi</artifactId>
   <packaging>bundle</packaging>
-  <name>OpenEJB :: Container :: Core :: OSGi</name>
+  <name>OpenEJB :: Container :: OSGi</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>

Modified: openejb/trunk/openejb3/examples/jpa-hibernate/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/jpa-hibernate/pom.xml?rev=1004827&r1=1004826&r2=1004827&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/jpa-hibernate/pom.xml (original)
+++ openejb/trunk/openejb3/examples/jpa-hibernate/pom.xml Tue Oct  5 22:05:19 2010
@@ -125,6 +125,12 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
       <version>1.6.1</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>slf4j-api</artifactId>
+          <groupId>org.slf4j</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>log4j</groupId>

Modified: openejb/trunk/openejb3/examples/webapps/jsf/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webapps/jsf/pom.xml?rev=1004827&r1=1004826&r2=1004827&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webapps/jsf/pom.xml (original)
+++ openejb/trunk/openejb3/examples/webapps/jsf/pom.xml Tue Oct  5 22:05:19 2010
@@ -89,6 +89,10 @@
           <groupId>javax.servlet</groupId>
           <artifactId>jstl</artifactId>
         </exclusion>
+        <exclusion>
+          <artifactId>xmlParserAPIs</artifactId>
+          <groupId>xml-apis</groupId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>

Modified: openejb/trunk/openejb3/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/pom.xml?rev=1004827&r1=1004826&r2=1004827&view=diff
==============================================================================
--- openejb/trunk/openejb3/pom.xml (original)
+++ openejb/trunk/openejb3/pom.xml Tue Oct  5 22:05:19 2010
@@ -727,6 +727,16 @@
         </exclusions>
       </dependency>
       <dependency>
+        <groupId>xalan</groupId>
+        <artifactId>xalan</artifactId>
+        <version>2.7.1</version>
+      </dependency>
+      <dependency>
+        <groupId>javax.xml.stream</groupId>
+        <artifactId>stax-api</artifactId>
+        <version>1.0-2</version>
+      </dependency>
+      <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-beans</artifactId>
         <version>${org.springframework.version}</version>
@@ -964,13 +974,38 @@
       <dependency>
         <groupId>xml-apis</groupId>
         <artifactId>xml-apis</artifactId>
-        <version>2.0.2</version>
+        <version>1.3.04</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.neethi</groupId>
         <artifactId>neethi</artifactId>
         <version>2.0.4</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.apache.ws.commons.axiom</groupId>
+            <artifactId>axiom-impl</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.ws.commons.axiom</groupId>
+            <artifactId>axiom-api</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <artifactId>backport-util-concurrent</artifactId>
+        <groupId>backport-util-concurrent</groupId>
+        <version>3.1</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.ws.commons.axiom</groupId>
+        <artifactId>axiom-api</artifactId>
+        <version>1.2.9</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.ws.commons.axiom</groupId>
+        <artifactId>axiom-impl</artifactId>
+        <version>1.2.9</version>
       </dependency>
       <dependency>
         <groupId>xerces</groupId>
@@ -998,6 +1033,10 @@
         <version>1.6.1</version>
         <exclusions>
           <exclusion>
+            <artifactId>slf4j-api</artifactId>
+            <groupId>org.slf4j</groupId>
+          </exclusion>
+          <exclusion>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
           </exclusion>
@@ -1014,6 +1053,26 @@
         <version>3.2.1</version>
       </dependency>
       <dependency>
+        <groupId>commons-codec</groupId>
+        <artifactId>commons-codec</artifactId>
+        <version>1.4</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-fileupload</groupId>
+        <artifactId>commons-fileupload</artifactId>
+        <version>1.2.2</version>
+      </dependency>
+      <dependency>
+        <groupId>regexp</groupId>
+        <artifactId>regexp</artifactId>
+        <version>1.3</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-discovery</groupId>
+        <artifactId>commons-discovery</artifactId>
+        <version>0.4</version>
+      </dependency>
+      <dependency>
         <groupId>org.apache.openwebbeans</groupId>
         <artifactId>openwebbeans-impl</artifactId>
         <version>${org.apache.openwebbeans.version}</version>
@@ -1115,7 +1174,17 @@
       <dependency>
         <artifactId>commons-lang</artifactId>
         <groupId>commons-lang</groupId>
-        <version>2.1</version>
+        <version>2.5</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-io</groupId>
+        <artifactId>commons-io</artifactId>
+        <version>1.4</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.ws.commons.schema</groupId>
+        <artifactId>XmlSchema</artifactId>
+        <version>1.4.6</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

Modified: openejb/trunk/openejb3/server/openejb-axis/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-axis/pom.xml?rev=1004827&r1=1004826&r2=1004827&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-axis/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-axis/pom.xml Tue Oct  5 22:05:19 2010
@@ -70,7 +70,6 @@
     <dependency>
       <groupId>org.apache.ws.commons.schema</groupId>
       <artifactId>XmlSchema</artifactId>
-      <version>1.3.1</version>
     </dependency>
   </dependencies>
 </project>

Modified: openejb/trunk/openejb3/server/openejb-axis2/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-axis2/pom.xml?rev=1004827&r1=1004826&r2=1004827&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-axis2/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-axis2/pom.xml Tue Oct  5 22:05:19 2010
@@ -83,32 +83,18 @@
     <dependency>
       <groupId>org.apache.ws.commons.axiom</groupId>
       <artifactId>axiom-api</artifactId>
-      <version>1.2.9</version>
     </dependency>
     <dependency>
       <groupId>org.apache.ws.commons.axiom</groupId>
       <artifactId>axiom-impl</artifactId>
-      <version>1.2.9</version>
     </dependency>
     <dependency>
       <groupId>org.apache.ws.commons.schema</groupId>
       <artifactId>XmlSchema</artifactId>
-      <version>1.4.6</version>
     </dependency>
     <dependency>
       <groupId>org.apache.neethi</groupId>
       <artifactId>neethi</artifactId>
-      <version>2.0.4</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.ws.commons.axiom</groupId>
-          <artifactId>axiom-impl</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.ws.commons.axiom</groupId>
-          <artifactId>axiom-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>commons-httpclient</groupId>
@@ -118,7 +104,6 @@
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
-      <version>1.4</version>
     </dependency>
     <dependency>
       <groupId>org.apache.xmlbeans</groupId>

Modified: openejb/trunk/openejb3/server/openejb-webadmin/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-webadmin/pom.xml?rev=1004827&r1=1004826&r2=1004827&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-webadmin/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-webadmin/pom.xml Tue Oct  5 22:05:19 2010
@@ -106,12 +106,10 @@
     <dependency>
       <groupId>commons-fileupload</groupId>
       <artifactId>commons-fileupload</artifactId>
-      <version>1.2</version>
     </dependency>
     <dependency>
       <groupId>regexp</groupId>
       <artifactId>regexp</artifactId>
-      <version>1.3</version>
     </dependency>
     <dependency>
       <groupId>idb</groupId>

Modified: openejb/trunk/openejb3/server/openejb-webservices/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-webservices/pom.xml?rev=1004827&r1=1004826&r2=1004827&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-webservices/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-webservices/pom.xml Tue Oct  5 22:05:19 2010
@@ -76,7 +76,7 @@
     <dependency>
       <groupId>com.sun.xml.messaging.saaj</groupId>
       <artifactId>saaj-impl</artifactId>
-      <version>1.3</version>
+      <version>1.3.2</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>



Mime
View raw message