From 9dbe595489adfdbae0b8edd750fdb6bcafbd65c1 Mon Sep 17 00:00:00 2001
From: Constantin Jucovschi <jucovschi@gmail.com>
Date: Tue, 15 Apr 2014 14:51:43 +0200
Subject: [PATCH] better pom versions

---
 MathHubWorker/.classpath                      |  4 ++--
 .../.settings/org.eclipse.jdt.core.prefs      |  6 +++---
 MathHubWorker/pom.xml                         | 15 +++++++++++----
 activemq/.classpath                           |  4 ++--
 activemq/.settings/org.eclipse.jdt.core.prefs |  6 +++---
 activemq/pom.xml                              | 11 ++++++++---
 core/.classpath                               |  4 ++--
 core/.settings/org.eclipse.jdt.core.prefs     |  6 +++---
 core/pom.xml                                  | 10 +++++++++-
 docmanager/.classpath                         |  4 ++--
 .../.settings/org.eclipse.jdt.core.prefs      |  6 +++---
 docmanager/pom.xml                            | 19 ++++++++++---------
 planetary/.classpath                          |  4 ++--
 .../.settings/org.eclipse.jdt.core.prefs      |  6 +++---
 planetary/pom.xml                             | 10 ++++++++--
 pom.xml                                       |  7 ++++++-
 servlet/.classpath                            |  4 ++--
 servlet/.settings/org.eclipse.jdt.core.prefs  |  6 +++---
 servlet/pom.xml                               | 11 +++++++++--
 19 files changed, 91 insertions(+), 52 deletions(-)

diff --git a/MathHubWorker/.classpath b/MathHubWorker/.classpath
index 395dbde..7d92d53 100644
--- a/MathHubWorker/.classpath
+++ b/MathHubWorker/.classpath
@@ -13,12 +13,12 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry including="**/*.java" kind="src" path="src/main/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/MathHubWorker/.settings/org.eclipse.jdt.core.prefs b/MathHubWorker/.settings/org.eclipse.jdt.core.prefs
index abec6ca..ec4300d 100644
--- a/MathHubWorker/.settings/org.eclipse.jdt.core.prefs
+++ b/MathHubWorker/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,5 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/MathHubWorker/pom.xml b/MathHubWorker/pom.xml
index a47747d..54db0c2 100644
--- a/MathHubWorker/pom.xml
+++ b/MathHubWorker/pom.xml
@@ -19,7 +19,14 @@
 
 	<groupId>info.kwarc.sally4</groupId>
 	<artifactId>MathHubWorker</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>${sally4.version}</version>
+
+	<parent>
+		<groupId>info.kwarc.sally</groupId>
+		<artifactId>sally</artifactId>
+		<version>1.0</version>
+		<relativePath>..</relativePath>
+	</parent>
 
 
 	<dependencies>
@@ -45,20 +52,20 @@
 		<dependency>
 			<groupId>info.kwarc.sally4</groupId>
 			<artifactId>core</artifactId>
