Revision: 893
Author: heuermh
Date: Fri Nov 27 11:26:19 2009
Log: Issue 146 ; adding explicit plugin versions, cleaning up maven
3.0-alpha warnings
http://code.google.com/p/piccolo2d/source/detail?r=893
Modified:
/piccolo2d.java/trunk/core/pom.xml
/piccolo2d.java/trunk/examples/pom.xml
/piccolo2d.java/trunk/extras/pom.xml
/piccolo2d.java/trunk/parent/pom.xml
/piccolo2d.java/trunk/swt/pom.xml
/piccolo2d.java/trunk/swt-examples/pom.xml
=======================================
--- /piccolo2d.java/trunk/core/pom.xml Wed Oct 28 19:04:29 2009
+++ /piccolo2d.java/trunk/core/pom.xml Fri Nov 27 11:26:19 2009
@@ -39,6 +39,7 @@
</parent>
<artifactId>piccolo2d-core</artifactId>
<packaging>bundle</packaging>
+<!-- <packaging>jar</packaging> -->
<name>Piccolo2D Core</name>
<scm>
<connection>scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk/core</connection>
@@ -46,43 +47,10 @@
<url>http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/trunk/core</url>
</scm>
<reporting>
-<!--
<plugins>
<plugin>
- <artifactId>maven-changelog-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- </plugin>
- </plugins>
--->
- <plugins>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.3</version>
<configuration>
<configLocation>${basedir}/src/build/conf/checkstyle.xml</configLocation>
<enableRulesSummary>false</enableRulesSummary>
@@ -90,22 +58,20 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.6.1</version>
<configuration>
- <source>1.4</source>
+ <source>${jdk.version}</source>
<verbose>false</verbose>
<show>package</show>
- <links>
- <link>
- http://java.sun.com/j2se/1.4.2/docs/api/
- </link>
- </links>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.4.3</version>
</plugin>
<plugin>
<artifactId>maven-changelog-plugin</artifactId>
+ <version>2.1</version>
<!--
configuration> <connectionType>connection</connectionType>
</configuration
@@ -113,10 +79,12 @@
</plugin>
<plugin>
<artifactId>maven-jxr-plugin</artifactId>
+ <version>2.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
+ <version>2.4</version>
<configuration>
<tags>
<tag>TODO</tag>
@@ -127,20 +95,21 @@
</configuration>
</plugin>
<plugin>
- <artifactId>
- maven-project-info-reports-plugin
- </artifactId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.1.2</version>
</plugin>
<plugin>
<artifactId>maven-pmd-plugin</artifactId>
+ <version>2.4</version>
<configuration>
<sourceEncoding>ascii</sourceEncoding>
- <targetJdk>1.4</targetJdk>
+ <targetJdk>${jdk.version}</targetJdk>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jdepend-maven-plugin</artifactId>
+ <version>2.0-beta-2</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -158,6 +127,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.3</version>
<configuration>
<formats>
<format>xml</format>
=======================================
--- /piccolo2d.java/trunk/examples/pom.xml Wed Oct 28 19:04:29 2009
+++ /piccolo2d.java/trunk/examples/pom.xml Fri Nov 27 11:26:19 2009
@@ -39,6 +39,8 @@
</parent>
<artifactId>piccolo2d-examples</artifactId>
<name>Piccolo2D Examples</name>
+ <packaging>bundle</packaging>
+<!-- <packaging>jar</packaging> -->
<dependencies>
<dependency>
<groupId>org.piccolo2d</groupId>
@@ -52,23 +54,21 @@
<url>http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/trunk/examples</url>
</scm>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
-
<mainClass>edu.umd.cs.piccolo.examples.ExampleRunner</mainClass>
- </manifest>
- </archive>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+
<mainClass>edu.umd.cs.piccolo.examples.ExampleRunner</mainClass>
+ </manifest>
+ </archive>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>
=======================================
--- /piccolo2d.java/trunk/extras/pom.xml Wed Oct 28 19:04:29 2009
+++ /piccolo2d.java/trunk/extras/pom.xml Fri Nov 27 11:26:19 2009
@@ -39,6 +39,7 @@
</parent>
<artifactId>piccolo2d-extras</artifactId>
<packaging>bundle</packaging>
+<!-- <packaging>jar</packaging> -->
<name>Piccolo2D Extras</name>
<dependencies>
<dependency>
@@ -53,43 +54,10 @@
<url>http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/trunk/extras</url>
</scm>
<reporting>
-<!--
<plugins>
<plugin>
- <artifactId>maven-changelog-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- </plugin>
- </plugins>
--->
- <plugins>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.3</version>
<configuration>
<configLocation>${basedir}/src/build/conf/checkstyle.xml</configLocation>
<enableRulesSummary>false</enableRulesSummary>
@@ -97,22 +65,20 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.6.1</version>
<configuration>
- <source>1.4</source>
+ <source>${jdk.version}</source>
<verbose>false</verbose>
<show>package</show>
- <links>
- <link>
- http://java.sun.com/j2se/1.4.2/docs/api/
- </link>
- </links>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.4.3</version>
</plugin>
<plugin>
<artifactId>maven-changelog-plugin</artifactId>
+ <version>2.1</version>
<!--
configuration> <connectionType>connection</connectionType>
</configuration
@@ -120,10 +86,12 @@
</plugin>
<plugin>
<artifactId>maven-jxr-plugin</artifactId>
+ <version>2.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
+ <version>2.4</version>
<configuration>
<tags>
<tag>TODO</tag>
@@ -134,20 +102,21 @@
</configuration>
</plugin>
<plugin>
- <artifactId>
- maven-project-info-reports-plugin
- </artifactId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.1.2</version>
</plugin>
<plugin>
<artifactId>maven-pmd-plugin</artifactId>
+ <version>2.4</version>
<configuration>
<sourceEncoding>ascii</sourceEncoding>
- <targetJdk>1.4</targetJdk>
+ <targetJdk>${jdk.version}</targetJdk>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jdepend-maven-plugin</artifactId>
+ <version>2.0-beta-2</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -165,6 +134,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.3</version>
<configuration>
<formats>
<format>xml</format>
=======================================
--- /piccolo2d.java/trunk/parent/pom.xml Mon Nov 2 09:02:46 2009
+++ /piccolo2d.java/trunk/parent/pom.xml Fri Nov 27 11:26:19 2009
@@ -38,7 +38,9 @@
<name>Piccolo2D Parent</name>
<description>A revolutionary way to create robust, full-featured
graphical applications in Java and C#, with striking visual effects such as
zooming, animation and multiple representations.</description>
<properties>
+ <jdk.version>1.4</jdk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.build.targetEncoding>UTF-8</project.build.targetEncoding>
<httpbase>http://www.piccolo2d.org/java</httpbase>
<httpsitebase>${httpbase}/site</httpsitebase>
<!--
@@ -58,7 +60,7 @@
-->
</scpsitebase>
</properties>
- <url>${httpsitebase}/${pom.artifactId}/${pom.version}</url>
+ <url>${httpsitebase}/${project.artifactId}/${project.version}</url>
<issueManagement>
<system>Google Code</system>
<url>http://code.google.com/p/piccolo2d/issues/list</url>
@@ -211,40 +213,64 @@
</contributor>
</contributors>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-4</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <verbose>true</verbose>
+ <fork>true</fork>
+ <encoding>ascii</encoding>
+ <optimize>false</optimize>
+ <debug>false</debug>
+ <compilerVersion>${jdk.version}</compilerVersion>
+ <showDeprecation>false</showDeprecation>
+ <showWarnings>true</showWarnings>
+ <source>${jdk.version}</source>
+ <target>${jdk.version}</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-scm-plugin</artifactId>
+ <version>1.1</version>
+ <configuration>
+ <connectionType>developerConnection</connectionType>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.0.1</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <verbose>true</verbose>
- <fork>true</fork>
- <encoding>ascii</encoding>
- <optimize>false</optimize>
- <debug>false</debug>
- <compilerVersion>1.4</compilerVersion>
- <showDeprecation>false</showDeprecation>
- <showWarnings>true</showWarnings>
- <source>1.4</source>
- <target>1.4</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-scm-plugin</artifactId>
- <configuration>
- <connectionType>developerConnection</connectionType>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
</plugin>
</plugins>
</build>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>
=======================================
--- /piccolo2d.java/trunk/swt/pom.xml Thu Oct 29 20:44:07 2009
+++ /piccolo2d.java/trunk/swt/pom.xml Fri Nov 27 11:26:19 2009
@@ -39,6 +39,7 @@
</parent>
<artifactId>piccolo2d-swt</artifactId>
<packaging>bundle</packaging>
+<!-- <packaging>jar</packaging> -->
<name>Piccolo2D SWT</name>
<dependencies>
<dependency>
@@ -59,43 +60,10 @@
<url>http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/trunk/swt</url>
</scm>
<reporting>
-<!--
<plugins>
<plugin>
- <artifactId>maven-changelog-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- </plugin>
- </plugins>
--->
- <plugins>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.3</version>
<configuration>
<configLocation>${basedir}/src/build/conf/checkstyle.xml</configLocation>
<enableRulesSummary>false</enableRulesSummary>
@@ -103,22 +71,20 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.6.1</version>
<configuration>
- <source>1.4</source>
+ <source>${jdk.version}</source>
<verbose>false</verbose>
<show>package</show>
- <links>
- <link>
- http://java.sun.com/j2se/1.4.2/docs/api/
- </link>
- </links>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.4.3</version>
</plugin>
<plugin>
<artifactId>maven-changelog-plugin</artifactId>
+ <version>2.1</version>
<!--
configuration> <connectionType>connection</connectionType>
</configuration
@@ -126,10 +92,12 @@
</plugin>
<plugin>
<artifactId>maven-jxr-plugin</artifactId>
+ <version>2.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
+ <version>2.4</version>
<configuration>
<tags>
<tag>TODO</tag>
@@ -140,20 +108,21 @@
</configuration>
</plugin>
<plugin>
- <artifactId>
- maven-project-info-reports-plugin
- </artifactId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.1.2</version>
</plugin>
<plugin>
<artifactId>maven-pmd-plugin</artifactId>
+ <version>2.4</version>
<configuration>
<sourceEncoding>ascii</sourceEncoding>
- <targetJdk>1.4</targetJdk>
+ <targetJdk>${jdk.version}</targetJdk>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jdepend-maven-plugin</artifactId>
+ <version>2.0-beta-2</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -171,6 +140,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.3</version>
<configuration>
<formats>
<format>xml</format>
=======================================
--- /piccolo2d.java/trunk/swt-examples/pom.xml Wed Oct 28 19:04:29 2009
+++ /piccolo2d.java/trunk/swt-examples/pom.xml Fri Nov 27 11:26:19 2009
@@ -39,6 +39,7 @@
</parent>
<artifactId>piccolo2d-swt-examples</artifactId>
<packaging>bundle</packaging>
+<!-- <packaging>jar</packaging> -->
<name>Piccolo2D SWT Examples</name>
<scm>
<connection>scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk/swt-examples</connection>
@@ -53,23 +54,21 @@
</dependency>
</dependencies>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
-
<mainClass>edu.umd.cs.piccolox.swt.examples.SWTBasicExample</mainClass>
- </manifest>
- </archive>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+
<mainClass>edu.umd.cs.piccolox.swt.examples.SWTBasicExample</mainClass>
+ </manifest>
+ </archive>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>
--
Piccolo2D Developers Group: http://groups.google.com/group/piccolo2d-dev?hl=en