Revision: 1226
Author:   heuermh
Date:     Tue Nov 26 22:05:39 2013 UTC
Log: Issue 252 ; merge build-related changes from trunk to branches/3.0-spike
http://code.google.com/p/piccolo2d/source/detail?r=1226

Deleted:
 /piccolo2d.java/branches/3.0-spike/parent
Modified:
 /piccolo2d.java/branches/3.0-spike/ReleaseNotes.txt
 /piccolo2d.java/branches/3.0-spike/core/pom.xml
 /piccolo2d.java/branches/3.0-spike/examples/pom.xml
 /piccolo2d.java/branches/3.0-spike/extras/pom.xml
 /piccolo2d.java/branches/3.0-spike/pom.xml
 /piccolo2d.java/branches/3.0-spike/swt/pom.xml
 /piccolo2d.java/branches/3.0-spike/swt-examples/pom.xml

=======================================
--- /piccolo2d.java/branches/3.0-spike/ReleaseNotes.txt Wed Apr 10 19:51:32 2013 UTC +++ /piccolo2d.java/branches/3.0-spike/ReleaseNotes.txt Tue Nov 26 22:05:39 2013 UTC
@@ -1,9 +1,82 @@
-=Piccolo2d 3.0-beta1 Release Notes=
+=Piccolo2D 3.0 Release Notes=
 ------------------

-Initial beta release of svn branch https://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike.
+Major changes:

-Further release notes will be available after beta releases are complete.
+The minimum JDK version is now 1.6.
+
+JDK 1.6-only modules jdk16 and jdk16-examples have been merged to core and examples respectively.
+
+Piccolo2D.Java version 3.0 is _not_ binary compatible with version 1.3.x or version 2.x.
+
+
+Fixed and verified issues:
+
+
+=Piccolo2D 2.0 Release Notes=
+------------------
+
+Major changes:
+
+The root package name for Piccolo2D.Java is now org.piccolo2d to match the project domain name.
+
+The minimum JDK version is now 1.5.
+
+JDK 1.6-only code has been added to new modules jdk16 and jdk16-examples.
+
+Piccolo2D.Java version 2.0 is _not_ binary compatible with version 1.3.x.
+
+
+Fixed and verified issues:
+
+33      PSwing components not visible in testing frameworks
+37      change namespaces to piccolo2d,
+86      inconsistencies of position method in PNode
+135     Constants are not constant in the core.
+136     PNotificationCenter is a singleton but isn't declared as final
+152     Refactor PPath to use Path2D on JDK 1.6+
+153 PArea, a wrapper for java.awt.geom.Area to allow Constructive Area Geometry (CAG) operations
+172     Add getRoot method to POffscreenCanvas
+177 When deleting a selected node using the keyboard <DEL> a selection change is not fired
+180     Drawing tears when dragging or resizing path nodes
+186     Create a new package org.piccolo2d.examples.bugs or .issues
+236     Add zoom event handler that responds to mouse wheel events
+251     Merge build-related changes from release-1.3 branch to trunk
+
+
+=Piccolo2D 1.3.2 Release Notes=
+------------------
+
+Fixed and verified issues:
+
+134     PTransformActivity can throw null pointer exception
+207     Horizontal scrolling causes an exception
+208     Merge maven reporting plugin versions to parent pom
+211 Consider using Sonatype oss-parent-7.pom as the parent of parent/pom.xml
+224     Update maven-site-plugin version to 3.0, remove maven-3 profile
+229     Consider updating maven-checkstyle-plugin to version 2.8
+230     Add link to Autocad DXF File Viewer on applications page
+231     Mistake in java doc comment
+235 PSwingEventHandler doesn't dispatch events to nodes at extreme scales
+242     Typo in API docs
+250     Update junit dependency version to 4.11
+
+
+=Piccolo2D 1.3.1 Release Notes=
+------------------
+
+Fixed and verified issues:
+
+163    PSwing doesn't draw dynamic JComponent properly
+173    Slow repaint of PSwing components when zooming (from 1.2 to 1.3)
+185 Memory leak - PActivityScheduler keeps processed activities in reference
+187    general shapes are not filled correctly under SWT
+188    wrong line width when drawing general shapes under SWT
+195 testPSwingDelegatesPaintingToItsComponent(edu.umd.cs.piccolox.pswing.PSwingTest) fails on release-1.3 branch
+197    Maven site does not run reports from the command line with maven 3
+203    Missing maven profile for Windows x86_64
+206    SWTGraphics2D keeps invalid caches
+212    Update maven-gpg-plugin dependency version to 1.2


 =Piccolo2D 1.3 Release Notes=
