aboutsummaryrefslogtreecommitdiff
path: root/spss
diff options
context:
space:
mode:
Diffstat (limited to 'spss')
-rw-r--r--spss/handbook/clients/api/pom.xml3
-rw-r--r--spss/handbook/clients/pom.xml3
-rw-r--r--spss/handbook/clients/referencedData/pom.xml3
-rw-r--r--spss/handbook/clients/webservice/pom.xml4
-rw-r--r--spss/handbook/pom.xml1
-rw-r--r--spss/pom.xml3
-rw-r--r--spss/server/pom.xml2
-rw-r--r--spss/server/serverlib/pom.xml7
-rw-r--r--spss/server/serverws/.settings/org.eclipse.wst.common.component3
-rw-r--r--spss/server/serverws/pom.xml4
-rw-r--r--spss/server/tools/pom.xml3
11 files changed, 14 insertions, 22 deletions
diff --git a/spss/handbook/clients/api/pom.xml b/spss/handbook/clients/api/pom.xml
index 5a978964b..d1e9388be 100644
--- a/spss/handbook/clients/api/pom.xml
+++ b/spss/handbook/clients/api/pom.xml
@@ -2,14 +2,13 @@
<parent>
<groupId>MOA.spss.handbook.clients</groupId>
<artifactId>moa-spss-handbook-clients</artifactId>
- <version>1.5</version>
+ <version>1.5.x</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>MOA.spss.handbook</groupId>
<artifactId>moa-spss-handbook-apiClient</artifactId>
<packaging>jar</packaging>
- <version>1.5</version>
<name>MOA SP/SS Handbook API Client</name>
<properties>
diff --git a/spss/handbook/clients/pom.xml b/spss/handbook/clients/pom.xml
index 5a4ab81c8..98f095a27 100644
--- a/spss/handbook/clients/pom.xml
+++ b/spss/handbook/clients/pom.xml
@@ -3,14 +3,13 @@
<parent>
<groupId>MOA.spss.handbook</groupId>
<artifactId>moa-spss-handbook</artifactId>
- <version>1.5</version>
+ <version>1.5.x</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>MOA.spss.handbook.clients</groupId>
<artifactId>moa-spss-handbook-clients</artifactId>
<packaging>pom</packaging>
- <version>1.5</version>
<name>MOA SP/SS Handbook Clients</name>
<modules>
diff --git a/spss/handbook/clients/referencedData/pom.xml b/spss/handbook/clients/referencedData/pom.xml
index 9a8a3b68e..197250f42 100644
--- a/spss/handbook/clients/referencedData/pom.xml
+++ b/spss/handbook/clients/referencedData/pom.xml
@@ -3,14 +3,13 @@
<parent>
<groupId>MOA.spss.handbook.clients</groupId>
<artifactId>moa-spss-handbook-clients</artifactId>
- <version>1.5</version>
+ <version>1.5.x</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>MOA.spss.handbook</groupId>
<artifactId>moa-spss-handbook-referencedData</artifactId>
<packaging>war</packaging>
- <version>1.5</version>
<name>MOA SP/SS Handbook Referenced Data</name>
<properties>
diff --git a/spss/handbook/clients/webservice/pom.xml b/spss/handbook/clients/webservice/pom.xml
index 4221e6cc1..943c585c1 100644
--- a/spss/handbook/clients/webservice/pom.xml
+++ b/spss/handbook/clients/webservice/pom.xml
@@ -2,14 +2,12 @@
<parent>
<groupId>MOA.spss.handbook.clients</groupId>
<artifactId>moa-spss-handbook-clients</artifactId>
- <version>1.5</version>
+ <version>1.5.x</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>MOA.spss.handbook.clients</groupId>
<artifactId>moa-spss-handbook-webserviceClient</artifactId>
<packaging>jar</packaging>
- <version>1.5</version>
<name>MOA SP/SS Handbook WebService Client</name>
<properties>
diff --git a/spss/handbook/pom.xml b/spss/handbook/pom.xml
index 9caf5c181..50d4c8e02 100644
--- a/spss/handbook/pom.xml
+++ b/spss/handbook/pom.xml
@@ -10,7 +10,6 @@
<groupId>MOA.spss.handbook</groupId>
<artifactId>moa-spss-handbook</artifactId>
<packaging>pom</packaging>
- <version>1.5</version>
<name>MOA SP/SS Handbook</name>
<modules>
diff --git a/spss/pom.xml b/spss/pom.xml
index 936c800e4..6f9c9e07d 100644
--- a/spss/pom.xml
+++ b/spss/pom.xml
@@ -3,11 +3,10 @@
<parent>
<groupId>MOA</groupId>
<artifactId>MOA</artifactId>
- <version>1.5.2</version>
+ <version>2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>MOA</groupId>
<artifactId>spss</artifactId>
<packaging>pom</packaging>
<version>1.5.x</version>
diff --git a/spss/server/pom.xml b/spss/server/pom.xml
index a78496017..bf3b643e7 100644
--- a/spss/server/pom.xml
+++ b/spss/server/pom.xml
@@ -10,7 +10,7 @@
<groupId>MOA.spss</groupId>
<artifactId>moa-spss</artifactId>
<packaging>pom</packaging>
- <version>1.5.x</version>
+ <version>1.5.2</version>
<name>MOA SP/SS Server</name>
<modules>
diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml
index 2a6fd382f..1045c62cb 100644
--- a/spss/server/serverlib/pom.xml
+++ b/spss/server/serverlib/pom.xml
@@ -2,14 +2,13 @@
<parent>
<groupId>MOA.spss</groupId>
<artifactId>moa-spss</artifactId>
- <version>1.5.x</version>
+ <version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>MOA.spss.server</groupId>
<artifactId>moa-spss-lib</artifactId>
<packaging>jar</packaging>
- <version>1.5.2</version>
<name>MOA SP/SS API</name>
<properties>
@@ -130,12 +129,12 @@
<type>jar</type>
</dependency>
- <dependency>
+<!-- <dependency>
<groupId>MOA</groupId>
<artifactId>moa-common</artifactId>
<type>test-jar</type>
<scope>test</scope>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>MOA.spss.server</groupId>
<artifactId>moa-spss-tools</artifactId>
diff --git a/spss/server/serverws/.settings/org.eclipse.wst.common.component b/spss/server/serverws/.settings/org.eclipse.wst.common.component
index e1a47d533..9c379caa4 100644
--- a/spss/server/serverws/.settings/org.eclipse.wst.common.component
+++ b/spss/server/serverws/.settings/org.eclipse.wst.common.component
@@ -3,6 +3,9 @@
<dependent-module archiveName="moa-spss-lib-1.5.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-spss-lib/moa-spss-lib">
<dependency-type>uses</dependency-type>
</dependent-module>
+ <dependent-module archiveName="moa-common-2.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
<property name="context-root" value="moa-spss-ws"/>
<wb-resource deploy-path="/" source-path="src/main/webapp"/>
<wb-resource deploy-path="/" source-path="resources/wsdl"/>
diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml
index 4372c76d0..368d64bd1 100644
--- a/spss/server/serverws/pom.xml
+++ b/spss/server/serverws/pom.xml
@@ -3,14 +3,13 @@
<parent>
<groupId>MOA.spss</groupId>
<artifactId>moa-spss</artifactId>
- <version>1.5.x</version>
+ <version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>MOA.spss.server</groupId>
<artifactId>moa-spss-ws</artifactId>
<packaging>war</packaging>
- <version>1.5.2</version>
<name>MOA SP/SS WebService</name>
<properties>
@@ -59,7 +58,6 @@
<dependency>
<groupId>MOA.spss.server</groupId>
<artifactId>moa-spss-lib</artifactId>
- <!--version>${pom.version}</version-->
</dependency>
<dependency>
<groupId>MOA</groupId>
diff --git a/spss/server/tools/pom.xml b/spss/server/tools/pom.xml
index b276e5441..01e6c67c9 100644
--- a/spss/server/tools/pom.xml
+++ b/spss/server/tools/pom.xml
@@ -2,14 +2,13 @@
<parent>
<groupId>MOA.spss</groupId>
<artifactId>moa-spss</artifactId>
- <version>1.5.x</version>
+ <version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>MOA.spss.server</groupId>
<artifactId>moa-spss-tools</artifactId>
<packaging>jar</packaging>
- <version>1.5</version>
<name>MOA SP/SS Tools</name>
<properties>