diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-05-16 12:46:57 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-05-16 12:46:57 +0200 |
| commit | e0b56bc97ad2e18bd490f007d966c6f6e658cdd1 (patch) | |
| tree | dbaf5186bd337e883daccb56dd997d1551e99ddc | |
| parent | 608d8fecab0568f35c87cae73ef29e573be63ef0 (diff) | |
| download | moa-id-spss-e0b56bc97ad2e18bd490f007d966c6f6e658cdd1.tar.gz moa-id-spss-e0b56bc97ad2e18bd490f007d966c6f6e658cdd1.tar.bz2 moa-id-spss-e0b56bc97ad2e18bd490f007d966c6f6e658cdd1.zip | |
update versions
| -rw-r--r-- | common/pom.xml | 22 | ||||
| -rw-r--r-- | id/ConfigWebTool/pom.xml | 8 | ||||
| -rw-r--r-- | id/assembly-auth.xml | 6 | ||||
| -rw-r--r-- | id/assembly-proxy.xml | 6 | ||||
| -rw-r--r-- | id/oa/pom.xml | 6 | ||||
| -rw-r--r-- | id/pom.xml | 11 | ||||
| -rw-r--r-- | id/server/auth/pom.xml | 8 | ||||
| -rw-r--r-- | id/server/idserverlib/pom.xml | 10 | ||||
| -rw-r--r-- | id/server/moa-id-commons/pom.xml | 48 | ||||
| -rw-r--r-- | id/server/pom.xml | 25 | ||||
| -rw-r--r-- | id/server/proxy/pom.xml | 21 | ||||
| -rw-r--r-- | id/server/stork2-commons/pom.xml | 23 | ||||
| -rw-r--r-- | id/server/stork2-saml-engine/pom.xml | 23 | ||||
| -rw-r--r-- | pom.xml | 18 | ||||
| -rw-r--r-- | spss/assembly-lib.xml | 4 | ||||
| -rw-r--r-- | spss/assembly.xml | 4 | ||||
| -rw-r--r-- | spss/handbook/clients/api/pom.xml | 23 | ||||
| -rw-r--r-- | spss/handbook/clients/pom.xml | 23 | ||||
| -rw-r--r-- | spss/handbook/clients/referencedData/pom.xml | 22 | ||||
| -rw-r--r-- | spss/handbook/clients/webservice/pom.xml | 23 | ||||
| -rw-r--r-- | spss/handbook/pom.xml | 23 | ||||
| -rw-r--r-- | spss/pom.xml | 26 | ||||
| -rw-r--r-- | spss/server/pom.xml | 24 | ||||
| -rw-r--r-- | spss/server/serverlib/pom.xml | 24 | ||||
| -rw-r--r-- | spss/server/serverws/pom.xml | 22 | ||||
| -rw-r--r-- | spss/server/tools/pom.xml | 22 |
26 files changed, 380 insertions, 95 deletions
diff --git a/common/pom.xml b/common/pom.xml index c5bf69ffb..cde0c6ed8 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -3,10 +3,11 @@ <parent> <groupId>MOA</groupId> <artifactId>MOA</artifactId> - <version>2.0.2</version> + <version>2.x</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>moa-common</artifactId> + <version>${moa-commons-version}</version> <packaging>jar</packaging> <name>MOA common library</name> @@ -102,6 +103,25 @@ <build> <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>properties-maven-plugin</artifactId> + <version>1.0-alpha-2</version> + <executions> + <execution> + <phase>initialize</phase> + <goals> + <goal>read-project-properties</goal> + </goals> + <configuration> + <files> + <file>${basedir}/../moa-id.properties</file> + </files> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml index 9b3c70ea0..89ec121c2 100644 --- a/id/ConfigWebTool/pom.xml +++ b/id/ConfigWebTool/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>MOA</groupId> <artifactId>id</artifactId> - <version>2.0.x</version> + <version>2.x</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -141,7 +141,6 @@ </dependencies> <build> - <pluginManagement> <plugins> <plugin> @@ -156,15 +155,12 @@ </goals> <configuration> <files> - <file>${basedir}/moa-id.properties</file> + <file>${basedir}/../../moa-id.properties</file> </files> </configuration> </execution> </executions> </plugin> - </plugins> - </pluginManagement> - <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> diff --git a/id/assembly-auth.xml b/id/assembly-auth.xml index 87a5b6495..370fbc32b 100644 --- a/id/assembly-auth.xml +++ b/id/assembly-auth.xml @@ -1,5 +1,5 @@ <assembly>
- <id>id-auth-${project.version}</id>
+ <id>id-auth-${moa-id-version}</id>
<formats>
<format>dir</format>
@@ -7,7 +7,7 @@ <!-- <format>tar.gz</format> -->
</formats>
- <baseDirectory>moa-id-auth-${project.version}</baseDirectory>
+ <baseDirectory>moa-id-auth-${moa-id-version}</baseDirectory>
<fileSets>
<fileSet>
@@ -43,7 +43,7 @@ <outputDirectory>/</outputDirectory>
<includes>
<include>history.txt</include>
- <include>readme_${project.version}.txt</include>
+ <include>readme_${moa-id-version}.txt</include>
</includes>
</fileSet>
<fileSet>
diff --git a/id/assembly-proxy.xml b/id/assembly-proxy.xml index e9d070f45..d43783e69 100644 --- a/id/assembly-proxy.xml +++ b/id/assembly-proxy.xml @@ -1,5 +1,5 @@ <assembly>
- <id>id-proxy-${project.version}</id>
+ <id>id-proxy-${moa-id-proxy-version}</id>
<formats>
<format>dir</format>
@@ -7,7 +7,7 @@ <!-- <format>tar.gz</format> -->
</formats>
- <baseDirectory>moa-id-proxy-${project.version}</baseDirectory>
+ <baseDirectory>moa-id-proxy-${moa-id-proxy-version}</baseDirectory>
<fileSets>
<fileSet>
@@ -27,7 +27,7 @@ <outputDirectory>/</outputDirectory>
<includes>
<include>history.txt</include>
- <include>readme_${project.version}.txt</include>
+ <include>readme_${moa-id-proxy-version}.txt</include>
</includes>
</fileSet>
<fileSet>
diff --git a/id/oa/pom.xml b/id/oa/pom.xml index 4ee0b750d..d015d5c83 100644 --- a/id/oa/pom.xml +++ b/id/oa/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>MOA</groupId> <artifactId>id</artifactId> - <version>2.0.x</version> + <version>2.x</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -33,7 +33,6 @@ <build> <finalName>oa</finalName> - <pluginManagement> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -47,7 +46,7 @@ </goals> <configuration> <files> - <file>${basedir}/moa-id.properties</file> + <file>${basedir}/../../moa-id.properties</file> </files> </configuration> </execution> @@ -62,7 +61,6 @@ </configuration> </plugin> </plugins> - </pluginManagement> </build> <dependencies> diff --git a/id/pom.xml b/id/pom.xml index fc018ffa3..78ee829ba 100644 --- a/id/pom.xml +++ b/id/pom.xml @@ -3,12 +3,11 @@ <parent> <groupId>MOA</groupId> <artifactId>MOA</artifactId> - <version>2.0.2</version> + <version>2.x</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>id</artifactId> - <version>2.0.x</version> <packaging>pom</packaging> <name>MOA ID</name> @@ -25,7 +24,6 @@ </properties> <build> - <pluginManagement> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -39,15 +37,12 @@ </goals> <configuration> <files> - <file>${basedir}/moa-id.properties</file> + <file>${basedir}/../moa-id.properties</file> </files> </configuration> </execution> </executions> </plugin> - </plugins> - </pluginManagement> - <plugins> <plugin> <artifactId>maven-enforcer-plugin</artifactId> <version>1.1.1</version> @@ -80,7 +75,7 @@ </execution> </executions> </plugin> - </plugins> + </plugins> </build> </project> diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml index 5fe2aa739..cbc147c0a 100644 --- a/id/server/auth/pom.xml +++ b/id/server/auth/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>MOA.id</groupId> <artifactId>moa-id</artifactId> - <version>2.0.x</version> + <version>2.x</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -27,7 +27,6 @@ <build> <!--sourceDirectory>${basedir}/../idserverlib/src/main/java</sourceDirectory--> <!--testSourceDirectory>${basedir}/../idserverlib/src/test/java</testSourceDirectory--> - <pluginManagement> <plugins> <plugin> @@ -42,15 +41,12 @@ </goals> <configuration> <files> - <file>moa-id.properties</file> + <file>${basedir}/../../../moa-id.properties</file> </files> </configuration> </execution> </executions> </plugin> - </plugins> - </pluginManagement> - <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index 6a58f8bc8..f1518951f 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -3,7 +3,7 @@ <parent>
<groupId>MOA.id</groupId>
<artifactId>moa-id</artifactId>
- <version>2.0.x</version>
+ <version>2.x</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -271,7 +271,6 @@ </dependencies>
<build>
- <pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -285,15 +284,13 @@ </goals>
<configuration>
<files>
- <file>${basedir}/moa-id.properties</file>
+ <file>${basedir}/../../../moa-id.properties</file>
</files>
</configuration>
</execution>
</executions>
</plugin>
- </plugins>
- </pluginManagement>
- <plugins>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -302,6 +299,7 @@ <target>1.6</target>
</configuration>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml index 1831d0e1c..4b2ae6536 100644 --- a/id/server/moa-id-commons/pom.xml +++ b/id/server/moa-id-commons/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>MOA.id</groupId> <artifactId>moa-id</artifactId> - <version>2.0.x</version> + <version>2.x</version> </parent> <artifactId>moa-id-commons</artifactId> <name>moa-id-commons</name> @@ -195,7 +195,7 @@ </configuration> </plugin> - <plugin> +<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <version>2.5</version> @@ -237,10 +237,27 @@ </goals> </execution> </executions> - </plugin> - </plugins> - <pluginManagement> - <plugins> + </plugin> --> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>properties-maven-plugin</artifactId> + <version>1.0-alpha-2</version> + <executions> + <execution> + <phase>initialize</phase> + <goals> + <goal>read-project-properties</goal> + </goals> + <configuration> + <files> + <file>${basedir}/../../../moa-id.properties</file> + </files> + </configuration> + </execution> + </executions> + </plugin> + <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> <plugin> <groupId>org.eclipse.m2e</groupId> @@ -272,25 +289,6 @@ </lifecycleMappingMetadata> </configuration> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>properties-maven-plugin</artifactId> - <version>1.0-alpha-2</version> - <executions> - <execution> - <phase>initialize</phase> - <goals> - <goal>read-project-properties</goal> - </goals> - <configuration> - <files> - <file>${basedir}/moa-id.properties</file> - </files> - </configuration> - </execution> - </executions> - </plugin> </plugins> - </pluginManagement> </build> </project>
\ No newline at end of file diff --git a/id/server/pom.xml b/id/server/pom.xml index bbaac8e5e..cd2f82e84 100644 --- a/id/server/pom.xml +++ b/id/server/pom.xml @@ -4,7 +4,7 @@ <parent>
<groupId>MOA</groupId>
<artifactId>id</artifactId>
- <version>2.0.x</version>
+ <version>2.x</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -26,4 +26,27 @@ <repositoryPath>${basedir}/../../repository</repositoryPath>
</properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <version>1.0-alpha-2</version>
+ <executions>
+ <execution>
+ <phase>initialize</phase>
+ <goals>
+ <goal>read-project-properties</goal>
+ </goals>
+ <configuration>
+ <files>
+ <file>${basedir}/../../moa-id.properties</file>
+ </files>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml index ff6608451..dbae5ca30 100644 --- a/id/server/proxy/pom.xml +++ b/id/server/proxy/pom.xml @@ -2,7 +2,7 @@ <parent>
<groupId>MOA.id</groupId>
<artifactId>moa-id</artifactId>
- <version>2.0.x</version>
+ <version>2.x</version>
</parent>
<properties>
@@ -26,6 +26,25 @@ <build>
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <version>1.0-alpha-2</version>
+ <executions>
+ <execution>
+ <phase>initialize</phase>
+ <goals>
+ <goal>read-project-properties</goal>
+ </goals>
+ <configuration>
+ <files>
+ <file>${basedir}/../../../moa-id.properties</file>
+ </files>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
diff --git a/id/server/stork2-commons/pom.xml b/id/server/stork2-commons/pom.xml index c1dd27924..e74f702a8 100644 --- a/id/server/stork2-commons/pom.xml +++ b/id/server/stork2-commons/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>MOA.id</groupId> <artifactId>moa-id</artifactId> - <version>2.0.1</version> + <version>2.x</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>eu.stork</groupId> @@ -145,6 +145,27 @@ </plugins> </pluginManagement> <plugins> + + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>properties-maven-plugin</artifactId> + <version>1.0-alpha-2</version> + <executions> + <execution> + <phase>initialize</phase> + <goals> + <goal>read-project-properties</goal> + </goals> + <configuration> + <files> + <file>${basedir}/../../../moa-id.properties</file> + </files> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml index b9620a782..5a6621f12 100644 --- a/id/server/stork2-saml-engine/pom.xml +++ b/id/server/stork2-saml-engine/pom.xml @@ -3,7 +3,7 @@ <parent>
<groupId>MOA.id</groupId>
<artifactId>moa-id</artifactId>
- <version>2.0.1</version>
+ <version>2.x</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -151,9 +151,30 @@ <skip>true</skip>
</configuration>
</plugin>
+
</plugins>
</pluginManagement>
<plugins>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <version>1.0-alpha-2</version>
+ <executions>
+ <execution>
+ <phase>initialize</phase>
+ <goals>
+ <goal>read-project-properties</goal>
+ </goals>
+ <configuration>
+ <files>
+ <file>${basedir}/../../../moa-id.properties</file>
+ </files>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
@@ -4,18 +4,19 @@ <groupId>MOA</groupId>
<artifactId>MOA</artifactId>
<packaging>pom</packaging>
- <version>${moa-idspss-version}</version>
+ <version>2.x</version>
<name>MOA</name>
<properties>
<repositoryPath>${basedir}/repository</repositoryPath>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <moa-idspss-version>2.0.2</moa-idspss-version>
- <moa-id-version>2.0.2-Snapshot</moa-id-version>
+ <moa-commons-version>2.0.0</moa-commons-version>
+ <moa-id-version>2.1.0-RC1</moa-id-version>
+ <moa-id-proxy-version>2.0.0</moa-id-proxy-version>
<moa-spss-version>2.0.1</moa-spss-version>
- <configtool-version>1.0.2-Snapshot</configtool-version>
- <demo-oa-version>2.0.1</demo-oa-version>
+ <configtool-version>1.1.0-RC1</configtool-version>
+ <demo-oa-version>2.0.1</demo-oa-version>
</properties>
<profiles>
@@ -57,7 +58,6 @@ </profiles>
<build>
- <pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -124,7 +124,7 @@ </configuration>
</plugin>
</plugins>
- </pluginManagement>
+
</build>
<reporting>
@@ -240,7 +240,7 @@ <dependency>
<groupId>MOA</groupId>
<artifactId>moa-common</artifactId>
- <version>${moa-idspss-version}</version>
+ <version>${moa-commons-version}</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -264,7 +264,7 @@ <dependency>
<groupId>MOA</groupId>
<artifactId>moa-common</artifactId>
- <version>${moa-idspss-version}</version>
+ <version>${moa-commons-version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/spss/assembly-lib.xml b/spss/assembly-lib.xml index 895cc97c2..d8b78d2e8 100644 --- a/spss/assembly-lib.xml +++ b/spss/assembly-lib.xml @@ -1,5 +1,5 @@ <assembly> - <id>spss-${project.version}-lib</id> + <id>spss-${moa-spss-version}-lib</id> <formats> <format>dir</format> @@ -7,7 +7,7 @@ <!-- <format>tar.gz</format> --> </formats> - <baseDirectory>moa-spss-lib-${project.version}</baseDirectory> + <baseDirectory>moa-spss-lib-${moa-spss-version}</baseDirectory> <moduleSets> <moduleSet> diff --git a/spss/assembly.xml b/spss/assembly.xml index 17133d090..20673b198 100644 --- a/spss/assembly.xml +++ b/spss/assembly.xml @@ -1,5 +1,5 @@ <assembly> - <id>spss-${project.version}</id> + <id>spss-${moa-spss-version}</id> <formats> <format>dir</format> @@ -7,7 +7,7 @@ <!-- <format>tar.gz</format> --> </formats> - <baseDirectory>moa-spss-${project.version}</baseDirectory> + <baseDirectory>moa-spss-${moa-spss-version}</baseDirectory> <moduleSets> <moduleSet> diff --git a/spss/handbook/clients/api/pom.xml b/spss/handbook/clients/api/pom.xml index 442d4fdb7..52a96c56b 100644 --- a/spss/handbook/clients/api/pom.xml +++ b/spss/handbook/clients/api/pom.xml @@ -133,5 +133,26 @@ <artifactId>moa-spss-lib</artifactId>
</dependency>
</dependencies>
-
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <version>1.0-alpha-2</version>
+ <executions>
+ <execution>
+ <phase>initialize</phase>
+ <goals>
+ <goal>read-project-properties</goal>
+ </goals>
+ <configuration>
+ <files>
+ <file>${basedir}/../../../../../moa-id.properties</file>
+ </files>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/spss/handbook/clients/pom.xml b/spss/handbook/clients/pom.xml index 3b3bfd6b2..70ae70a4b 100644 --- a/spss/handbook/clients/pom.xml +++ b/spss/handbook/clients/pom.xml @@ -22,5 +22,26 @@ <properties>
<repositoryPath>${basedir}/../../../../repository</repositoryPath>
</properties>
-
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <version>1.0-alpha-2</version>
+ <executions>
+ <execution>
+ <phase>initialize</phase>
+ <goals>
+ <goal>read-project-properties</goal>
+ </goals>
+ <configuration>
+ <files>
+ <file>${basedir}/../../../../moa-id.properties</file>
+ </files>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/spss/handbook/clients/referencedData/pom.xml b/spss/handbook/clients/referencedData/pom.xml index 8e0378bd6..65f8635de 100644 --- a/spss/handbook/clients/referencedData/pom.xml +++ b/spss/handbook/clients/referencedData/pom.xml @@ -33,7 +33,25 @@ </archive>
</configuration>
</plugin>
- </plugins>
- </build>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <version>1.0-alpha-2</version>
+ <executions>
+ <execution>
+ <phase>initialize</phase>
+ <goals>
+ <goal>read-project-properties</goal>
+ </goals>
+ <configuration>
+ <files>
+ <file>${basedir}/../../../../../moa-id.properties</file>
+ </files>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/spss/handbook/clients/webservice/pom.xml b/spss/handbook/clients/webservice/pom.xml index bc1859408..95f2c5173 100644 --- a/spss/handbook/clients/webservice/pom.xml +++ b/spss/handbook/clients/webservice/pom.xml @@ -132,5 +132,26 @@ <artifactId>moa-spss-lib</artifactId>
</dependency>
</dependencies>
-
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <version>1.0-alpha-2</version>
+ <executions>
+ <execution>
+ <phase>initialize</phase>
+ <goals>
+ <goal>read-project-properties</goal>
+ </goals>
+ <configuration>
+ <files>
+ <file>${basedir}/../../../../../moa-id.properties</file>
+ </files>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/spss/handbook/pom.xml b/spss/handbook/pom.xml index 5e476d5c1..e9323a55f 100644 --- a/spss/handbook/pom.xml +++ b/spss/handbook/pom.xml @@ -20,5 +20,26 @@ <properties>
<repositoryPath>${basedir}/../../../repository</repositoryPath>
</properties>
-
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <version>1.0-alpha-2</version>
+ <executions>
+ <execution>
+ <phase>initialize</phase>
+ <goals>
+ <goal>read-project-properties</goal>
+ </goals>
+ <configuration>
+ <files>
+ <file>${basedir}/../../../moa-id.properties</file>
+ </files>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/spss/pom.xml b/spss/pom.xml index abc8de527..5954b9b0a 100644 --- a/spss/pom.xml +++ b/spss/pom.xml @@ -3,11 +3,10 @@ <parent> <groupId>MOA</groupId> <artifactId>MOA</artifactId> - <version>2.0.2</version> + <version>2.x</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>MOA</groupId> <artifactId>spss</artifactId> <packaging>pom</packaging> <version>2.0.x</version> @@ -22,4 +21,27 @@ <module>handbook</module> </modules> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>properties-maven-plugin</artifactId> + <version>1.0-alpha-2</version> + <executions> + <execution> + <phase>initialize</phase> + <goals> + <goal>read-project-properties</goal> + </goals> + <configuration> + <files> + <file>${basedir}/../moa-id.properties</file> + </files> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </project> diff --git a/spss/server/pom.xml b/spss/server/pom.xml index b5e1b32c1..08e740cd3 100644 --- a/spss/server/pom.xml +++ b/spss/server/pom.xml @@ -10,7 +10,6 @@ <groupId>MOA.spss</groupId>
<artifactId>moa-spss</artifactId>
<packaging>pom</packaging>
- <version>2.0.x</version>
<name>MOA SP/SS Server</name>
<modules>
@@ -23,4 +22,27 @@ <repositoryPath>${basedir}/../../repository</repositoryPath>
</properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <version>1.0-alpha-2</version>
+ <executions>
+ <execution>
+ <phase>initialize</phase>
+ <goals>
+ <goal>read-project-properties</goal>
+ </goals>
+ <configuration>
+ <files>
+ <file>${basedir}/../../moa-id.properties</file>
+ </files>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml index 42cf5bfc9..fb95746da 100644 --- a/spss/server/serverlib/pom.xml +++ b/spss/server/serverlib/pom.xml @@ -9,7 +9,7 @@ <groupId>MOA.spss.server</groupId>
<artifactId>moa-spss-lib</artifactId>
<packaging>jar</packaging>
- <version>2.0.1</version>
+ <version>${moa-spss-version}</version>
<name>MOA SP/SS API</name>
<properties>
@@ -175,9 +175,27 @@ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <version>1.0-alpha-2</version>
+ <executions>
+ <execution>
+ <phase>initialize</phase>
+ <goals>
+ <goal>read-project-properties</goal>
+ </goals>
+ <configuration>
+ <files>
+ <file>${basedir}/../../../moa-id.properties</file>
+ </files>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
- <build>
- <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml index 4f09e940d..ac06946a4 100644 --- a/spss/server/serverws/pom.xml +++ b/spss/server/serverws/pom.xml @@ -66,9 +66,27 @@ </webResources> </configuration> </plugin> - </plugins> - </build> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>properties-maven-plugin</artifactId> + <version>1.0-alpha-2</version> + <executions> + <execution> + <phase>initialize</phase> + <goals> + <goal>read-project-properties</goal> + </goals> + <configuration> + <files> + <file>${basedir}/../../../moa-id.properties</file> + </files> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> <dependencies> <dependency> <groupId>MOA.spss.server</groupId> diff --git a/spss/server/tools/pom.xml b/spss/server/tools/pom.xml index acc06ff38..880eac2c1 100644 --- a/spss/server/tools/pom.xml +++ b/spss/server/tools/pom.xml @@ -80,7 +80,25 @@ <target>1.5</target> </configuration> </plugin> - </plugins> - </build> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>properties-maven-plugin</artifactId> + <version>1.0-alpha-2</version> + <executions> + <execution> + <phase>initialize</phase> + <goals> + <goal>read-project-properties</goal> + </goals> + <configuration> + <files> + <file>${basedir}/../../../moa-id.properties</file> + </files> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> |