From 00bdab2679d27e0b6db21fe97915211c7d771c52 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 5 Aug 2019 16:00:30 +0200 Subject: test profiles to switch between Java <=8 and Java > 8 --- id/server/idserverlib/pom.xml | 276 +++++++++++++++++++++++---------------- id/server/moa-id-commons/pom.xml | 42 +++--- pom.xml | 6 + 3 files changed, 197 insertions(+), 127 deletions(-) diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index b12b2cb17..b576c7a87 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -529,90 +529,174 @@ + + + java8 + + [1.7,1.8] + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.0.1 + + + javax.annotation + javax.annotation-api + 1.3.1 + compile + + + + UTF-8 + UTF-8 + true + false + false + true + false + at.gv.egovernment.moa.spss.server.*;at.gv.egovernment.moa.spss.api.impl.*;at.gv.egovernment.moa.spss.impl.*;at.gv.egovernment.moa.id.client.* + + + pre + a + Preconditions: + + + post + a + Postconditions: + + + + http://docs.oracle.com/javase/7/docs/api/ + http://logging.apache.org/log4j/docs/api/ + + 1.7 + + + + generate-javadoc + package + + jar + + + + + + maven-surefire-plugin + ${surefire.version} + + 1 + + + + org.apache.maven.surefire + surefire-junit47 + ${surefire.version} + + + + + + + + java9 + + [1.9,1.99) + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.0.1 + + + javax.annotation + javax.annotation-api + 1.3.1 + compile + + + + UTF-8 + UTF-8 + true + false + false + true + false + at.gv.egovernment.moa.spss.server.*;at.gv.egovernment.moa.spss.api.impl.*;at.gv.egovernment.moa.spss.impl.*;at.gv.egovernment.moa.id.client.* + + + pre + a + Preconditions: + + + post + a + Postconditions: + + + + http://docs.oracle.com/javase/7/docs/api/ + http://logging.apache.org/log4j/docs/api/ + + 1.7 + + + + generate-javadoc + package + + jar + + + + --add-modules ALL-SYSTEM ${additionalparam} + --add-modules ALL-SYSTEM + + + + + + maven-surefire-plugin + ${surefire.version} + + 1 + --add-modules java.xml.bind + + + + org.apache.maven.surefire + surefire-junit47 + ${surefire.version} + + + + + + + + - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.8 - - - + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + + - - org.apache.maven.plugins - maven-javadoc-plugin - 3.0.1 - - - javax.annotation - javax.annotation-api - 1.3.1 - compile - - - - UTF-8 - UTF-8 - true - false - false - true - false - at.gv.egovernment.moa.spss.server.*;at.gv.egovernment.moa.spss.api.impl.*;at.gv.egovernment.moa.spss.impl.*;at.gv.egovernment.moa.id.client.* - - - pre - a - Preconditions: - - - post - a - Postconditions: - - - - http://docs.oracle.com/javase/7/docs/api/ - http://logging.apache.org/log4j/docs/api/ - - 1.7 - - - - generate-javadoc - package - - jar - - - - --add-modules ALL-SYSTEM ${additionalparam} - --add-modules ALL-SYSTEM - - - - + org.apache.maven.plugins maven-compiler-plugin @@ -627,13 +711,6 @@ org.apache.maven.plugins maven-jar-plugin - @@ -642,29 +719,6 @@ - - - - maven-surefire-plugin - ${surefire.version} - - 1 - --add-modules java.xml.bind - - - - org.apache.maven.surefire - surefire-junit47 - ${surefire.version} - - - - - diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml index 1841a66ee..d4d0d0563 100644 --- a/id/server/moa-id-commons/pom.xml +++ b/id/server/moa-id-commons/pom.xml @@ -68,25 +68,35 @@ at.gv.util - egovutils - - - * - * - - + egovutils + + + * + * + + - - org.opensaml - opensaml - - - * - * - - + + org.opensaml + opensaml + + + * + * + + + + org.opensaml + openws + + + * + * + + + org.apache.httpcomponents diff --git a/pom.xml b/pom.xml index 260b35e3d..bef5c174e 100644 --- a/pom.xml +++ b/pom.xml @@ -37,6 +37,7 @@ 27.1-jre 2.6.6 + 1.5.6 1.4.6 2.1.3 2.3.1 @@ -302,6 +303,11 @@ xmltooling ${xmltooling.version} + + org.opensaml + openws + ${org.opensaml.openws.version} + org.apache.santuario xmlsec -- cgit v1.2.3