From b8a974e20f3799339abb25938cbf0613758f221e Mon Sep 17 00:00:00 2001
From: Georgios Gousios <gousiosg@gmail.com>
Date: Wed, 27 Jun 2012 17:46:47 +0200
Subject: [PATCH 1/9] Make UMLGraph maven compatible

---
 .gitignore                                    |  3 +-
 pom.xml                                       | 51 +++++++++++++++++++
 .../java}/org/umlgraph/doclet/.gitignore      |  0
 .../java}/org/umlgraph/doclet/ClassGraph.java |  0
 .../java}/org/umlgraph/doclet/ClassInfo.java  |  0
 .../org/umlgraph/doclet/ClassMatcher.java     |  0
 .../org/umlgraph/doclet/ContextMatcher.java   |  0
 .../org/umlgraph/doclet/ContextView.java      |  0
 .../org/umlgraph/doclet/InterfaceMatcher.java |  0
 .../org/umlgraph/doclet/OptionProvider.java   |  0
 .../java}/org/umlgraph/doclet/Options.java    |  0
 .../org/umlgraph/doclet/PackageMatcher.java   |  0
 .../org/umlgraph/doclet/PackageView.java      |  0
 .../org/umlgraph/doclet/PatternMatcher.java   |  0
 .../umlgraph/doclet/RelationDirection.java    |  0
 .../org/umlgraph/doclet/RelationPattern.java  |  0
 .../org/umlgraph/doclet/RelationType.java     |  0
 .../java}/org/umlgraph/doclet/Shape.java      |  0
 .../java}/org/umlgraph/doclet/StringUtil.java |  0
 .../org/umlgraph/doclet/SubclassMatcher.java  |  0
 .../java}/org/umlgraph/doclet/UMLOptions.java |  0
 .../java}/org/umlgraph/doclet/UmlGraph.java   |  0
 .../org/umlgraph/doclet/UmlGraphDoc.java      |  0
 .../java}/org/umlgraph/doclet/View.java       |  0
 .../java}/org/umlgraph/doclet/Visibility.java |  0
 .../org/umlgraph/doclet/WrappedClassDoc.java  |  0
 .../org/umlgraph/doclet/WrappedRootDoc.java   |  0
 .../java}/org/umlgraph/test/BasicTest.java    |  0
 .../java}/org/umlgraph/test/DotDiff.java      |  0
 .../java}/org/umlgraph/test/RunDoc.java       |  0
 .../java}/org/umlgraph/test/RunOne.java       |  0
 .../org/umlgraph/test/SimpleFileFilter.java   |  0
 .../java}/org/umlgraph/test/TestUtils.java    |  0
 .../java}/org/umlgraph/test/UmlDocTest.java   |  0
 34 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 pom.xml
 rename src/{ => main/java}/org/umlgraph/doclet/.gitignore (100%)
 rename src/{ => main/java}/org/umlgraph/doclet/ClassGraph.java (100%)
 rename src/{ => main/java}/org/umlgraph/doclet/ClassInfo.java (100%)
 rename src/{ => main/java}/org/umlgraph/doclet/ClassMatcher.java (100%)
 rename src/{ => main/java}/org/umlgraph/doclet/ContextMatcher.java (100%)
 rename src/{ => main/java}/org/umlgraph/doclet/ContextView.java (100%)
 rename src/{ => main/java}/org/umlgraph/doclet/InterfaceMatcher.java (100%)
 rename src/{ => main/java}/org/umlgraph/doclet/OptionProvider.java (100%)
 rename src/{ => main/java}/org/umlgraph/doclet/Options.java (100%)
 rename src/{ => main/java}/org/umlgraph/doclet/PackageMatcher.java (100%)
 rename src/{ => main/java}/org/umlgraph/doclet/PackageView.java (100%)
 rename src/{ => main/java}/org/umlgraph/doclet/PatternMatcher.java (100%)
 rename src/{ => main/java}/org/umlgraph/doclet/RelationDirection.java (100%)
 rename src/{ => main/java}/org/umlgraph/doclet/RelationPattern.java (100%)
 rename src/{ => main/java}/org/umlgraph/doclet/RelationType.java (100%)
 rename src/{ => main/java}/org/umlgraph/doclet/Shape.java (100%)
 rename src/{ => main/java}/org/umlgraph/doclet/StringUtil.java (100%)
 rename src/{ => main/java}/org/umlgraph/doclet/SubclassMatcher.java (100%)
 rename src/{ => main/java}/org/umlgraph/doclet/UMLOptions.java (100%)
 rename src/{ => main/java}/org/umlgraph/doclet/UmlGraph.java (100%)
 rename src/{ => main/java}/org/umlgraph/doclet/UmlGraphDoc.java (100%)
 rename src/{ => main/java}/org/umlgraph/doclet/View.java (100%)
 rename src/{ => main/java}/org/umlgraph/doclet/Visibility.java (100%)
 rename src/{ => main/java}/org/umlgraph/doclet/WrappedClassDoc.java (100%)
 rename src/{ => main/java}/org/umlgraph/doclet/WrappedRootDoc.java (100%)
 rename src/{ => main/java}/org/umlgraph/test/BasicTest.java (100%)
 rename src/{ => main/java}/org/umlgraph/test/DotDiff.java (100%)
 rename src/{ => main/java}/org/umlgraph/test/RunDoc.java (100%)
 rename src/{ => main/java}/org/umlgraph/test/RunOne.java (100%)
 rename src/{ => main/java}/org/umlgraph/test/SimpleFileFilter.java (100%)
 rename src/{ => main/java}/org/umlgraph/test/TestUtils.java (100%)
 rename src/{ => main/java}/org/umlgraph/test/UmlDocTest.java (100%)

