You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2012/01/31 11:06:56 UTC
svn commit: r1238356 - in /openejb/trunk/openejb: ./
arquillian-tomee/arquillian-tomee-common/ container/openejb-core/
examples/cdi-events/ examples/simple-osgi/ osgi/openejb-core-osgi/
osgi/openejb-osgi-tests/ server/openejb-server/ tomee/apache-tomee...
Author: andygumbrecht
Date: Tue Jan 31 10:06:56 2012
New Revision: 1238356
URL: http://svn.apache.org/viewvc?rev=1238356&view=rev
Log:
Slf4j 1.6.4 - Fixes several synchronization issues.
Service should auto start.
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/pom.xml
openejb/trunk/openejb/container/openejb-core/pom.xml
openejb/trunk/openejb/examples/cdi-events/pom.xml
openejb/trunk/openejb/examples/simple-osgi/pom.xml
openejb/trunk/openejb/osgi/openejb-core-osgi/pom.xml
openejb/trunk/openejb/osgi/openejb-osgi-tests/pom.xml
openejb/trunk/openejb/pom.xml
openejb/trunk/openejb/server/openejb-server/pom.xml
openejb/trunk/openejb/tomee/apache-tomee/src/main/resources/service.bat
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/pom.xml?rev=1238356&r1=1238355&r2=1238356&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/pom.xml (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/pom.xml Tue Jan 31 10:06:56 2012
@@ -253,7 +253,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.1</version>
</dependency>
</dependencies>
Modified: openejb/trunk/openejb/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/pom.xml?rev=1238356&r1=1238355&r2=1238356&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/pom.xml (original)
+++ openejb/trunk/openejb/container/openejb-core/pom.xml Tue Jan 31 10:06:56 2012
@@ -210,7 +210,7 @@
org.quartz;resolution:=optional,
org.quartz.impl;resolution:=optional,
org.quartz.spi;resolution:=optional,
- org.slf4j;resolution:=optional;version="[1.6,2)",
+ org.slf4j;resolution:=optional;version="[1.6,4)",
org.w3c.dom,
org.w3c.dom.ls,
org.xml.sax,
Modified: openejb/trunk/openejb/examples/cdi-events/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/cdi-events/pom.xml?rev=1238356&r1=1238355&r2=1238356&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/cdi-events/pom.xml (original)
+++ openejb/trunk/openejb/examples/cdi-events/pom.xml Tue Jan 31 10:06:56 2012
@@ -77,13 +77,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
- <version>1.6.1</version>
+ <version>1.6.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.1</version>
+ <version>1.6.4</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: openejb/trunk/openejb/examples/simple-osgi/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/simple-osgi/pom.xml?rev=1238356&r1=1238355&r2=1238356&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/simple-osgi/pom.xml (original)
+++ openejb/trunk/openejb/examples/simple-osgi/pom.xml Tue Jan 31 10:06:56 2012
@@ -56,7 +56,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.5</version>
<extensions>true</extensions>
</plugin>
</plugins>
Modified: openejb/trunk/openejb/osgi/openejb-core-osgi/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/openejb-core-osgi/pom.xml?rev=1238356&r1=1238355&r2=1238356&view=diff
==============================================================================
--- openejb/trunk/openejb/osgi/openejb-core-osgi/pom.xml (original)
+++ openejb/trunk/openejb/osgi/openejb-core-osgi/pom.xml Tue Jan 31 10:06:56 2012
@@ -84,7 +84,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.1</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -294,7 +293,7 @@
org.quartz;resolution:=optional,
org.quartz.impl;resolution:=optional,
org.quartz.spi;resolution:=optional,
- org.slf4j;resolution:=optional;version="[1.6,2)",
+ org.slf4j;resolution:=optional;version="[1.6,4)",
org.w3c.dom,
org.w3c.dom.ls,
org.xml.sax,
Modified: openejb/trunk/openejb/osgi/openejb-osgi-tests/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/openejb-osgi-tests/pom.xml?rev=1238356&r1=1238355&r2=1238356&view=diff
==============================================================================
--- openejb/trunk/openejb/osgi/openejb-osgi-tests/pom.xml (original)
+++ openejb/trunk/openejb/osgi/openejb-osgi-tests/pom.xml Tue Jan 31 10:06:56 2012
@@ -45,7 +45,7 @@
<groupId>org.apache.karaf.tooling.exam</groupId>
<artifactId>org.apache.karaf.tooling.exam.container</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <scope>test</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf.shell</groupId>
Modified: openejb/trunk/openejb/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/pom.xml?rev=1238356&r1=1238355&r2=1238356&view=diff
==============================================================================
--- openejb/trunk/openejb/pom.xml (original)
+++ openejb/trunk/openejb/pom.xml Tue Jan 31 10:06:56 2012
@@ -83,12 +83,17 @@
</ciManagement>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/openejb/trunk/openejb3</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/openejb/trunk/openejb3</developerConnection>
- <url>https://svn.apache.org/repos/asf/openejb/trunk/openejb3</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/openejb/trunk/openejb</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/openejb/trunk/openejb</developerConnection>
+ <url>https://svn.apache.org/repos/asf/openejb/trunk/openejb</url>
</scm>
<properties>
+
+ <!-- Maven module versions -->
+ <maven-bundle-plugin.version>2.3.6</maven-bundle-plugin.version>
+ <!-- don't use 2.3.5 since there is an issue with private packages imports -->
+
<!-- This is used by a manifest classpath entry -->
<xbeanVersion>3.9</xbeanVersion>
@@ -131,7 +136,7 @@
<org.apache.activemq.version>5.5.1</org.apache.activemq.version>
<quartz.version>1.8.5</quartz.version>
<org.springframework.version>3.0.5.RELEASE</org.springframework.version>
- <junit.version>4.8.1</junit.version>
+ <junit.version>4.9</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.1.4-SNAPSHOT</org.apache.openwebbeans.version>
@@ -139,7 +144,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.2</myfaces.version>
- <slf4j.version>1.6.1</slf4j.version>
+ <slf4j.version>1.6.4</slf4j.version>
<log4j.version>1.2.16</log4j.version>
<osgi.framework.version>4.2.0</osgi.framework.version>
<hsqldb.version>2.2.4</hsqldb.version>
@@ -168,7 +173,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.1</version> <!-- don't use 2.3.5 since there is an issue with private packages imports -->
+ <version>${maven-bundle-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -242,7 +247,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.1</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -400,6 +404,18 @@
<!--<enabled>true</enabled>-->
<!--</snapshots>-->
<!--</repository>-->
+ <!-- Apache snapshots -->
+ <repository>
+ <id>apache-snapshots</id>
+ <name>Apache Snapshots Repository</name>
+ <url>http://repository.apache.org/content/groups/snapshots-group</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
<repository>
<id>JBoss Repository</id>
<url>https://repository.jboss.org/nexus/content/groups/public-jboss/</url>
@@ -1171,7 +1187,7 @@
<dependency>
<groupId>org.apache.ws.security</groupId>
<artifactId>wss4j</artifactId>
- <version>1.6.3</version>
+ <version>1.6.4</version>
</dependency>
<dependency>
<groupId>wsdl4j</groupId>
@@ -1224,7 +1240,7 @@
<dependency>
<groupId>org.apache.neethi</groupId>
<artifactId>neethi</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1</version>
<exclusions>
<exclusion>
<groupId>org.apache.ws.commons.axiom</groupId>
@@ -1244,12 +1260,12 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
- <version>1.2.11</version>
+ <version>1.2.12</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
- <version>1.2.11</version>
+ <version>1.2.12</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
@@ -1310,7 +1326,7 @@
<dependency>
<groupId>commons-discovery</groupId>
<artifactId>commons-discovery</artifactId>
- <version>0.4</version>
+ <version>${commons-discovery.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
@@ -1418,7 +1434,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>5.14.10</version>
+ <version>6.3.1</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -1449,7 +1465,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
+ <version>2.8</version>
<configuration>
<aggregate>true</aggregate>
<additionalJOption>-J-Xmx1024m</additionalJOption>
Modified: openejb/trunk/openejb/server/openejb-server/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-server/pom.xml?rev=1238356&r1=1238355&r2=1238356&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-server/pom.xml (original)
+++ openejb/trunk/openejb/server/openejb-server/pom.xml Tue Jan 31 10:06:56 2012
@@ -280,7 +280,7 @@
org.quartz;resolution:=optional,
org.quartz.impl;resolution:=optional,
org.quartz.spi;resolution:=optional,
- org.slf4j;version="[1.6,2)",
+ org.slf4j;version="[1.6,4)",
org.w3c.dom,
org.w3c.dom.ls,
org.xml.sax,
Modified: openejb/trunk/openejb/tomee/apache-tomee/src/main/resources/service.bat
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/apache-tomee/src/main/resources/service.bat?rev=1238356&r1=1238355&r2=1238356&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/apache-tomee/src/main/resources/service.bat (original)
+++ openejb/trunk/openejb/tomee/apache-tomee/src/main/resources/service.bat Tue Jan 31 10:06:56 2012
@@ -174,6 +174,7 @@ echo %EXECUTABLE% //IS//%SERVICE_NAME%
--StopClass org.apache.catalina.startup.Bootstrap ^
--StartParams start ^
--StopParams stop ^
+ --Startup auto ^
--LogLevel Info ^
--LogPrefix TomEE