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/13 19:46:11 UTC
svn commit: r1631480 - in /tomee/tomee/trunk:
assembly/openejb-standalone/pom.xml pom.xml tck/bval-tomee/pom.xml
tck/cdi-tomee-embedded/pom.xml tomee/apache-tomee/pom.xml
Author: andygumbrecht
Date: Mon Oct 13 17:46:10 2014
New Revision: 1631480
URL: http://svn.apache.org/r1631480
Log:
TOMEE-1407 - nonFilteredFileExtensions. Thanks Daniel Kasmeroglu
Plugin versions.
Modified:
tomee/tomee/trunk/assembly/openejb-standalone/pom.xml
tomee/tomee/trunk/pom.xml
tomee/tomee/trunk/tck/bval-tomee/pom.xml
tomee/tomee/trunk/tck/cdi-tomee-embedded/pom.xml
tomee/tomee/trunk/tomee/apache-tomee/pom.xml
Modified: tomee/tomee/trunk/assembly/openejb-standalone/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/assembly/openejb-standalone/pom.xml?rev=1631480&r1=1631479&r2=1631480&view=diff
==============================================================================
--- tomee/tomee/trunk/assembly/openejb-standalone/pom.xml (original)
+++ tomee/tomee/trunk/assembly/openejb-standalone/pom.xml Mon Oct 13 17:46:10 2014
@@ -64,6 +64,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <nonFilteredFileExtensions>
+ <nonFilteredFileExtension>exe</nonFilteredFileExtension>
+ </nonFilteredFileExtensions>
+ </configuration>
<executions>
<execution>
<id>filter-resources</id>
Modified: tomee/tomee/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1631480&r1=1631479&r2=1631480&view=diff
==============================================================================
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Mon Oct 13 17:46:10 2014
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>14</version>
+ <version>15</version>
</parent>
<groupId>org.apache.openejb</groupId>
@@ -101,7 +101,7 @@
<jcs.version>2.0-SNAPSHOT</jcs.version>
<!-- Maven module versions -->
- <maven-bundle-plugin.version>2.3.7</maven-bundle-plugin.version>
+ <maven-bundle-plugin.version>2.5.3</maven-bundle-plugin.version>
<!-- This is used by a manifest classpath entry -->
<xbeanVersion>4.0</xbeanVersion>
@@ -240,7 +240,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
+ <version>1.9.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -252,6 +252,11 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.17</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.17</version>
+ </plugin>
<plugin> <!-- maven-dependency-plugin:properties doesn't work as well as this one for us -->
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>geronimo-property-plugin</artifactId>
@@ -275,17 +280,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>3.1</version>
+ <version>3.2</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
- <version>1.5</version>
+ <version>1.6</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -295,7 +300,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4.1</version>
</plugin>
<plugin>
<groupId>com.googlecode.jslint4java</groupId>
@@ -305,7 +310,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.12.1</version>
+ <version>2.13</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: tomee/tomee/trunk/tck/bval-tomee/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tck/bval-tomee/pom.xml?rev=1631480&r1=1631479&r2=1631480&view=diff
==============================================================================
--- tomee/tomee/trunk/tck/bval-tomee/pom.xml (original)
+++ tomee/tomee/trunk/tck/bval-tomee/pom.xml Mon Oct 13 17:46:10 2014
@@ -121,7 +121,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.17</version>
<configuration>
<useFile>false</useFile>
<disableXmlReport>true</disableXmlReport>
@@ -132,7 +131,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
<executions>
<execution>
<id>copy-tck-test-suite-file</id>
@@ -158,7 +156,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.13</version>
<executions>
<execution>
<id>integration-test</id>
Modified: tomee/tomee/trunk/tck/cdi-tomee-embedded/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tck/cdi-tomee-embedded/pom.xml?rev=1631480&r1=1631479&r2=1631480&view=diff
==============================================================================
--- tomee/tomee/trunk/tck/cdi-tomee-embedded/pom.xml (original)
+++ tomee/tomee/trunk/tck/cdi-tomee-embedded/pom.xml Mon Oct 13 17:46:10 2014
@@ -15,7 +15,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>tck</artifactId>
<groupId>org.apache.openejb</groupId>
@@ -70,20 +71,20 @@
</resource>
</resources>
<plugins>
-
- <plugin>
+
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <useFile>false</useFile>
- <disableXmlReport>true</disableXmlReport>
+ <useFile>false</useFile>
+ <disableXmlReport>true</disableXmlReport>
</configuration>
</plugin>
-
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <executions>
+ <executions>
<execution>
<id>reserve-network-port</id>
<phase>pre-integration-test</phase>
@@ -101,7 +102,7 @@
</execution>
</executions>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -131,11 +132,10 @@
</execution>
</executions>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.17</version>
<configuration>
<argLine>-Xmx768m -XX:PermSize=64m -XX:MaxPermSize=512m -XX:ReservedCodeCacheSize=64m -Xss2048k</argLine>
<suiteXmlFiles>
@@ -145,11 +145,13 @@
<org.jboss.testharness.standalone>false</org.jboss.testharness.standalone>
<org.jboss.testharness.runIntegrationTests>true</org.jboss.testharness.runIntegrationTests>
<org.jboss.testharness.container.forceRestart>true</org.jboss.testharness.container.forceRestart>
- <org.jboss.testharness.libraryDirectory>${project.build.directory}/dependency/lib</org.jboss.testharness.libraryDirectory>
+ <org.jboss.testharness.libraryDirectory>${project.build.directory}/dependency/lib
+ </org.jboss.testharness.libraryDirectory>
<deleteArtifacts>true</deleteArtifacts>
<!--<maven.failsafe.debug>true</maven.failsafe.debug>-->
- <java.opts>-Xmx768m -XX:PermSize=64m -XX:MaxPermSize=512m -XX:ReservedCodeCacheSize=64m -Xss2048k</java.opts>
+ <java.opts>-Xmx768m -XX:PermSize=64m -XX:MaxPermSize=512m -XX:ReservedCodeCacheSize=64m -Xss2048k
+ </java.opts>
</systemPropertyVariables>
</configuration>
<executions>
Modified: tomee/tomee/trunk/tomee/apache-tomee/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/apache-tomee/pom.xml?rev=1631480&r1=1631479&r2=1631480&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/apache-tomee/pom.xml (original)
+++ tomee/tomee/trunk/tomee/apache-tomee/pom.xml Mon Oct 13 17:46:10 2014
@@ -154,6 +154,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <nonFilteredFileExtensions>
+ <nonFilteredFileExtension>exe</nonFilteredFileExtension>
+ </nonFilteredFileExtensions>
+ </configuration>
<executions>
<execution>
<id>filter-resources</id>