diff --git a/.gitignore b/.gitignore
index a39a039..8c01957 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,5 @@ UMLGraph-snapshot*
 UMLGraph-R*
 CHECKSUM.MD5
 _vimrc
-pom.xml
+target
+
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..5641821
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<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>
+  <groupId>org.umlgraph</groupId>
+  <artifactId>umlgraph</artifactId>
+  <packaging>jar</packaging>
+  <name>UMLGraph</name>
+  <version>5.6.0-SNAPSHOT</version>
+  <description>Declarative Drawing of UML Diagrams</description>
+  <url>http://www.umlgraph.org</url>
+
+  <licenses>
+    <license>
+      <name>BSD License (original)</name>
+      <url>http://www.opensource.org/licenses/bsd-license.php</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+
+  <scm>
+    <url>https://github.com/dspinellis/UMLGraph</url>
+    <connection>git://github.com/dspinellis/UMLGraph.git</connection>
+  </scm>
+
+  <developers>
+    <developer>
+      <id>dspinellis</id>
+      <name>Diomidis Spinellis</name>
+      <email>dds@aueb.gr</email>
+    </developer>
+  </developers>
+
+  <dependencies/>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-release-plugin</artifactId>
+        <version>2.2.1</version>
+        <configuration>
+          <preparationGoals>clean verify</preparationGoals>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/src/org/umlgraph/doclet/.gitignore b/src/main/java/org/umlgraph/doclet/.gitignore
similarity index 100%
rename from src/org/umlgraph/doclet/.gitignore
rename to src/main/java/org/umlgraph/doclet/.gitignore
diff --git a/src/org/umlgraph/doclet/ClassGraph.java b/src/main/java/org/umlgraph/doclet/ClassGraph.java
similarity index 100%
rename from src/org/umlgraph/doclet/ClassGraph.java
rename to src/main/java/org/umlgraph/doclet/ClassGraph.java
diff --git a/src/org/umlgraph/doclet/ClassInfo.java b/src/main/java/org/umlgraph/doclet/ClassInfo.java
similarity index 100%
rename from src/org/umlgraph/doclet/ClassInfo.java
rename to src/main/java/org/umlgraph/doclet/ClassInfo.java
diff --git a/src/org/umlgraph/doclet/ClassMatcher.java b/src/main/java/org/umlgraph/doclet/ClassMatcher.java
similarity index 100%
rename from src/org/umlgraph/doclet/ClassMatcher.java
rename to src/main/java/org/umlgraph/doclet/ClassMatcher.java
diff --git a/src/org/umlgraph/doclet/ContextMatcher.java b/src/main/java/org/umlgraph/doclet/ContextMatcher.java
similarity index 100%
rename from src/org/umlgraph/doclet/ContextMatcher.java
rename to src/main/java/org/umlgraph/doclet/ContextMatcher.java
diff --git a/src/org/umlgraph/doclet/ContextView.java b/src/main/java/org/umlgraph/doclet/ContextView.java
similarity index 100%
rename from src/org/umlgraph/doclet/ContextView.java
rename to src/main/java/org/umlgraph/doclet/ContextView.java
diff --git a/src/org/umlgraph/doclet/InterfaceMatcher.java b/src/main/java/org/umlgraph/doclet/InterfaceMatcher.java
similarity index 100%
rename from src/org/umlgraph/doclet/InterfaceMatcher.java
rename to src/main/java/org/umlgraph/doclet/InterfaceMatcher.java
diff --git a/src/org/umlgraph/doclet/OptionProvider.java b/src/main/java/org/umlgraph/doclet/OptionProvider.java
similarity index 100%
rename from src/org/umlgraph/doclet/OptionProvider.java
rename to src/main/java/org/umlgraph/doclet/OptionProvider.java
diff --git a/src/org/umlgraph/doclet/Options.java b/src/main/java/org/umlgraph/doclet/Options.java
similarity index 100%
rename from src/org/umlgraph/doclet/Options.java
rename to src/main/java/org/umlgraph/doclet/Options.java
diff --git a/src/org/umlgraph/doclet/PackageMatcher.java b/src/main/java/org/umlgraph/doclet/PackageMatcher.java
similarity index 100%
rename from src/org/umlgraph/doclet/PackageMatcher.java
rename to src/main/java/org/umlgraph/doclet/PackageMatcher.java
diff --git a/src/org/umlgraph/doclet/PackageView.java b/src/main/java/org/umlgraph/doclet/PackageView.java
similarity index 100%
rename from src/org/umlgraph/doclet/PackageView.java
rename to src/main/java/org/umlgraph/doclet/PackageView.java
diff --git a/src/org/umlgraph/doclet/PatternMatcher.java b/src/main/java/org/umlgraph/doclet/PatternMatcher.java
similarity index 100%
rename from src/org/umlgraph/doclet/PatternMatcher.java
rename to src/main/java/org/umlgraph/doclet/PatternMatcher.java
diff --git a/src/org/umlgraph/doclet/RelationDirection.java b/src/main/java/org/umlgraph/doclet/RelationDirection.java
similarity index 100%
rename from src/org/umlgraph/doclet/RelationDirection.java
rename to src/main/java/org/umlgraph/doclet/RelationDirection.java
diff --git a/src/org/umlgraph/doclet/RelationPattern.java b/src/main/java/org/umlgraph/doclet/RelationPattern.java
similarity index 100%
rename from src/org/umlgraph/doclet/RelationPattern.java
rename to src/main/java/org/umlgraph/doclet/RelationPattern.java
diff --git a/src/org/umlgraph/doclet/RelationType.java b/src/main/java/org/umlgraph/doclet/RelationType.java
similarity index 100%
rename from src/org/umlgraph/doclet/RelationType.java
rename to src/main/java/org/umlgraph/doclet/RelationType.java
diff --git a/src/org/umlgraph/doclet/Shape.java b/src/main/java/org/umlgraph/doclet/Shape.java
similarity index 100%
rename from src/org/umlgraph/doclet/Shape.java
rename to src/main/java/org/umlgraph/doclet/Shape.java
diff --git a/src/org/umlgraph/doclet/StringUtil.java b/src/main/java/org/umlgraph/doclet/StringUtil.java
similarity index 100%
rename from src/org/umlgraph/doclet/StringUtil.java
rename to src/main/java/org/umlgraph/doclet/StringUtil.java
diff --git a/src/org/umlgraph/doclet/SubclassMatcher.java b/src/main/java/org/umlgraph/doclet/SubclassMatcher.java
similarity index 100%
rename from src/org/umlgraph/doclet/SubclassMatcher.java
rename to src/main/java/org/umlgraph/doclet/SubclassMatcher.java
diff --git a/src/org/umlgraph/doclet/UMLOptions.java b/src/main/java/org/umlgraph/doclet/UMLOptions.java
similarity index 100%
rename from src/org/umlgraph/doclet/UMLOptions.java
rename to src/main/java/org/umlgraph/doclet/UMLOptions.java
diff --git a/src/org/umlgraph/doclet/UmlGraph.java b/src/main/java/org/umlgraph/doclet/UmlGraph.java
similarity index 100%
rename from src/org/umlgraph/doclet/UmlGraph.java
rename to src/main/java/org/umlgraph/doclet/UmlGraph.java
diff --git a/src/org/umlgraph/doclet/UmlGraphDoc.java b/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java
similarity index 100%
rename from src/org/umlgraph/doclet/UmlGraphDoc.java
rename to src/main/java/org/umlgraph/doclet/UmlGraphDoc.java
diff --git a/src/org/umlgraph/doclet/View.java b/src/main/java/org/umlgraph/doclet/View.java
similarity index 100%
rename from src/org/umlgraph/doclet/View.java
rename to src/main/java/org/umlgraph/doclet/View.java
diff --git a/src/org/umlgraph/doclet/Visibility.java b/src/main/java/org/umlgraph/doclet/Visibility.java
similarity index 100%
rename from src/org/umlgraph/doclet/Visibility.java
rename to src/main/java/org/umlgraph/doclet/Visibility.java
diff --git a/src/org/umlgraph/doclet/WrappedClassDoc.java b/src/main/java/org/umlgraph/doclet/WrappedClassDoc.java
similarity index 100%
rename from src/org/umlgraph/doclet/WrappedClassDoc.java
rename to src/main/java/org/umlgraph/doclet/WrappedClassDoc.java
diff --git a/src/org/umlgraph/doclet/WrappedRootDoc.java b/src/main/java/org/umlgraph/doclet/WrappedRootDoc.java
similarity index 100%
rename from src/org/umlgraph/doclet/WrappedRootDoc.java
rename to src/main/java/org/umlgraph/doclet/WrappedRootDoc.java
diff --git a/src/org/umlgraph/test/BasicTest.java b/src/main/java/org/umlgraph/test/BasicTest.java
similarity index 100%
rename from src/org/umlgraph/test/BasicTest.java
rename to src/main/java/org/umlgraph/test/BasicTest.java
diff --git a/src/org/umlgraph/test/DotDiff.java b/src/main/java/org/umlgraph/test/DotDiff.java
similarity index 100%
rename from src/org/umlgraph/test/DotDiff.java
rename to src/main/java/org/umlgraph/test/DotDiff.java
diff --git a/src/org/umlgraph/test/RunDoc.java b/src/main/java/org/umlgraph/test/RunDoc.java
similarity index 100%
rename from src/org/umlgraph/test/RunDoc.java
rename to src/main/java/org/umlgraph/test/RunDoc.java
diff --git a/src/org/umlgraph/test/RunOne.java b/src/main/java/org/umlgraph/test/RunOne.java
similarity index 100%
rename from src/org/umlgraph/test/RunOne.java
rename to src/main/java/org/umlgraph/test/RunOne.java
diff --git a/src/org/umlgraph/test/SimpleFileFilter.java b/src/main/java/org/umlgraph/test/SimpleFileFilter.java
similarity index 100%
rename from src/org/umlgraph/test/SimpleFileFilter.java
rename to src/main/java/org/umlgraph/test/SimpleFileFilter.java
diff --git a/src/org/umlgraph/test/TestUtils.java b/src/main/java/org/umlgraph/test/TestUtils.java
similarity index 100%
rename from src/org/umlgraph/test/TestUtils.java
rename to src/main/java/org/umlgraph/test/TestUtils.java
diff --git a/src/org/umlgraph/test/UmlDocTest.java b/src/main/java/org/umlgraph/test/UmlDocTest.java
similarity index 100%
rename from src/org/umlgraph/test/UmlDocTest.java
rename to src/main/java/org/umlgraph/test/UmlDocTest.java