=======================================
--- /piccolo2d.java/branches/3.0-spike/core/pom.xml Wed Apr 10 20:39:06 2013 UTC +++ /piccolo2d.java/branches/3.0-spike/core/pom.xml Tue Nov 26 22:05:39 2013 UTC
@@ -32,116 +32,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>piccolo2d-parent</artifactId>
+    <artifactId>piccolo2d-complete</artifactId>
     <groupId>org.piccolo2d</groupId>
     <version>3.0-SNAPSHOT</version>
-    <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <artifactId>piccolo2d-core</artifactId>
   <packaging>bundle</packaging>
   <name>Piccolo2D Core</name>
+
   <scm>
<connection>scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike/core</connection> <developerConnection>scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike/core</developerConnection> <url>http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/branches/3.0-spike/core</url>
   </scm>
-  <reporting>
-    <plugins>
-      <plugin>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.9.1</version>
-        <configuration>
- <configLocation>${basedir}/src/build/conf/checkstyle.xml</configLocation>
-          <enableRulesSummary>false</enableRulesSummary>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.9</version>
-        <configuration>
-          <quiet>true</quiet>
-          <verbose>false</verbose>
-          <show>package</show>
-        </configuration>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>javadoc</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-      <plugin>
-        <artifactId>maven-changelog-plugin</artifactId>
-        <version>2.2</version>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jxr-plugin</artifactId>
-        <version>2.3</version>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>2.14</version>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>taglist-maven-plugin</artifactId>
-        <version>2.4</version>
-        <configuration>
-          <tags>
-            <tag>TODO</tag>
-            <tag>FIXME</tag>
-            <tag>@todo</tag>
-            <tag>@deprecated</tag>
-          </tags>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.4</version>
-      </plugin>
-      <plugin>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <version>3.0.1</version>
-        <configuration>
-          <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>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <version>2.5.2</version>
-        <configuration>
-          <includeTests>false</includeTests>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-        <version>2.5.2</version>
-        <configuration>
-          <instrumentation>
-            <ignores>
-              <ignore>org.piccolo2d.examples.*</ignore>
-              <ignore>org.piccolo2d.examples.pswing.*</ignore>
-              <ignore>org.piccolo2d.examples.swt.*</ignore>
-              <ignore>org.piccolo2d.tutorial.*</ignore>
-            </ignores>
-            <excludes>
-              <exclude>org/piccolo2d/examples/**</exclude>
-              <exclude>org/piccolo2d/**/*Test.class</exclude>
-              <exclude>org/piccolo2d/extras/**/*Test.class</exclude>
-              <exclude>org/piccolo2d/**/Mock*.class</exclude>
-              <exclude>org/piccolo2d/extras/**/Mock*.class</exclude>
-            </excludes>
-          </instrumentation>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>
=======================================
--- /piccolo2d.java/branches/3.0-spike/examples/pom.xml Wed Apr 10 20:39:06 2013 UTC +++ /piccolo2d.java/branches/3.0-spike/examples/pom.xml Tue Nov 26 22:05:39 2013 UTC
@@ -32,26 +32,38 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>piccolo2d-parent</artifactId>
+    <artifactId>piccolo2d-complete</artifactId>
     <groupId>org.piccolo2d</groupId>
     <version>3.0-SNAPSHOT</version>
-    <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <artifactId>piccolo2d-examples</artifactId>
   <name>Piccolo2D Examples</name>
   <packaging>bundle</packaging>
+
+  <scm>
+ <connection>scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike/examples</connection> + <developerConnection>scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike/examples</developerConnection> + <url>http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/branches/3.0-spike/examples</url>
+  </scm>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.piccolo2d</groupId>
+        <artifactId>piccolo2d-extras</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>org.piccolo2d</groupId>
       <artifactId>piccolo2d-extras</artifactId>
-      <version>${project.version}</version>
+      <scope>compile</scope>
     </dependency>
   </dependencies>
-  <scm>
- <connection>scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike/examples</connection> - <developerConnection>scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike/examples</developerConnection> - <url>http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/branches/3.0-spike/examples</url>
-  </scm>
+
   <build>
     <plugins>
       <plugin>
@@ -59,7 +71,7 @@
         <configuration>
           <archive>
             <manifest>
