[exo-jcr-commits] exo-jcr SVN: r1732 - parent/trunk.

Author: aheritier Date: 2010-02-08 11:15:48 -0500 (Mon, 08 Feb 2010) New Revision: 1732 Modified: parent/trunk/pom.xml Log: EXOJCR-454 : Remove duplicated settings with jboss parent upgrade Modified: parent/trunk/pom.xml =================================================================== --- parent/trunk/pom.xml 2010-02-08 15:49:38 UTC (rev 1731) +++ parent/trunk/pom.xml 2010-02-08 16:15:48 UTC (rev 1732) @@ -137,8 +137,17 @@ <!-- Will be an entry in the POM in the future --> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <!-- maven-release-plugin settings --> + <arguments>-Prelease -DskipTests</arguments> + <autoVersionSubmodules>true</autoVersionSubmodules> + <!-- Plugins versions are defined in properties to reuse them between build and reporting parts if necessary --> - <animalsniffer.plugin.version>1.2</animalsniffer.plugin.version> + <version.animalsniffer.plugin>1.2</version.animalsniffer.plugin> + <jibx.plugin.version>1.2.1</jibx.plugin.version> + <javacc.plugin.version>2.5</javacc.plugin.version> + <jaxb2.plugin.version>0.1</jaxb2.plugin.version> + + <!-- <assembly.plugin.version>2.2-beta-4</assembly.plugin.version> <buildnumber.plugin.version>1.0-beta-3</buildnumber.plugin.version> <clean.plugin.version>2.3</clean.plugin.version> @@ -148,10 +157,7 @@ <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> - <jibx.plugin.version>1.2.1</jibx.plugin.version> <project.info.reports.plugin.version>2.1.2</project.info.reports.plugin.version> <release.plugin.version>2.0-beta-9</release.plugin.version> <site.plugin.version>2.0.1</site.plugin.version> @@ -159,6 +165,7 @@ <surefire.report.plugin.version>2.4.3</surefire.report.plugin.version> <taglist.plugin.version>2.3</taglist.plugin.version> <war.plugin.version>2.1-beta-1</war.plugin.version> + --> </properties> <dependencyManagement> @@ -179,40 +186,18 @@ <plugin> <groupId>org.jvnet</groupId> <artifactId>animal-sniffer</artifactId> - <version>${animalsniffer.plugin.version}</version> + <version>${version.animalsniffer.plugin}</version> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clean-plugin</artifactId> - <version>${clean.plugin.version}</version> + <groupId>org.jibx</groupId> + <artifactId>maven-jibx-plugin</artifactId> + <version>${jibx.plugin.version}</version> </plugin> - <!-- Compilation Plugin Configuration --> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>${compiler.plugin.version}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>${enforcer.plugin.version}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-install-plugin</artifactId> - <version>${install.plugin.version}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>${jar.plugin.version}</version> <configuration> - <configuration> - <source>${maven.compiler.source}</source> - <target>${maven.compiler.target}</target> - </configuration> <archive> - <!-- Manifest management --> <manifestEntries> <SCM-URL>${project.scm.connection}</SCM-URL> <Specification-Title>${exo.product.name}</Specification-Title> @@ -226,35 +211,18 @@ </configuration> </plugin> <plugin> - <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> + <groupId>org.codehaus.mojo</groupId> + <artifactId>javacc-maven-plugin</artifactId> + <version>${javacc.plugin.version}</version> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <version>${site.plugin.version}</version> + <groupId>org.jvnet.jaxb2.maven2</groupId> + <artifactId>maven-jaxb2-plugin</artifactId> + <version>${jaxb2.plugin.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <!-- Version from JBoss --> - <configuration> - <!-- This is a workaroud for MSOURCES-44 --> - <includePom>true</includePom> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>${surefire.plugin.version}</version> <configuration> <includes> <include>**/${exo.test.includes}.java</include> @@ -264,7 +232,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <version>${war.plugin.version}</version> <configuration> <archive> <manifestEntries> @@ -279,51 +246,6 @@ </archive> </configuration> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>buildnumber-maven-plugin</artifactId> - <version>${buildnumber.plugin.version}</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>javacc-maven-plugin</artifactId> - <version>${javacc.plugin.version}</version> - </plugin> - <plugin> - <groupId>org.jibx</groupId> - <artifactId>maven-jibx-plugin</artifactId> - <version>${jibx.plugin.version}</version> - </plugin> - <plugin> - <groupId>org.jvnet.jaxb2.maven2</groupId> - <artifactId>maven-jaxb2-plugin</artifactId> - <version>${jaxb2.plugin.version}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>${checkstyle.plugin.version}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>${javadoc.plugin.version}</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>taglist-maven-plugin</artifactId> - <version>${taglist.plugin.version}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-ear-plugin</artifactId> - <version>${ear.plugin.version}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>${assembly.plugin.version}</version> - </plugin> </plugins> </pluginManagement> </build>