aboutsummaryrefslogtreecommitdiff
path: root/id
diff options
context:
space:
mode:
Diffstat (limited to 'id')
-rw-r--r--id/ConfigWebTool/pom.xml8
-rw-r--r--id/assembly-auth.xml6
-rw-r--r--id/assembly-proxy.xml6
-rw-r--r--id/oa/pom.xml6
-rw-r--r--id/pom.xml11
-rw-r--r--id/server/auth/pom.xml8
-rw-r--r--id/server/idserverlib/pom.xml10
-rw-r--r--id/server/moa-id-commons/pom.xml48
-rw-r--r--id/server/pom.xml25
-rw-r--r--id/server/proxy/pom.xml21
-rw-r--r--id/server/stork2-commons/pom.xml23
-rw-r--r--id/server/stork2-saml-engine/pom.xml23
12 files changed, 130 insertions, 65 deletions
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 04:40:17 +0000