-              <mainClass>org.piccolo2d.examples.ExampleRunner</mainClass>
+ <mainClass>edu.umd.cs.piccolo.examples.ExampleRunner</mainClass>
             </manifest>
           </archive>
           <descriptorRefs>
@@ -69,12 +81,4 @@
       </plugin>
     </plugins>
   </build>
-  <reporting>
-    <plugins>
-      <plugin>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.4</version>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>
=======================================
--- /piccolo2d.java/branches/3.0-spike/extras/pom.xml Wed Apr 10 20:39:06 2013 UTC +++ /piccolo2d.java/branches/3.0-spike/extras/pom.xml Tue Nov 26 22:05:39 2013 UTC
@@ -32,123 +32,35 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>piccolo2d-parent</artifactId>
+    <artifactId>piccolo2d-complete</artifactId>
     <groupId>org.piccolo2d</groupId>
     <version>3.0-SNAPSHOT</version>
-    <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <artifactId>piccolo2d-extras</artifactId>
   <packaging>bundle</packaging>
   <name>Piccolo2D Extras</name>
+
+  <scm>
+ <connection>scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike/extras</connection> + <developerConnection>scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike/extras</developerConnection> + <url>http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/branches/3.0-spike/extras</url>
+  </scm>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.piccolo2d</groupId>
+        <artifactId>piccolo2d-core</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>org.piccolo2d</groupId>
       <artifactId>piccolo2d-core</artifactId>
-      <version>${project.version}</version>
+      <scope>compile</scope>
     </dependency>
   </dependencies>
-  <scm>
- <connection>scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike/extras</connection> - <developerConnection>scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike/extras</developerConnection> - <url>http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/branches/3.0-spike/extras</url>
-  </scm>
-  <reporting>
-    <plugins>
-      <plugin>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.9.1</version>
-        <configuration>
- <configLocation>${basedir}/src/build/conf/checkstyle.xml</configLocation>
-          <enableRulesSummary>false</enableRulesSummary>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.9</version>
-        <configuration>
-          <quiet>true</quiet>
-          <verbose>false</verbose>
-          <show>package</show>
-        </configuration>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>javadoc</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-      <plugin>
-        <artifactId>maven-changelog-plugin</artifactId>
-        <version>2.2</version>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jxr-plugin</artifactId>
-        <version>2.3</version>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>2.14</version>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>taglist-maven-plugin</artifactId>
-        <version>2.4</version>
-        <configuration>
-          <tags>
-            <tag>TODO</tag>
-            <tag>FIXME</tag>
-            <tag>@todo</tag>
-            <tag>@deprecated</tag>
-          </tags>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.4</version>
-      </plugin>
-      <plugin>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <version>3.0.1</version>
-        <configuration>
-          <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>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <version>2.5.2</version>
-        <configuration>
-          <includeTests>false</includeTests>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-        <version>2.5.2</version>
-        <configuration>
-          <instrumentation>
-            <ignores>
-              <ignore>org.piccolo2d.examples.*</ignore>
-              <ignore>org.piccolo2d.examples.pswing.*</ignore>
-              <ignore>org.piccolo2d.examples.swt.*</ignore>
-              <ignore>org.piccolo2d.tutorial.*</ignore>
-            </ignores>
-            <excludes>
-              <exclude>org/piccolo2d/examples/**</exclude>
-              <exclude>org/piccolo2d/**/*Test.class</exclude>
-              <exclude>org/piccolo2d/extras/**/*Test.class</exclude>
-              <exclude>org/piccolo2d/**/Mock*.class</exclude>
-              <exclude>org/piccolo2d/extras/**/Mock*.class</exclude>
-            </excludes>
-          </instrumentation>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>
=======================================
--- /piccolo2d.java/branches/3.0-spike/pom.xml  Wed Apr 10 20:39:06 2013 UTC
+++ /piccolo2d.java/branches/3.0-spike/pom.xml  Tue Nov 26 22:05:39 2013 UTC
@@ -12,7 +12,7 @@
   and the following disclaimer.

Redistributions in binary form must reproduce the above copyright notice, this list of conditions - and the following disclaimer in the documentation and/or other materials provided with the +2 and the following disclaimer in the documentation and/or other materials provided with the
   distribution.

None of the name of the University of Maryland, the name of the Piccolo2D project, or the names of its
@@ -32,29 +32,325 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>piccolo2d-parent</artifactId>
-    <groupId>org.piccolo2d</groupId>
-    <version>3.0-SNAPSHOT</version>
-    <relativePath>./parent/pom.xml</relativePath>
+    <groupId>org.sonatype.oss</groupId>
+    <artifactId>oss-parent</artifactId>
+    <version>7</version>
   </parent>
