diff --git a/MathHubWorker/.classpath b/MathHubWorker/.classpath index 395dbde027f67aca1db4bd4d077783059afb3acd..7d92d53d08152103f3fe5cee2d539d88be476d7f 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 abec6ca389ac6331e1f6466d9f67c8dd3406fb5a..ec4300d5d0999d569b87f3935944bcfc5197f877 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 a47747d55b3a951a9f45b0c94a98c6f1571c2001..54db0c23e1c207e33cb965e389d086eac0e68636 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 395dbde027f67aca1db4bd4d077783059afb3acd..7d92d53d08152103f3fe5cee2d539d88be476d7f 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 abec6ca389ac6331e1f6466d9f67c8dd3406fb5a..ec4300d5d0999d569b87f3935944bcfc5197f877 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 e37cf54d20d462b72852f2f23bd9a2d6c2ca0a73..ebcda8c0ca916bba1676d01dac5c230c986a86d7 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 9ae7bca0fcb3390675e369adc223fabd87bf8b08..eed8a51ec51748265dfbc148f4993791c3b1559a 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 abec6ca389ac6331e1f6466d9f67c8dd3406fb5a..ec4300d5d0999d569b87f3935944bcfc5197f877 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 b230ffea742c93b3975f7eb1e784ab239e4a8024..4b36a5790de2e6a45929dd45663f3ceca407feb4 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 395dbde027f67aca1db4bd4d077783059afb3acd..7d92d53d08152103f3fe5cee2d539d88be476d7f 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 abec6ca389ac6331e1f6466d9f67c8dd3406fb5a..ec4300d5d0999d569b87f3935944bcfc5197f877 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 6daeb8ae6d1c21e8717f9ddec63123840dc0e474..a1d1e5c876a25e4be96c1f3e2e5a9d85c37365da 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 395dbde027f67aca1db4bd4d077783059afb3acd..7d92d53d08152103f3fe5cee2d539d88be476d7f 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 abec6ca389ac6331e1f6466d9f67c8dd3406fb5a..ec4300d5d0999d569b87f3935944bcfc5197f877 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 d92dbff1605c22b697bb99e714f81ce000b61965..57a57b7770d522fb75b77f5b0152b93964ac7ca2 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 a3c61dca91102ed2cb480559b3a0a36bcff8b667..931368c5ef173643d03e66c1989a37e27c52da83 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 395dbde027f67aca1db4bd4d077783059afb3acd..7d92d53d08152103f3fe5cee2d539d88be476d7f 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 abec6ca389ac6331e1f6466d9f67c8dd3406fb5a..ec4300d5d0999d569b87f3935944bcfc5197f877 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 4df724d6c7f86086d606c7475d9c1f994aa56cba..8e66f8ff86f10b096045cedf32d0ac883da3245e 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>