-			<version>0.0.2-SNAPSHOT</version>
+			<version>${sally4.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>info.kwarc.sally4</groupId>
 			<artifactId>planetary</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>${sally4.version}</version>
 		</dependency>
 		
 		
 		<dependency>
 			<groupId>info.kwarc.sally4</groupId>
 			<artifactId>docmanager</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>${sally4.version}</version>
 		</dependency>
 
 	</dependencies>
diff --git a/activemq/.classpath b/activemq/.classpath
index 395dbde..7d92d53 100644
--- a/activemq/.classpath
+++ b/activemq/.classpath
@@ -13,12 +13,12 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry including="**/*.java" kind="src" path="src/main/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/activemq/.settings/org.eclipse.jdt.core.prefs b/activemq/.settings/org.eclipse.jdt.core.prefs
index abec6ca..ec4300d 100644
--- a/activemq/.settings/org.eclipse.jdt.core.prefs
+++ b/activemq/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,5 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/activemq/pom.xml b/activemq/pom.xml
index e37cf54..ebcda8c 100644
--- a/activemq/pom.xml
+++ b/activemq/pom.xml
@@ -19,8 +19,13 @@
 
 	<groupId>info.kwarc.sally4</groupId>
 	<artifactId>activemq</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-
+	<version>${sally4.version}</version>
+	<parent>
+		<groupId>info.kwarc.sally</groupId>
+		<artifactId>sally</artifactId>
+		<version>1.0</version>
+		<relativePath>..</relativePath>
+	</parent>
 
 	<properties>
 		<maven-bundle-plugin.version>2.4.0</maven-bundle-plugin.version>
@@ -70,7 +75,7 @@
 		<dependency>
 			<groupId>info.kwarc.sally4</groupId>
 			<artifactId>core</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>${sally4.version}</version>
 		</dependency>
 
 	</dependencies>
diff --git a/core/.classpath b/core/.classpath
index 9ae7bca..eed8a51 100644
--- a/core/.classpath
+++ b/core/.classpath
@@ -17,12 +17,12 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/core/.settings/org.eclipse.jdt.core.prefs b/core/.settings/org.eclipse.jdt.core.prefs
index abec6ca..ec4300d 100644
--- a/core/.settings/org.eclipse.jdt.core.prefs
+++ b/core/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,5 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/core/pom.xml b/core/pom.xml
index b230ffe..4b36a57 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1,9 +1,17 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>bundle</packaging>
+
+	<parent>
+		<groupId>info.kwarc.sally</groupId>
+		<artifactId>sally</artifactId>
+		<version>1.0</version>
+		<relativePath>..</relativePath>
+	</parent>
+	
 	<groupId>info.kwarc.sally4</groupId>
 	<artifactId>core</artifactId>
-	<version>0.0.2-SNAPSHOT</version>
+	<version>${sally4.version}</version>
 	<name>Sally4 Core</name>
 
 	<properties>
diff --git a/docmanager/.classpath b/docmanager/.classpath
index 395dbde..7d92d53 100644
--- a/docmanager/.classpath
+++ b/docmanager/.classpath
@@ -13,12 +13,12 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry including="**/*.java" kind="src" path="src/main/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/docmanager/.settings/org.eclipse.jdt.core.prefs b/docmanager/.settings/org.eclipse.jdt.core.prefs
index abec6ca..ec4300d 100644
--- a/docmanager/.settings/org.eclipse.jdt.core.prefs
+++ b/docmanager/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,5 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/docmanager/pom.xml b/docmanager/pom.xml
index 6daeb8a..a1d1e5c 100644
--- a/docmanager/pom.xml
+++ b/docmanager/pom.xml
@@ -19,7 +19,14 @@
 
 	<groupId>info.kwarc.sally4</groupId>
 	<artifactId>docmanager</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>${sally4.version}</version>
+
+	<parent>
+		<groupId>info.kwarc.sally</groupId>
+		<artifactId>sally</artifactId>
+		<version>1.0</version>
+		<relativePath>..</relativePath>
+	</parent>
 
 
 	<dependencies>
@@ -33,13 +40,7 @@
 		<dependency>
 			<groupId>info.kwarc.sally4</groupId>
 			<artifactId>activemq</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
-		</dependency>
-
-		<dependency>
-			<groupId>info.kwarc.sally4</groupId>
-			<artifactId>docmanager</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>${sally4.version}</version>
 		</dependency>
 
 		<dependency>
@@ -63,7 +64,7 @@
 		<dependency>
 			<groupId>info.kwarc.sally4</groupId>
 			<artifactId>core</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>${sally4.version}</version>
 		</dependency>
 
 		<dependency>
diff --git a/planetary/.classpath b/planetary/.classpath
index 395dbde..7d92d53 100644
--- a/planetary/.classpath
+++ b/planetary/.classpath
@@ -13,12 +13,12 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry including="**/*.java" kind="src" path="src/main/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/planetary/.settings/org.eclipse.jdt.core.prefs b/planetary/.settings/org.eclipse.jdt.core.prefs
index abec6ca..ec4300d 100644
--- a/planetary/.settings/org.eclipse.jdt.core.prefs
+++ b/planetary/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,5 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/planetary/pom.xml b/planetary/pom.xml
index d92dbff..57a57b7 100644
--- a/planetary/pom.xml
+++ b/planetary/pom.xml
@@ -19,8 +19,14 @@
 
 	<groupId>info.kwarc.sally4</groupId>
 	<artifactId>planetary</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>${sally4.version}</version>
 
+	<parent>
+		<groupId>info.kwarc.sally</groupId>
+		<artifactId>sally</artifactId>
+		<version>1.0</version>
+		<relativePath>..</relativePath>
+	</parent>
 
 	<dependencies>
 		<dependency>
@@ -45,7 +51,7 @@
 		<dependency>
 			<groupId>info.kwarc.sally4</groupId>
 			<artifactId>core</artifactId>
-			<version>0.0.2-SNAPSHOT</version>
+			<version>${sally4.version}</version>
 		</dependency>
 
 
diff --git a/pom.xml b/pom.xml
index a3c61dc..931368c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,13 +8,18 @@
 	<packaging>pom</packaging>
 	<version>1.0</version>
 	<name>Sally Project</name>
-
+	
+	<properties>
+		<sally4.version>0.0.2-SNAPSHOT</sally4.version>
+	</properties>
+	
 	<modules>
 		<module>core</module>
 		<module>docmanager</module>
 		<module>planetary</module>
 		<module>servlet</module>
 		<module>MathHubWorker</module>
+		<module>activemq</module>
 	</modules>
 
 	<build>
diff --git a/servlet/.classpath b/servlet/.classpath
index 395dbde..7d92d53 100644
--- a/servlet/.classpath
+++ b/servlet/.classpath
@@ -13,12 +13,12 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry including="**/*.java" kind="src" path="src/main/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/servlet/.settings/org.eclipse.jdt.core.prefs b/servlet/.settings/org.eclipse.jdt.core.prefs
index abec6ca..ec4300d 100644
--- a/servlet/.settings/org.eclipse.jdt.core.prefs
+++ b/servlet/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,5 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/servlet/pom.xml b/servlet/pom.xml
index 4df724d..8e66f8f 100644
--- a/servlet/pom.xml
+++ b/servlet/pom.xml
@@ -19,7 +19,14 @@
 
 	<groupId>info.kwarc.sally4</groupId>
 	<artifactId>servlet</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>${sally4.version}</version>
+
+	<parent>
+		<groupId>info.kwarc.sally</groupId>
+		<artifactId>sally</artifactId>
+		<version>1.0</version>
+		<relativePath>..</relativePath>
+	</parent>
 
 
 	<properties>
@@ -72,7 +79,7 @@
 		<dependency>
 			<groupId>info.kwarc.sally4</groupId>
 			<artifactId>core</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>${sally4.version}</version>
 		</dependency>
 
 	</dependencies>
-- 
GitLab