+
+  <groupId>org.piccolo2d</groupId>
   <artifactId>piccolo2d-complete</artifactId>
+  <version>3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
+
   <name>Piccolo2D</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> + <url>http://www.piccolo2d.org/java/site/${project.artifactId}/${project.version}</url>
+  <inceptionYear>1995</inceptionYear>
+
+  <organization>
+    <name>Piccolo2D</name>
+    <url>http://code.google.com/p/piccolo2d/</url>
+  </organization>
+
+  <licenses>
+    <license>
+      <name>BSD PUBLIC LICENSE</name>
+      <url>http://opensource.org/licenses/bsd-license.php</url>
+      <distribution>manual</distribution>
+    </license>
+  </licenses>
+
+  <issueManagement>
+    <system>Google Code</system>
+    <url>http://code.google.com/p/piccolo2d/issues/list</url>
+  </issueManagement>
+
+  <mailingLists>
+    <mailingList>
+      <name>Piccolo2D Announce</name>
+ <subscribe>http://groups.google.com/group/piccolo2d-announce/subscribe</subscribe>
+      <post>piccolo2d-annou...@googlegroups.com</post>
+      <archive>http://groups.google.com/group/piccolo2d-announce</archive>
+    </mailingList>
+    <mailingList>
+      <name>Piccolo2D Users</name>
+ <subscribe>http://groups.google.com/group/piccolo2d-users/subscribe</subscribe>
+      <post>piccolo2d-us...@googlegroups.com</post>
+      <archive>http://groups.google.com/group/piccolo2d-users</archive>
+    </mailingList>
+    <mailingList>
+      <name>Piccolo2D Dev</name>
+ <subscribe>http://groups.google.com/group/piccolo2d-dev/subscribe</subscribe>
+      <post>piccolo2d-dev@googlegroups.com</post>
+      <archive>http://groups.google.com/group/piccolo2d-dev</archive>
+    </mailingList>
+  </mailingLists>
+
+  <developers>
+    <developer>
+      <id>allain.lalonde</id>
+      <name>Allain Lalonde</name>
+      <roles>
+        <role>developer</role>
+      </roles>
+      <email>all...@machete.ca</email>
+      <url>http://www.machete.ca</url>
+      <timezone>-5</timezone>
+    </developer>
+    <developer>
+      <id>bederson</id>
+      <name>Ben Bederson</name>
+      <roles>
+        <role>founder, original architect</role>
+      </roles>
+      <timezone>-5</timezone>
+ <organization>University of Maryland / Human-Computer Interaction Lab</organization>
+      <url>http://www.cs.umd.edu/~bederson</url>
+    </developer>
+    <developer>
+      <id>heuermh</id>
+      <name>Michael L Heuer</name>
+      <roles>
+        <role>developer</role>
+      </roles>
+      <timezone>-6</timezone>
+    </developer>
+    <developer>
+      <id>jesse</id>
+      <name>jesse</name>
+      <roles>
+        <role>developer</role>
+      </roles>
+      <timezone>-5</timezone>
+    </developer>
+    <developer>
+      <id>mr0...@mro.name</id>
+      <name>Marcus Rohrmoser</name>
+      <roles>
+        <role>developer</role>
+      </roles>
+      <timezone>+1</timezone>
+      <url>http://blog.mro.name</url>
+    </developer>
+    <developer>
+      <id>reids</id>
+      <name>Sam Reid</name>
+      <roles>
+        <role>developer</role>
+      </roles>
+      <url>http://spot.colorado.edu/~reids</url>
+      <timezone>-7</timezone>
+    </developer>
+    <developer>
+      <id>s...@browsecode.org</id>
+      <name>Stephen Chin</name>
+      <roles>
+        <role>developer</role>
+      </roles>
+      <email>s...@browsecode.org</email>
+      <url>http://steveonjava.com/</url>
+      <timezone>-8</timezone>
+    </developer>
+    <developer>
+      <id>aclamage</id>
+      <name>Aaron Clamage</name>
+      <roles>
+        <role>developer</role>
+      </roles>
+      <email>aclam...@gmail.com</email>
+      <timezone>-5</timezone>
+    </developer>
+    <developer>
+      <id>lgood</id>
+      <name>Lance Good</name>
+      <roles>
+        <role>developer</role>
+      </roles>
+      <email>la...@goodle.org</email>
+      <timezone>-5</timezone>
+    </developer>
+    <developer>
+      <name>Aaron Dixon</name>
+      <email>atdi...@gmail.com</email>
+      <roles>
+        <role>developer</role>
+      </roles>
+      <timezone>-6</timezone>
+    </developer>
+    <developer>
+      <name>Chris Malley</name>
+      <email>cmal...@pixelzoom.com</email>
+      <url>http://www.pixelzoom.com</url>
+      <roles>
+        <role>developer</role>
+      </roles>
+      <timezone>-7</timezone>
+    </developer>
+  </developers>
+
+  <contributors>
+    <contributor>
+      <name>Alexander Kurtakov</name>
+      <email>akurta...@gmail.com</email>
+      <url>http://akurtakov.blogspot.com</url>
+      <organization>Red Hat Inc.</organization>
+      <organizationUrl>http://redhat.com</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+      <timezone>+2</timezone>
+    </contributor>
+    <contributor>
+      <email>berthold.d...@bdaum.de</email>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </contributor>
+  </contributors>
+
   <scm>
