Author: aheritier
Date: 2009-08-28 16:02:13 -0400 (Fri, 28 Aug 2009)
New Revision: 113
Modified:
parent/trunk/pom.xml
Log:
Fix conflicts in plugins settings due to inheritence with jboss-parent
Modified: parent/trunk/pom.xml
===================================================================
--- parent/trunk/pom.xml 2009-08-28 17:44:05 UTC (rev 112)
+++ parent/trunk/pom.xml 2009-08-28 20:02:13 UTC (rev 113)
@@ -127,11 +127,6 @@
<maven.compiler.optimize>true</maven.compiler.optimize>
<maven.compiler.source>1.5</maven.compiler.source>
<maven.compiler.target>1.5</maven.compiler.target>
-
- <!-- Default release Settings -->
- <useReleaseProfile>false</useReleaseProfile>
- <arguments>-Prelease -Dmaven.test.skip=true</arguments>
- <autoVersionSubmodules>true</autoVersionSubmodules>
<!-- Encoding used for files in the project -->
<!-- Standard property supported by many plugins : compiler, resources, ...
-->
@@ -147,6 +142,7 @@
<ear.plugin.version>2.3.2</ear.plugin.version>
<enforcer.plugin.version>1.0-beta-1</enforcer.plugin.version>
<install.plugin.version>2.3</install.plugin.version>
+ <jar.plugin.version>2.2</jar.plugin.version>
<javacc.plugin.version>2.5</javacc.plugin.version>
<javadoc.plugin.version>2.6</javadoc.plugin.version>
<jaxb2.plugin.version>0.1</jaxb2.plugin.version>
@@ -199,8 +195,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <!-- Version from JBoss -->
+ <version>${jar.plugin.version}</version>
<configuration>
+ <configuration>
+ <source>${maven.compiler.source}</source>
+ <target>${maven.compiler.target}</target>
+ </configuration>
<archive>
<!-- Manifest management -->
<manifestEntries>
@@ -219,6 +219,13 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>${release.plugin.version}</version>
+ <!-- We can use properties to set it because
+ config is already set in jboss-parent -->
+ <configuration>
+ <useReleaseProfile>false</useReleaseProfile>
+ <arguments>-Prelease -Dmaven.test.skip=true</arguments>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Show replies by date