Author: closettop_nightlybuild Date: 2012-05-29 20:46:17-0700 New Revision: 19885
Modified: trunk/tools/maven/parentpom.xml Log: Specified versions of plugins explicitly. Maven 3 is moving in this direction. Also refactored to parentpom to write the compiler version fewer times. Submitted-by: Linus Tolke Change-Id: I0f97f5bbce5b2ca43a6647b00030fd13587b09e6 Modified: trunk/tools/maven/parentpom.xml Url: http://argouml.tigris.org/source/browse/argouml/trunk/tools/maven/parentpom.xml?view=diff&pathrev=19885&r1=19884&r2=19885 ============================================================================== --- trunk/tools/maven/parentpom.xml (original) +++ trunk/tools/maven/parentpom.xml 2012-05-29 20:46:17-0700 @@ -4,6 +4,9 @@ <modelVersion>4.0.0</modelVersion> <!-- Experimenting with maven for the nightly build. --> + <prerequisites> + <maven>2.0.6</maven> + </prerequisites> <parent> <groupId>org.sonatype.oss</groupId> @@ -18,7 +21,7 @@ included in the automatic updates of the version number. Until that is resolved references to this pom need to updated manually when this changes and no snapshot versions are possible. --> - <version>0.35.2</version> + <version>0.35.3</version> <packaging>pom</packaging> <name>parentpom</name> <description> @@ -40,6 +43,7 @@ <properties> <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding> + <compileSource>1.6</compileSource> </properties> <!-- Build Settings --> @@ -62,8 +66,8 @@ <artifactId>maven-compiler-plugin</artifactId> <version>2.3.1</version> <configuration> - <source>1.6</source> - <target>1.6</target> + <source>${compileSource}</source> + <target>${compileSource}</target> <showDeprecation>true</showDeprecation> <showWarnings>true</showWarnings> </configuration> @@ -129,6 +133,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> + <version>1.2.1</version> <configuration> <mainClass>org.argouml.application.Main</mainClass> </configuration> @@ -161,6 +166,46 @@ </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>1.1</version> + <configuration> + <rules> + <requirePluginVersions/> + </rules> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <version>2.3</version> + </plugin> + <plugin> + <artifactId>maven-deploy-plugin</artifactId> + <version>2.7</version> + </plugin> + <plugin> + <artifactId>maven-install-plugin</artifactId> + <version>2.3.1</version> + </plugin> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <version>3.1</version> + </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.3</version> + </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <version>2.4</version> + </plugin> + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>2.1</version> + </plugin> + </plugins> @@ -195,6 +240,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>jdepend-maven-plugin</artifactId> + <version>2.0-beta-2</version> </plugin> <plugin> @@ -205,7 +251,7 @@ <linkXref>true</linkXref> <sourceEncoding>utf-8</sourceEncoding> <minimumTokens>100</minimumTokens> - <targetJdk>1.6</targetJdk> + <targetJdk>${compileSource}</targetJdk> <excludeRoots> <excludeRoot>src_generated</excludeRoot> </excludeRoots> ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2967979 To unsubscribe from this discussion, e-mail: [[email protected]].
