From b445b300db3a6895647f7f939f63e6b1f52ac0a3 Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Tue, 25 Nov 2014 12:03:02 +0100
Subject: Fix build.

- Remove svn metadata.
- Fix local repository (inappropriate xalan-bin-dist dependency file names and copy-past error in dependency pom).
- Switch jdk 1.5/1.6 to 1.7.
- Exclude non working tests.
---
 spss/server/serverlib/pom.xml | 5 ++---
 spss/server/tools/pom.xml     | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'spss/server')

diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml
index da78d3dc1..e16d46d43 100644
--- a/spss/server/serverlib/pom.xml
+++ b/spss/server/serverlib/pom.xml
@@ -301,11 +301,10 @@
 						</group>
 					</groups>
 					<links>
-						<link>http://java.sun.com/j2se/1.4/docs/api/</link>
-						<link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+						<link>http://docs.oracle.com/javase/7/docs/api/</link>
 						<link>http://logging.apache.org/log4j/docs/api/</link>
 					</links>
-					<target>1.5</target>
+					<target>1.7</target>
 				</configuration>
 				<executions>
 					<execution>
diff --git a/spss/server/tools/pom.xml b/spss/server/tools/pom.xml
index f139e962d..277ef8459 100644
--- a/spss/server/tools/pom.xml
+++ b/spss/server/tools/pom.xml
@@ -76,8 +76,8 @@
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-compiler-plugin</artifactId>
               <configuration>
-                  <source>1.5</source>
-                  <target>1.5</target>
+                  <source>1.7</source>
+                  <target>1.7</target>
               </configuration>
           </plugin>
 
-- 
cgit v1.2.3


From ba5b11188fc2bb3dfd322d8bd1d6e35038d27bec Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Tue, 25 Nov 2014 13:47:22 +0100
Subject: Remove eclipse project settings from scm.

---
 spss/server/serverws/.project | 42 ------------------------------------------
 1 file changed, 42 deletions(-)
 delete mode 100644 spss/server/serverws/.project

(limited to 'spss/server')

diff --git a/spss/server/serverws/.project b/spss/server/serverws/.project
deleted file mode 100644
index 8150d984e..000000000
--- a/spss/server/serverws/.project
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>moa-spss-ws</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
-	</natures>
-</projectDescription>
-- 
cgit v1.2.3