Commit Graph

9 Commits

Author SHA1 Message Date
Diomidis Spinellis ef20511703 Merge branch 'master' of github.com:dspinellis/UMLGraph
Conflicts:
	src/main/java/org/umlgraph/doclet/Version.java
2013-05-23 19:53:17 +03:00
Diomidis Spinellis a54b9bfc40 For Maven to work Version.java must exist
New Version.java can be created with "ant version"
2013-05-23 19:44:52 +03:00
Diomidis Spinellis faedc3f0ff Correct handling of Version.java
It is generated automatically from the version and the git hash.
2013-05-23 19:05:57 +03:00
Diomidis Spinellis f6e263028a Merge branch 'master' of https://github.com/Stummi/UMLGraph into Stummi-master 2013-05-23 18:52:27 +03:00
Michael Stummvoll 22bee0462c Merge git://github.com/gousiosg/UMLGraph - base for a fixed maven build 2012-12-17 09:21:32 +01:00
Georgios Gousios ce821892f2 Don't ignore Version.java. Ignore Intellij project files. 2012-06-27 18:39:54 +02:00
Georgios Gousios f309d89222 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.
2012-06-27 18:35:02 +02:00
Georgios Gousios 381301b1e3 Move test sources to Maven standard test dir 2012-06-27 18:31:33 +02:00
Georgios Gousios b8a974e20f Make UMLGraph maven compatible 2012-06-27 17:46:47 +02:00