Author: andygumbrecht
Date: Fri Oct 10 05:17:47 2014
New Revision: 1630644
URL: http://svn.apache.org/r1630644
Log:
TOMEE-1391 - Use maven-filtering:1.2 to fix MSHARED-319
Modified:
tomee/tomee/branches/tomee-1.7.x/pom.xml
tomee/tomee/branches/tomee-1.7.x/tomee/apache-tomee/ (props changed)
Modified: tomee/tomee/branches/tomee-1.7.x/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/pom.xml?rev=1630644&r1=1630643&r2=1630644&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.7.x/pom.xml Fri Oct 10 05:17:47 2014
@@ -309,6 +309,18 @@
<artifactId>maven-doap-plugin</artifactId>
<version>1.1</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.5</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-filtering</artifactId>
+ <version>1.2</version>
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
</pluginManagement>
@@ -621,7 +633,7 @@
</plugin>
</plugins>
</build>
-
+
<repositories>
<repository>
<releases>
@@ -631,7 +643,7 @@
<url>http://snapshots.repository.codehaus.org/</url>
</repository>
</repositories>
-
+
<pluginRepositories>
<pluginRepository>
<releases>
@@ -642,7 +654,7 @@
</pluginRepository>
</pluginRepositories>
</profile>
-
+
<profile>
<id>rat</id>
<modules>
@@ -2041,7 +2053,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9</version>
+ <version>2.10.1</version>
<configuration>
<aggregate>true</aggregate>
<additionalJOption>-J-Xmx1024m</additionalJOption>
Propchange: tomee/tomee/branches/tomee-1.7.x/tomee/apache-tomee/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Oct 10 05:17:47 2014
@@ -7,3 +7,4 @@
.settings
out
target
+.idea