From 897edbda76715a8615db9d3c645eb0339041818f Mon Sep 17 00:00:00 2001
From: Georgios Gousios <gousiosg@gmail.com>
Date: Wed, 27 Jun 2012 17:55:57 +0200
Subject: [PATCH 2/9] Produce Javadoc and src jars

---
 pom.xml | 125 +++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 74 insertions(+), 51 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5641821..3a0489e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,51 +1,74 @@
-<?xml version="1.0"?>
-<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>
-  <groupId>org.umlgraph</groupId>
-  <artifactId>umlgraph</artifactId>
-  <packaging>jar</packaging>
-  <name>UMLGraph</name>
-  <version>5.6.0-SNAPSHOT</version>
-  <description>Declarative Drawing of UML Diagrams</description>
-  <url>http://www.umlgraph.org</url>
-
-  <licenses>
-    <license>
-      <name>BSD License (original)</name>
-      <url>http://www.opensource.org/licenses/bsd-license.php</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <scm>
-    <url>https://github.com/dspinellis/UMLGraph</url>
-    <connection>git://github.com/dspinellis/UMLGraph.git</connection>
-  </scm>
-
-  <developers>
-    <developer>
-      <id>dspinellis</id>
-      <name>Diomidis Spinellis</name>
-      <email>dds@aueb.gr</email>
-    </developer>
-  </developers>
-
-  <dependencies/>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-release-plugin</artifactId>
-        <version>2.2.1</version>
-        <configuration>
-          <preparationGoals>clean verify</preparationGoals>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
+<?xml version="1.0"?>
+<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>
+  <groupId>org.umlgraph</groupId>
+  <artifactId>umlgraph</artifactId>
+  <packaging>jar</packaging>
+  <name>UMLGraph</name>
+  <version>5.6.0-SNAPSHOT</version>
+  <description>Declarative Drawing of UML Diagrams</description>
+  <url>http://www.umlgraph.org</url>
+
+  <licenses>
+    <license>
+      <name>BSD License (original)</name>
+      <url>http://www.opensource.org/licenses/bsd-license.php</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+
+  <scm>
+    <url>https://github.com/dspinellis/UMLGraph</url>
+    <connection>git://github.com/dspinellis/UMLGraph.git</connection>
+  </scm>
+
+  <developers>
+    <developer>
+      <id>dspinellis</id>
+      <name>Diomidis Spinellis</name>
+      <email>dds@aueb.gr</email>
+    </developer>
+  </developers>
+
+  <dependencies/>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-release-plugin</artifactId>
+        <version>2.2.1</version>
+        <configuration>
+          <preparationGoals>clean verify</preparationGoals>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-javadocs</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

