You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2014/02/09 18:04:42 UTC
svn commit: r1566317 - in /tomee/tomee/trunk: pom.xml
tomee/tomee-webaccess/pom.xml
Author: tveronezi
Date: Sun Feb 9 17:04:42 2014
New Revision: 1566317
URL: http://svn.apache.org/r1566317
Log:
Use variables defined by the parent pom.
Modified:
tomee/tomee/trunk/pom.xml
tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml
Modified: tomee/tomee/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1566317&r1=1566316&r2=1566317&view=diff
==============================================================================
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Sun Feb 9 17:04:42 2014
@@ -154,7 +154,7 @@
<commons-discovery.version>0.5</commons-discovery.version>
<commons-lang3.version>3.1</commons-lang3.version>
<commons-lang.version>2.6</commons-lang.version>
- <commons-io.version>1.4</commons-io.version>
+ <commons-io.version>2.0.1</commons-io.version>
<commons-net.version>3.2</commons-net.version>
<bval.version>0.5</bval.version>
@@ -177,6 +177,10 @@
<version.xalan>2.7.1</version.xalan>
<version.hibernate>4.2.8.Final</version.hibernate>
<version.eclipselink>2.4.2</version.eclipselink>
+
+ <!-- arquillian related -->
+ <version.arquillian.bom>1.1.2.Final</version.arquillian.bom>
+ <version.shrinkwrap.resolver.bom>2.0.1</version.shrinkwrap.resolver.bom>
</properties>
<build>
@@ -274,6 +278,11 @@
<artifactId>jslint4java-maven-plugin</artifactId>
<version>2.0.5</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <version>1.4</version>
+ </plugin>
</plugins>
</pluginManagement>
Modified: tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml?rev=1566317&r1=1566316&r2=1566317&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml Sun Feb 9 17:04:42 2014
@@ -21,15 +21,10 @@
<version>1.6.1-SNAPSHOT</version>
</parent>
<artifactId>tomee-webaccess</artifactId>
- <version>1.6.1-SNAPSHOT</version>
<packaging>war</packaging>
<name>OpenEJB :: TomEE :: webaccess</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>1.6.1-SNAPSHOT</tomee.version>
- <openejb.version>4.6.1-SNAPSHOT</openejb.version>
- <javaee.api>6.0-5</javaee.api>
- <junit.version>4.10</junit.version>
</properties>
<profiles>
<profile>
@@ -39,31 +34,19 @@
</activation>
</profile>
</profiles>
- <repositories>
- <repository>
- <id>sonatype.oss.releases</id>
- <url>https://oss.sonatype.org/content/repositories/releases</url>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>sonatype.oss.releases</id>
- <url>https://oss.sonatype.org/content/repositories/releases</url>
- </pluginRepository>
- </pluginRepositories>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-bom</artifactId>
- <version>2.0.1</version>
+ <version>${version.shrinkwrap.resolver.bom}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
- <version>1.1.2.Final</version>
+ <version>${version.arquillian.bom}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
@@ -79,7 +62,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-embedded</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -91,7 +74,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>arquillian-tomee-embedded</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -103,19 +86,19 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-webservices</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>ziplock</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.0.1</version>
+ <version>${commons-io.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -181,7 +164,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.7</version>
+ <version>${commons-codec.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
@@ -198,7 +181,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>${javaee.api}</version>
+ <version>${javaee-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -212,7 +195,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.16</version>
<configuration>
<systemPropertyVariables>
<arquillian.tomee.path>${project.basedir}/target/arquillian-tomee</arquillian.tomee.path>
@@ -223,7 +205,6 @@
<plugin>
<groupId>com.googlecode.jslint4java</groupId>
<artifactId>jslint4java-maven-plugin</artifactId>
- <version>2.0.5</version>
<configuration>
<failOnError>true</failOnError>
<options>
@@ -248,7 +229,6 @@
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
- <version>1.4</version>
<configuration>
<providerSelection>2.0</providerSelection>
</configuration>