<connection>scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike</connection> <developerConnection>scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike</developerConnection> <url>http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/branches/3.0-spike</url>
   </scm>
+
+  <properties>
+    <jdk.version>1.6</jdk.version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.build.targetEncoding>UTF-8</project.build.targetEncoding>
+  </properties>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>2.4</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>2.5</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.1</version>
+          <configuration>
+            <source>${maven.compile.source}</source>
+            <target>${maven.compile.target}</target>
+          </configuration>
+        </plugin>
+        <plugin>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>2.7</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-gpg-plugin</artifactId>
+          <version>1.4</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>2.5.1</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>2.4</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>2.9.1</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-release-plugin</artifactId>
+          <version>2.4.1</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>2.6</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.3</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-source-plugin</artifactId>
+          <version>2.2.1</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.16</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>maven-bundle-plugin</artifactId>
+          <version>2.4.0</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <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>4.11</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
   <reporting>
     <plugins>
       <plugin>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.9.1</version>
+        <configuration>
+          <detectLinks>true</detectLinks>
+          <quiet>true</quiet>
+          <source>${maven.compile.source}</source>
+          <linksource>true</linksource>
+        </configuration>
+      </plugin>
+      <plugin>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.4</version>
+        <version>2.7</version>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>index</report>
+              <report>summary</report>
+              <report>modules</report>
+              <report>scm</report>
+              <report>dependency-management</report>
+              <report>dependencies</report>
+              <report>dependency-convergence</report>
+              <report>distribution-management</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-report-plugin</artifactId>
+        <version>2.16</version>
       </plugin>
     </plugins>
   </reporting>
+
   <modules>
-    <module>parent</module>
     <module>core</module>
     <module>extras</module>
     <module>swt</module>
=======================================
--- /piccolo2d.java/branches/3.0-spike/swt/pom.xml Wed Apr 10 20:39:06 2013 UTC +++ /piccolo2d.java/branches/3.0-spike/swt/pom.xml Tue Nov 26 22:05:39 2013 UTC
@@ -32,32 +32,48 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>piccolo2d-parent</artifactId>
+    <artifactId>piccolo2d-complete</artifactId>
     <groupId>org.piccolo2d</groupId>
     <version>3.0-SNAPSHOT</version>
-    <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <artifactId>piccolo2d-swt</artifactId>
   <packaging>bundle</packaging>
   <name>Piccolo2D SWT</name>
+
+  <scm>
+ <connection>scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike/swt</connection> + <developerConnection>scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike/swt</developerConnection> + <url>http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/branches/3.0-spike/swt</url>
+  </scm>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.piccolo2d</groupId>
+        <artifactId>piccolo2d-extras</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>${swt.groupId}</groupId>
+        <artifactId>${swt.artifactId}</artifactId>
+        <version>[3.3.0-v3346,)</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>org.piccolo2d</groupId>
       <artifactId>piccolo2d-extras</artifactId>
-      <version>${project.version}</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>${swt.groupId}</groupId>
       <artifactId>${swt.artifactId}</artifactId>
-      <version>[3.3.0-v3346,)</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
-  <scm>
- <connection>scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike/swt</connection> - <developerConnection>scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike/swt</developerConnection> - <url>http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/branches/3.0-spike/swt</url>
-  </scm>
+
   <build>
     <plugins>
       <plugin>
