erge branch 'develop'

misberner · misberner · commit 813e10981006 · 2015-01-16T10:34:42.000+01:00
Conflicts:
	algorithms/dhc/pom.xml
	algorithms/discrimination-tree/pom.xml
	algorithms/features/pom.xml
	algorithms/kearns-vazirani/pom.xml
	algorithms/lstar-baseline/pom.xml
	algorithms/lstar-generic/pom.xml
	algorithms/nlstar/pom.xml
	algorithms/pom.xml
	algorithms/ttt/pom.xml
	archetypes/complete/pom.xml
	archetypes/core/pom.xml
	archetypes/pom.xml
	archetypes/typical/pom.xml
	build-tools/pom.xml
	core/pom.xml
	distribution/pom.xml
	drivers/basic/pom.xml
	drivers/mapper/pom.xml
	drivers/pom.xml
	eqtests/basic-eqtests/pom.xml
	eqtests/pom.xml
	examples/pom.xml
	filters/cache/pom.xml
	filters/pom.xml
	filters/reuse/pom.xml
	pom.xml
	simulator/pom.xml
	test-support/learner-it-support/pom.xml
	test-support/learning-examples/pom.xml
	test-support/pom.xml
	utils/acex/pom.xml
	utils/counterexamples/pom.xml
	utils/parallelism/pom.xml
	utils/pom.xml
diff --git a/algorithms/dhc/pom.xml b/algorithms/dhc/pom.xml
@@ -23,7 +23,7 @@ http://www.gnu.de/documents/lgpl.en.html.
 	<parent>
 		<artifactId>learnlib-algorithms</artifactId>
 		<groupId>de.learnlib</groupId>
-		<version>0.11.1</version>
+		<version>0.11.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>        
 	</parent>
 
diff --git a/algorithms/discrimination-tree/pom.xml b/algorithms/discrimination-tree/pom.xml
@@ -23,7 +23,7 @@ http://www.gnu.de/documents/lgpl.en.html.
 	<parent>
 		<artifactId>learnlib-algorithms</artifactId>
 		<groupId>de.learnlib</groupId>
-		<version>0.11.1</version>
+		<version>0.11.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>        
 	</parent>
 
diff --git a/algorithms/features/pom.xml b/algorithms/features/pom.xml
@@ -23,7 +23,7 @@ http://www.gnu.de/documents/lgpl.en.html.
 	<parent>
 		<artifactId>learnlib-algorithms</artifactId>
 		<groupId>de.learnlib</groupId>
-		<version>0.11.1</version>
+		<version>0.11.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>        
 	</parent>
 
diff --git a/algorithms/kearns-vazirani/pom.xml b/algorithms/kearns-vazirani/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>de.learnlib</groupId>
     <artifactId>learnlib-algorithms</artifactId>
-    <version>0.11.1</version>
+    <version>0.11.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>learnlib-kearns-vazirani</artifactId>
diff --git a/algorithms/lstar-baseline/pom.xml b/algorithms/lstar-baseline/pom.xml
@@ -23,7 +23,7 @@ http://www.gnu.de/documents/lgpl.en.html.
 	<parent>
 		<artifactId>learnlib-algorithms</artifactId>
 		<groupId>de.learnlib</groupId>
-		<version>0.11.1</version>
+		<version>0.11.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>        
 	</parent>
 
diff --git a/algorithms/lstar-generic/pom.xml b/algorithms/lstar-generic/pom.xml
@@ -23,7 +23,7 @@ http://www.gnu.de/documents/lgpl.en.html.
 	<parent>
 		<artifactId>learnlib-algorithms</artifactId>
 		<groupId>de.learnlib</groupId>
-		<version>0.11.1</version>
+		<version>0.11.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>        
 	</parent>
 
diff --git a/algorithms/nlstar/pom.xml b/algorithms/nlstar/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>de.learnlib</groupId>
     <artifactId>learnlib-algorithms</artifactId>
-    <version>0.11.1</version>
+    <version>0.11.1-SNAPSHOT</version>
   </parent>
   <artifactId>learnlib-nlstar</artifactId>
   <dependencies>
diff --git a/algorithms/pom.xml b/algorithms/pom.xml
@@ -23,7 +23,7 @@ http://www.gnu.de/documents/lgpl.en.html.
 	<parent>
 		<artifactId>learnlib-parent</artifactId>
 		<groupId>de.learnlib</groupId>
-		<version>0.11.1</version>
+		<version>0.11.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>        
 	</parent>
 
diff --git a/algorithms/ttt/pom.xml b/algorithms/ttt/pom.xml
@@ -23,7 +23,7 @@ http://www.gnu.de/documents/lgpl.en.html.
 	<parent>
 		<artifactId>learnlib-algorithms</artifactId>
 		<groupId>de.learnlib</groupId>
-		<version>0.11.1</version>
+		<version>0.11.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>        
 	</parent>
 
diff --git a/archetypes/complete/pom.xml b/archetypes/complete/pom.xml
@@ -29,7 +29,7 @@ http://www.gnu.de/documents/lgpl.en.html.
 	<parent>
 		<groupId>de.learnlib.archetypes</groupId>
 		<artifactId>learnlib-archetypes-parent</artifactId>