From 381301b1e3d3c9610e7a9209243738633f16e815 Mon Sep 17 00:00:00 2001
From: Georgios Gousios <gousiosg@gmail.com>
Date: Wed, 27 Jun 2012 18:31:33 +0200
Subject: [PATCH 3/9] Move test sources to Maven standard test dir

---
 src/main/resources/version.properties                           | 0
 src/{main => test}/java/org/umlgraph/test/BasicTest.java        | 0
 src/{main => test}/java/org/umlgraph/test/DotDiff.java          | 0
 src/{main => test}/java/org/umlgraph/test/RunDoc.java           | 0
 src/{main => test}/java/org/umlgraph/test/RunOne.java           | 0
 src/{main => test}/java/org/umlgraph/test/SimpleFileFilter.java | 0
 src/{main => test}/java/org/umlgraph/test/TestUtils.java        | 0
 src/{main => test}/java/org/umlgraph/test/UmlDocTest.java       | 0
 8 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/main/resources/version.properties
 rename src/{main => test}/java/org/umlgraph/test/BasicTest.java (100%)
 rename src/{main => test}/java/org/umlgraph/test/DotDiff.java (100%)
 rename src/{main => test}/java/org/umlgraph/test/RunDoc.java (100%)
 rename src/{main => test}/java/org/umlgraph/test/RunOne.java (100%)
 rename src/{main => test}/java/org/umlgraph/test/SimpleFileFilter.java (100%)
 rename src/{main => test}/java/org/umlgraph/test/TestUtils.java (100%)
 rename src/{main => test}/java/org/umlgraph/test/UmlDocTest.java (100%)