@@ -68,105 +84,7 @@
       </plugin>
     </plugins>
   </build>
-  <reporting>
-    <plugins>
-      <plugin>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.9.1</version>
-        <configuration>
- <configLocation>${basedir}/src/build/conf/checkstyle.xml</configLocation>
-          <enableRulesSummary>false</enableRulesSummary>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.9</version>
-        <configuration>
-          <quiet>true</quiet>
-          <verbose>false</verbose>
-          <show>package</show>
-        </configuration>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>javadoc</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-      <plugin>
-        <artifactId>maven-changelog-plugin</artifactId>
-        <version>2.2</version>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jxr-plugin</artifactId>
-        <version>2.3</version>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>2.14</version>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>taglist-maven-plugin</artifactId>
-        <version>2.4</version>
-        <configuration>
-          <tags>
-            <tag>TODO</tag>
-            <tag>FIXME</tag>
-            <tag>@todo</tag>
-            <tag>@deprecated</tag>
-          </tags>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.4</version>
-      </plugin>
-      <plugin>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <version>3.0.1</version>
-        <configuration>
-          <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>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <version>2.5.2</version>
-        <configuration>
-          <includeTests>false</includeTests>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-        <version>2.5.2</version>
-        <configuration>
-          <instrumentation>
-            <ignores>
-              <ignore>org.piccolo2d.examples.*</ignore>
-              <ignore>org.piccolo2d.examples.pswing.*</ignore>
-              <ignore>org.piccolo2d.examples.swt.*</ignore>
-              <ignore>org.piccolo2d.tutorial.*</ignore>
-            </ignores>
-            <excludes>
-              <exclude>org/piccolo2d/examples/**</exclude>
-              <exclude>org/piccolo2d/**/*Test.class</exclude>
-              <exclude>org/piccolo2d/extras/**/*Test.class</exclude>
-              <exclude>org/piccolo2d/**/Mock*.class</exclude>
-              <exclude>org/piccolo2d/extras/**/Mock*.class</exclude>
-            </excludes>
-          </instrumentation>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
+
   <profiles>
     <profile>
       <id>gtk_linux_x86_64</id>
@@ -263,6 +181,7 @@

     disable this profile to build on mac osx, jdk 1.6, x86_64

+
     <profile>
       <id>macosx_carbon</id>
       <activation>
@@ -280,7 +199,6 @@

     enable this profile to build on mac osx, jdk 1.6, x86_64
       set MAVEN_OPTS="-Dd64", or unit tests will fail
-
 -->
     <profile>
       <id>macosx_cocoa_intel</id>
=======================================
--- /piccolo2d.java/branches/3.0-spike/swt-examples/pom.xml Wed Apr 10 20:39:06 2013 UTC +++ /piccolo2d.java/branches/3.0-spike/swt-examples/pom.xml Tue Nov 26 22:05:39 2013 UTC
@@ -32,34 +32,47 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>piccolo2d-parent</artifactId>
+    <artifactId>piccolo2d-complete</artifactId>
     <groupId>org.piccolo2d</groupId>
     <version>3.0-SNAPSHOT</version>
-    <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <artifactId>piccolo2d-swt-examples</artifactId>
   <packaging>bundle</packaging>
   <name>Piccolo2D SWT Examples</name>
+
   <scm>
<connection>scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike/swt-examples</connection> <developerConnection>scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike/swt-examples</developerConnection> <url>http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/branches/3.0-spike/swt-examples</url>
   </scm>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.piccolo2d</groupId>
+        <artifactId>piccolo2d-swt</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>org.piccolo2d</groupId>
       <artifactId>piccolo2d-swt</artifactId>
-      <version>${project.version}</version>
+      <scope>compile</scope>
     </dependency>
   </dependencies>
+
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
           <archive>
             <manifest>
- <mainClass>org.piccolo2d.extras.swt.examples.SWTBasicExample</mainClass> + <mainClass>edu.umd.cs.piccolox.swt.examples.SWTBasicExample</mainClass>
             </manifest>
           </archive>
           <descriptorRefs>
@@ -69,12 +82,4 @@
       </plugin>
     </plugins>
   </build>
-  <reporting>
-    <plugins>
-      <plugin>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.4</version>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

--
--
Piccolo2D Developers Group: http://groups.google.com/group/piccolo2d-dev?hl=en
--- You received this message because you are subscribed to the Google Groups "Piccolo2D Developers" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to piccolo2d-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to