-		<version>0.11.1</version>
+		<version>0.11.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/archetypes/core/pom.xml b/archetypes/core/pom.xml
@@ -29,7 +29,7 @@ http://www.gnu.de/documents/lgpl.en.html.
 	<parent>
 		<groupId>de.learnlib.archetypes</groupId>
 		<artifactId>learnlib-archetypes-parent</artifactId>
-		<version>0.11.1</version>
+		<version>0.11.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
@@ -31,7 +31,7 @@ http://www.gnu.de/documents/lgpl.en.html.
 	<parent>
 		<groupId>de.learnlib</groupId>
 		<artifactId>learnlib-parent</artifactId>
-		<version>0.11.1</version>
+		<version>0.11.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/archetypes/typical/pom.xml b/archetypes/typical/pom.xml
@@ -29,7 +29,7 @@ http://www.gnu.de/documents/lgpl.en.html.
 	<parent>
 		<groupId>de.learnlib.archetypes</groupId>
 		<artifactId>learnlib-archetypes-parent</artifactId>
-		<version>0.11.1</version>
+		<version>0.11.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/build-tools/pom.xml b/build-tools/pom.xml
@@ -23,7 +23,7 @@ http://www.gnu.de/documents/lgpl.en.html.
 	<parent>
 		<artifactId>learnlib-parent</artifactId>
 		<groupId>de.learnlib</groupId>
-		<version>0.11.1</version>
+		<version>0.11.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>        
 	</parent>
 
diff --git a/core/pom.xml b/core/pom.xml
@@ -23,7 +23,7 @@ http://www.gnu.de/documents/lgpl.en.html.
 	<parent>
 		<artifactId>learnlib-parent</artifactId>
 		<groupId>de.learnlib</groupId>
-		<version>0.11.1</version>
+		<version>0.11.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>        
 	</parent>
 
diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -21,7 +21,7 @@ http://www.gnu.de/documents/lgpl.en.html.
 	<parent>
 		<groupId>de.learnlib</groupId>
 		<artifactId>learnlib-parent</artifactId>
-		<version>0.11.1</version>
+		<version>0.11.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/drivers/basic/pom.xml b/drivers/basic/pom.xml
@@ -23,7 +23,7 @@ http://www.gnu.de/documents/lgpl.en.html.
 	<parent>
 		<artifactId>learnlib-drivers</artifactId>
 		<groupId>de.learnlib</groupId>
-		<version>0.11.1</version>
+		<version>0.11.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>        
 	</parent>
 
diff --git a/drivers/mapper/pom.xml b/drivers/mapper/pom.xml
@@ -21,7 +21,7 @@ http://www.gnu.de/documents/lgpl.en.html.
   <parent>
     <groupId>de.learnlib</groupId>
     <artifactId>learnlib-drivers</artifactId>
-    <version>0.11.1</version>
+    <version>0.11.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/drivers/pom.xml b/drivers/pom.xml
@@ -23,7 +23,7 @@ http://www.gnu.de/documents/lgpl.en.html.
 	<parent>
 		<artifactId>learnlib-parent</artifactId>
 		<groupId>de.learnlib</groupId>
-		<version>0.11.1</version>
+		<version>0.11.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>        
 	</parent>
 
diff --git a/eqtests/basic-eqtests/pom.xml b/eqtests/basic-eqtests/pom.xml
@@ -23,7 +23,7 @@ http://www.gnu.de/documents/lgpl.en.html.
 	<parent>
 		<artifactId>learnlib-eqtests</artifactId>
 		<groupId>de.learnlib</groupId>
-		<version>0.11.1</version>
+		<version>0.11.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>        
 	</parent>
 
diff --git a/eqtests/pom.xml b/eqtests/pom.xml
@@ -23,7 +23,7 @@ http://www.gnu.de/documents/lgpl.en.html.
 	<parent>
 		<artifactId>learnlib-parent</artifactId>
 		<groupId>de.learnlib</groupId>
-		<version>0.11.1</version>
+		<version>0.11.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>        
 	</parent>
 
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -23,7 +23,7 @@ http://www.gnu.de/documents/lgpl.en.html.
 	<parent>
 		<artifactId>learnlib-parent</artifactId>
 		<groupId>de.learnlib</groupId>
-		<version>0.11.1</version>
+		<version>0.11.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>        
 	</parent>
 
diff --git a/filters/cache/pom.xml b/filters/cache/pom.xml
@@ -23,7 +23,7 @@ http://www.gnu.de/documents/lgpl.en.html.
 	<parent>
 		<artifactId>learnlib-filters</artifactId>
 		<groupId>de.learnlib</groupId>
-		<version>0.11.1</version>
+		<version>0.11.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>        
 	</parent>
 
diff --git a/filters/pom.xml b/filters/pom.xml
@@ -23,7 +23,7 @@ http://www.gnu.de/documents/lgpl.en.html.
 	<parent>
 		<artifactId>learnlib-parent</artifactId>
 		<groupId>de.learnlib</groupId>