diff --git a/src/main/resources/version.properties b/src/main/resources/version.properties
new file mode 100644
index 0000000..e69de29
diff --git a/src/main/java/org/umlgraph/test/BasicTest.java b/src/test/java/org/umlgraph/test/BasicTest.java
similarity index 100%
rename from src/main/java/org/umlgraph/test/BasicTest.java
rename to src/test/java/org/umlgraph/test/BasicTest.java
diff --git a/src/main/java/org/umlgraph/test/DotDiff.java b/src/test/java/org/umlgraph/test/DotDiff.java
similarity index 100%
rename from src/main/java/org/umlgraph/test/DotDiff.java
rename to src/test/java/org/umlgraph/test/DotDiff.java
diff --git a/src/main/java/org/umlgraph/test/RunDoc.java b/src/test/java/org/umlgraph/test/RunDoc.java
similarity index 100%
rename from src/main/java/org/umlgraph/test/RunDoc.java
rename to src/test/java/org/umlgraph/test/RunDoc.java
diff --git a/src/main/java/org/umlgraph/test/RunOne.java b/src/test/java/org/umlgraph/test/RunOne.java
similarity index 100%
rename from src/main/java/org/umlgraph/test/RunOne.java
rename to src/test/java/org/umlgraph/test/RunOne.java
diff --git a/src/main/java/org/umlgraph/test/SimpleFileFilter.java b/src/test/java/org/umlgraph/test/SimpleFileFilter.java
similarity index 100%
rename from src/main/java/org/umlgraph/test/SimpleFileFilter.java
rename to src/test/java/org/umlgraph/test/SimpleFileFilter.java
diff --git a/src/main/java/org/umlgraph/test/TestUtils.java b/src/test/java/org/umlgraph/test/TestUtils.java
similarity index 100%
rename from src/main/java/org/umlgraph/test/TestUtils.java
rename to src/test/java/org/umlgraph/test/TestUtils.java
diff --git a/src/main/java/org/umlgraph/test/UmlDocTest.java b/src/test/java/org/umlgraph/test/UmlDocTest.java
similarity index 100%
rename from src/main/java/org/umlgraph/test/UmlDocTest.java
rename to src/test/java/org/umlgraph/test/UmlDocTest.java

