tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andygumbre...@apache.org
Subject svn commit: r1514285 - in /tomee/tomee/trunk: assembly/openejb-lite/pom.xml pom.xml
Date Thu, 15 Aug 2013 14:17:29 GMT
Author: andygumbrecht
Date: Thu Aug 15 14:17:28 2013
New Revision: 1514285

URL: http://svn.apache.org/r1514285
Log:
Should not include slf4j binding in openejb-lite

Modified:
    tomee/tomee/trunk/assembly/openejb-lite/pom.xml
    tomee/tomee/trunk/pom.xml

Modified: tomee/tomee/trunk/assembly/openejb-lite/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/assembly/openejb-lite/pom.xml?rev=1514285&r1=1514284&r2=1514285&view=diff
==============================================================================
--- tomee/tomee/trunk/assembly/openejb-lite/pom.xml (original)
+++ tomee/tomee/trunk/assembly/openejb-lite/pom.xml Thu Aug 15 14:17:28 2013
@@ -35,7 +35,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>1.4</version>
+        <version>2.0</version>
         <executions>
           <execution>
             <id>lite</id>
@@ -84,6 +84,10 @@
           <groupId>org.apache.activemq</groupId>
           <artifactId>activemq-ra</artifactId>
         </exclusion>
+        <exclusion>
+          <artifactId>slf4j-jdk14</artifactId>
+          <groupId>org.slf4j</groupId>
+        </exclusion>
       </exclusions>
     </dependency>
   </dependencies>

Modified: tomee/tomee/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1514285&r1=1514284&r2=1514285&view=diff
==============================================================================
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Thu Aug 15 14:17:28 2013
@@ -92,6 +92,9 @@
 
     <openejb.version>4.6.0-SNAPSHOT</openejb.version>
     <tomee.version>1.6.0-SNAPSHOT</tomee.version>
+	
+	<openjpa.version>2.3.0-SNAPSHOT</openjpa.version>
+	<org.apache.openwebbeans.version>1.2.1-SNAPSHOT</org.apache.openwebbeans.version>
 
     <!-- Maven module versions -->
     <maven-bundle-plugin.version>2.3.7</maven-bundle-plugin.version>
@@ -144,8 +147,7 @@
     <org.springframework.version>3.1.3.RELEASE</org.springframework.version>
     <junit.version>4.11</junit.version>
     <org.apache.axis2.version>1.4.1</org.apache.axis2.version>
-    <scannotation.version>1.0.2</scannotation.version>
-    <org.apache.openwebbeans.version>1.2.1-SNAPSHOT</org.apache.openwebbeans.version>
+    <scannotation.version>1.0.2</scannotation.version>    
     <geronimo.connector.version>3.1.1</geronimo.connector.version>
     <geronimo-osgi.version>1.1</geronimo-osgi.version>
     <geronimo-javamail_1.4_spec.version>1.7.1</geronimo-javamail_1.4_spec.version>
@@ -153,8 +155,7 @@
     <slf4j.version>1.7.5</slf4j.version>
     <log4j.version>1.2.17</log4j.version>
     <osgi.framework.version>4.2.0</osgi.framework.version>
-    <hsqldb.version>2.2.8</hsqldb.version>
-    <openjpa.version>2.3.0-SNAPSHOT</openjpa.version>
+    <hsqldb.version>2.2.8</hsqldb.version>    
 
     <!-- Apache Commons -->
     <commons-beanutils.version>1.8.3</commons-beanutils.version>



Mime
View raw message