-		<version>0.11.1</version>
+		<version>0.11.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>        
 	</parent>
 
diff --git a/filters/reuse/pom.xml b/filters/reuse/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>learnlib-filters</artifactId>
 		<groupId>de.learnlib</groupId>
-		<version>0.11.1</version>
+		<version>0.11.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,7 @@ http://www.gnu.de/documents/lgpl.en.html.
 	-->
 	<groupId>de.learnlib</groupId>
 	<artifactId>learnlib-parent</artifactId>
-	<version>0.11.1</version>
+	<version>0.11.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>LearnLib</name>
 	<url>http://learnlib.github.io/learnlib/maven-site/${project.version}</url>
@@ -78,7 +78,7 @@ http://www.gnu.de/documents/lgpl.en.html.
 		<connection>scm:git:git@github.com:LearnLib/learnlib.git</connection>
 		<developerConnection>scm:git:git@github.com:LearnLib/learnlib.git</developerConnection>
 		<url>https://github.com/LearnLib/learnlib/tree/develop</url>
-	  <tag>learnlib-0.11.1</tag>
+	  <tag>HEAD</tag>
   </scm>
 
 
@@ -121,7 +121,7 @@ http://www.gnu.de/documents/lgpl.en.html.
 		<automatalib.version>0.5.1</automatalib.version>
 		<testng.version>6.8.8</testng.version>
 		<javadoc-plugin.version>2.10.1</javadoc-plugin.version>
-		<compiler-plugin.version>3.2</compiler-plugin.version>
+		<compiler-plugin.version>3.1</compiler-plugin.version>
 		<release-plugin.version>2.5.1</release-plugin.version>
 		<checkstyle-plugin.version>2.10</checkstyle-plugin.version>
 		<jdiff-plugin.version>1.0-beta-1</jdiff-plugin.version>
diff --git a/simulator/pom.xml b/simulator/pom.xml
@@ -23,7 +23,7 @@ http://www.gnu.de/documents/lgpl.en.html.
 	<parent>
 		<artifactId>learnlib-parent</artifactId>
 		<groupId>de.learnlib</groupId>
-		<version>0.11.1</version>
+		<version>0.11.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>        
 	</parent>
 
diff --git a/test-support/learner-it-support/pom.xml b/test-support/learner-it-support/pom.xml
@@ -22,7 +22,7 @@ http://www.gnu.de/documents/lgpl.en.html.
 	<parent>
 		<artifactId>learnlib-test-support-parent</artifactId>
 		<groupId>de.learnlib.testsupport</groupId>
-		<version>0.11.1</version>
+		<version>0.11.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>        
 	</parent>
 
diff --git a/test-support/learning-examples/pom.xml b/test-support/learning-examples/pom.xml
@@ -22,7 +22,7 @@ http://www.gnu.de/documents/lgpl.en.html.
 	<parent>
 		<artifactId>learnlib-test-support-parent</artifactId>
 		<groupId>de.learnlib.testsupport</groupId>
-		<version>0.11.1</version>
+		<version>0.11.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>        
 	</parent>
 
diff --git a/test-support/pom.xml b/test-support/pom.xml
@@ -22,7 +22,7 @@ http://www.gnu.de/documents/lgpl.en.html.
 	<parent>
 		<artifactId>learnlib-parent</artifactId>
 		<groupId>de.learnlib</groupId>
-		<version>0.11.1</version>
+		<version>0.11.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>        
 	</parent>
 
diff --git a/utils/acex/pom.xml b/utils/acex/pom.xml
@@ -23,7 +23,7 @@ http://www.gnu.de/documents/lgpl.en.html.
 	<parent>
 		<artifactId>learnlib-utils</artifactId>
 		<groupId>de.learnlib</groupId>
-		<version>0.11.1</version>
+		<version>0.11.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>        
 	</parent>
 
diff --git a/utils/counterexamples/pom.xml b/utils/counterexamples/pom.xml
@@ -23,7 +23,7 @@ http://www.gnu.de/documents/lgpl.en.html.
 	<parent>
 		<artifactId>learnlib-utils</artifactId>
 		<groupId>de.learnlib</groupId>
-		<version>0.11.1</version>
+		<version>0.11.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>        
 	</parent>
 
diff --git a/utils/parallelism/pom.xml b/utils/parallelism/pom.xml
@@ -23,7 +23,7 @@ http://www.gnu.de/documents/lgpl.en.html.
 	<parent>
 		<artifactId>learnlib-utils</artifactId>
 		<groupId>de.learnlib</groupId>
-		<version>0.11.1</version>
+		<version>0.11.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>        
 	</parent>
 
diff --git a/utils/pom.xml b/utils/pom.xml
@@ -23,7 +23,7 @@ http://www.gnu.de/documents/lgpl.en.html.
 	<parent>
 		<artifactId>learnlib-parent</artifactId>
 		<groupId>de.learnlib</groupId>
-		<version>0.11.1</version>
+		<version>0.11.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>        
 	</parent>
 