From f309d89222b3a0033b1bced96ee1766f41a0f27f Mon Sep 17 00:00:00 2001
From: Georgios Gousios <gousiosg@gmail.com>
Date: Wed, 27 Jun 2012 18:35:02 +0200
Subject: [PATCH 4/9] Do not autogenerate Version class on every compile.

Instead, use a properties template file and Maven filtering
to set the correct version while building the output jar.
At runtime, load the properties file from the classpath and
statically initialize the version parameter.
---
 pom.xml                                       |  6 ++++
 .../java/org/umlgraph/doclet/Version.java     | 29 +++++++++++++++++++
 src/main/resources/version.properties         |  1 +
 3 files changed, 36 insertions(+)
 create mode 100644 src/main/java/org/umlgraph/doclet/Version.java

diff --git a/pom.xml b/pom.xml
index 3a0489e..d6dab5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,6 +36,12 @@
   <dependencies/>
 
   <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
diff --git a/src/main/java/org/umlgraph/doclet/Version.java b/src/main/java/org/umlgraph/doclet/Version.java
new file mode 100644
index 0000000..3db05df
--- /dev/null
+++ b/src/main/java/org/umlgraph/doclet/Version.java
@@ -0,0 +1,29 @@
+package org.umlgraph.doclet;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+class Version {
+    private final static String filename = "version.properties";
+    private final static String key = "umlgraph.version";
+    public static String VERSION;
+
+    static {
+        Properties props = new Properties();
+        InputStream in = Version.class.getClassLoader().getResourceAsStream(filename);
+        try {
+            props.load(in);
+            if (props.get(key) == null) {
+                System.err.println("Could not find version property");
+                VERSION = "0";
+            } else {
+                VERSION = props.get(key).toString();
+            }
+
+            in.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/src/main/resources/version.properties b/src/main/resources/version.properties
index e69de29..3d3ff90 100644
--- a/src/main/resources/version.properties
+++ b/src/main/resources/version.properties
@@ -0,0 +1 @@
+umlgraph.version=${pom.version}
\ No newline at end of file

From ce821892f25bb380390897d7d43472e1fa263f68 Mon Sep 17 00:00:00 2001
From: Georgios Gousios <gousiosg@gmail.com>
Date: Wed, 27 Jun 2012 18:39:54 +0200
Subject: [PATCH 5/9] Don't ignore Version.java. Ignore Intellij project files.

---
 .gitignore                                   | 5 +++++
 src/main/java/org/umlgraph/doclet/.gitignore | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)
 delete mode 100644 src/main/java/org/umlgraph/doclet/.gitignore

diff --git a/.gitignore b/.gitignore
index 8c01957..913f358 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,9 @@ UMLGraph-R*
 CHECKSUM.MD5
 _vimrc
 target
+*.iml
+*.iws
+*.ipr
+*.swp
+*.DS_Store
 
diff --git a/src/main/java/org/umlgraph/doclet/.gitignore b/src/main/java/org/umlgraph/doclet/.gitignore
deleted file mode 100644
index a953aa4..0000000
--- a/src/main/java/org/umlgraph/doclet/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Version.java

From 841067cda121e3c396af9ff120a0f176a71f2ddc Mon Sep 17 00:00:00 2001
From: Georgios Gousios <gousiosg@gmail.com>
Date: Wed, 27 Jun 2012 19:32:07 +0200
Subject: [PATCH 6/9] Generate UmlGraph-based Javadoc

---
 pom.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pom.xml b/pom.xml
index d6dab5a..7be83a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,6 +66,22 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
+          <docletPath>${project.build.directory}${file.separator}${project.build.finalName}.jar</docletPath>
+          <additionalparam>-inferrel</additionalparam>
+          <additionalparam>-inferdep</additionalparam>
+          <additionalparam>-collapsible</additionalparam>
+          <additionalparam>-hide java.*</additionalparam>
+          <additionalparam>-collpackages</additionalparam>
+          <additionalparam>-qualify</additionalparam>
+          <additionalparam>-postfixpackage</additionalparam>
+          <additionalparam>-nodefontsize 9</additionalparam>
+          <additionalparam>-nodefontpackagesize 7</additionalparam>
+          <additionalparam>-link http://docs.oracle.com/javase/7/docs/jdk/api/javadoc/doclet/</additionalparam>
+          <additionalparam>-link http://download.oracle.com/javase/7/docs/api/</additionalparam>
+          <useStandardDocletOptions>true</useStandardDocletOptions>
+        </configuration>
         <executions>
           <execution>
             <id>attach-javadocs</id>

From a000667eac65d1856197187163c7461b083ae238 Mon Sep 17 00:00:00 2001
From: Georgios Gousios <gousiosg@gmail.com>
Date: Wed, 27 Jun 2012 19:32:24 +0200
Subject: [PATCH 7/9] Include main class in jar manifest file

---
 pom.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pom.xml b/pom.xml
index 7be83a5..463b03c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,18 @@
       </resource>
     </resources>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifest>
+              <addClasspath>true</addClasspath>
+              <mainClass>org.umlgraph.doclet.UmlGraph</mainClass>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>

From 72a7eef460fba8ca173373a92a318265ff1f4810 Mon Sep 17 00:00:00 2001
From: Georgios Gousios <gousiosg@gmail.com>
Date: Wed, 27 Jun 2012 19:35:13 +0200
Subject: [PATCH 8/9] Correctly formatted SCM URL

---
 pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 463b03c..f7ef451 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
 
   <scm>
     <url>https://github.com/dspinellis/UMLGraph</url>
-    <connection>git://github.com/dspinellis/UMLGraph.git</connection>
+    <connection>scm:git://github.com/dspinellis/UMLGraph.git</connection>
   </scm>
 
   <developers>
@@ -58,7 +58,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>
-        <version>2.2.1</version>
         <configuration>
           <preparationGoals>clean verify</preparationGoals>
         </configuration>

From 0508d2e2e8c624d56d2e6cce1ebf7edb1e991513 Mon Sep 17 00:00:00 2001
From: Georgios Gousios <gousiosg@gmail.com>
Date: Wed, 27 Jun 2012 20:43:36 +0200
Subject: [PATCH 9/9] Add developerConnection link

---
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f7ef451..832fc1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,8 +21,9 @@
   </licenses>
 
   <scm>
-    <url>https://github.com/dspinellis/UMLGraph</url>
+    <url>https://github.com/dspinellis/UMLGraph/</url>
     <connection>scm:git://github.com/dspinellis/UMLGraph.git</connection>
+    <developerConnection>scm:git:git@github.com:dspinellis/UMLGraph.git</developerConnection>
   </scm>
 
   <developers>