Author: andygumbrecht
Date: Wed May 15 13:31:58 2013
New Revision: 1482826
URL: http://svn.apache.org/r1482826
Log:
openejb profile
jettison 1.3.3
slf4j 1.7.5
Standalone OpenEJB outputFileNameMapping
Modified:
tomee/tomee/trunk/assembly/openejb-standalone/src/main/assembly/bin.xml
tomee/tomee/trunk/examples/polling-parent/pom.xml
tomee/tomee/trunk/pom.xml
tomee/tomee/trunk/server/openejb-cxf-rs/pom.xml
Modified:
tomee/tomee/trunk/assembly/openejb-standalone/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/assembly/openejb-standalone/src/main/assembly/bin.xml?rev=1482826&r1=1482825&r2=1482826&view=diff
==============================================================================
--- tomee/tomee/trunk/assembly/openejb-standalone/src/main/assembly/bin.xml
(original)
+++ tomee/tomee/trunk/assembly/openejb-standalone/src/main/assembly/bin.xml Wed
May 15 13:31:58 2013
@@ -104,7 +104,7 @@
</files>
<dependencySets>
<dependencySet>
-
<!--<outputFileNameMapping>${artifactId}-${version}.${format}</outputFileNameMapping>-->
+
<outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension}</outputFileNameMapping>
<outputDirectory>lib</outputDirectory>
<scope>runtime</scope>
<excludes>
Modified: tomee/tomee/trunk/examples/polling-parent/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/polling-parent/pom.xml?rev=1482826&r1=1482825&r2=1482826&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/polling-parent/pom.xml (original)
+++ tomee/tomee/trunk/examples/polling-parent/pom.xml Wed May 15 13:31:58 2013
@@ -158,7 +158,7 @@
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.3.1</version>
+ <version>1.3.3</version>
</dependency>
</dependencies>
</dependencyManagement>
Modified: tomee/tomee/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1482826&r1=1482825&r2=1482826&view=diff
==============================================================================
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Wed May 15 13:31:58 2013
@@ -148,7 +148,7 @@
<geronimo-osgi.version>1.1</geronimo-osgi.version>
<geronimo-javamail_1.4_spec.version>1.7.1</geronimo-javamail_1.4_spec.version>
<myfaces.version>2.1.11</myfaces.version>
- <slf4j.version>1.7.2</slf4j.version>
+ <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>
@@ -351,6 +351,16 @@
<module>tomee</module>
</modules>
</profile>
+ <profile>
+ <id>openejb</id>
+ <modules>
+ <module>deps</module>
+ <module>itests</module>
+ <module>container</module>
+ <module>server</module>
+ <module>assembly</module>
+ </modules>
+ </profile>
<profile>
<id>style</id>
<modules>
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/pom.xml?rev=1482826&r1=1482825&r2=1482826&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/pom.xml (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/pom.xml Wed May 15 13:31:58 2013
@@ -116,7 +116,7 @@
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.3</version>
+ <version>1.3.3</version>
</dependency>
</dependencies>
