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 2014/10/10 15:55:00 UTC
svn commit: r1630894 - in /tomee/tomee/trunk: ./
arquillian/arquillian-tomee-moviefun-example/src/main/webapp/
arquillian/arquillian-tomee-moviefun-example/src/main/webapp/WEB-INF/
container/openejb-core/src/main/java/org/apache/openejb/ examples/appli...
Author: andygumbrecht
Date: Fri Oct 10 13:55:00 2014
New Revision: 1630894
URL: http://svn.apache.org/r1630894
Log:
Versions
Ignores
Modified:
tomee/tomee/trunk/arquillian/arquillian-tomee-moviefun-example/src/main/webapp/ (props changed)
tomee/tomee/trunk/arquillian/arquillian-tomee-moviefun-example/src/main/webapp/WEB-INF/ (props changed)
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java
tomee/tomee/trunk/examples/applicationcomposer-jaxws-cdi/ (props changed)
tomee/tomee/trunk/examples/arquillian-jpa/ (props changed)
tomee/tomee/trunk/pom.xml
Propchange: tomee/tomee/trunk/arquillian/arquillian-tomee-moviefun-example/src/main/webapp/
------------------------------------------------------------------------------
--- svn:global-ignores (added)
+++ svn:global-ignores Fri Oct 10 13:55:00 2014
@@ -0,0 +1 @@
+index.jsp.bak
Propchange: tomee/tomee/trunk/arquillian/arquillian-tomee-moviefun-example/src/main/webapp/WEB-INF/
------------------------------------------------------------------------------
--- svn:global-ignores (added)
+++ svn:global-ignores Fri Oct 10 13:55:00 2014
@@ -0,0 +1 @@
+moviefun.jsp.bak
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java?rev=1630894&r1=1630893&r2=1630894&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java Fri Oct 10 13:55:00 2014
@@ -574,7 +574,7 @@ public final class OpenEjbContainer exte
private static boolean isOtherProvider(final Map<?, ?> properties) {
final Object provider = properties.get(EJBContainer.PROVIDER);
return provider != null && !provider.equals(OpenEjbContainer.class) && !provider.equals(OpenEjbContainer.class.getName())
- && !"openejb".equals(provider);
+ && !"openejb".equals(provider);
}
private boolean match(final String s, final File file) {
Propchange: tomee/tomee/trunk/examples/applicationcomposer-jaxws-cdi/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Oct 10 13:55:00 2014
@@ -1 +1,2 @@
*.iml
+target
Propchange: tomee/tomee/trunk/examples/arquillian-jpa/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Oct 10 13:55:00 2014
@@ -0,0 +1 @@
+*.iml
Modified: tomee/tomee/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1630894&r1=1630893&r2=1630894&view=diff
==============================================================================
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Fri Oct 10 13:55:00 2014
@@ -220,7 +220,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
+ <version>2.7</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -230,12 +230,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
+ <version>2.9</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
- <version>2.8</version>
+ <version>2.9.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -260,7 +260,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
</plugin>
<plugin>
<groupId>org.codehaus.swizzle</groupId>
@@ -310,7 +310,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.5</version>
+ <version>2.5.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
@@ -1540,7 +1540,7 @@
<dependency>
<artifactId>xmlsec</artifactId>
<groupId>org.apache.santuario</groupId>
- <version>1.5.6</version>
+ <version>1.5.7</version>
</dependency>
<dependency>
<groupId>wsdl4j</groupId>
@@ -1838,7 +1838,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.8</version>
+ <version>1.8.1</version>
</dependency>
<dependency>
<artifactId>commons-lang3</artifactId>