From 988e345f81b0ac67037a756cfaaea87afa83b4a5 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Thu, 17 Mar 2016 09:22:16 +0100 Subject: problems with eIDAS dependencies --- id/server/modules/moa-id-module-eIDAS/pom.xml | 17 +- .../2.0.5-RC1/moa-spss-lib-2.0.5-RC1.pom | 333 --------------------- .../eidas.1.0/eidas-commons-eidas.1.0.pom | 4 +- .../eidas.1.0/eidas-configmodule-eidas.1.0.pom | 4 +- .../eidas.1.0/eidas-encryption-eidas.1.0.pom | 4 +- .../eidas-1.0/eidas-parent-eidas-1.0.pom | 86 ++++++ .../eidas-parent/eidas/eidas-parent-eidas.pom | 86 ------ .../eidas.1.0/saml-engine-eidas.1.0.pom | 4 +- 8 files changed, 110 insertions(+), 428 deletions(-) delete mode 100644 repository/MOA/spss/server/moa-spss-lib/2.0.5-RC1/moa-spss-lib-2.0.5-RC1.pom create mode 100644 repository/eu/eidas/eidas-parent/eidas-1.0/eidas-parent-eidas-1.0.pom delete mode 100644 repository/eu/eidas/eidas-parent/eidas/eidas-parent-eidas.pom diff --git a/id/server/modules/moa-id-module-eIDAS/pom.xml b/id/server/modules/moa-id-module-eIDAS/pom.xml index 31e42b6c2..9e95301bd 100644 --- a/id/server/modules/moa-id-module-eIDAS/pom.xml +++ b/id/server/modules/moa-id-module-eIDAS/pom.xml @@ -13,7 +13,10 @@ ${basedir}/../../../../repository eidas.1.0 - eidas.1.0 + eidas.1.0 + eidas.1.0 + eidas.1.0 + @@ -69,6 +72,18 @@ + + + eu.eidas + eidas-configmodule + ${eidas-configmodule.version} + + + + eu.eidas + eidas-encryption + ${eidas-encryption.version} + diff --git a/repository/MOA/spss/server/moa-spss-lib/2.0.5-RC1/moa-spss-lib-2.0.5-RC1.pom b/repository/MOA/spss/server/moa-spss-lib/2.0.5-RC1/moa-spss-lib-2.0.5-RC1.pom deleted file mode 100644 index c4eff0765..000000000 --- a/repository/MOA/spss/server/moa-spss-lib/2.0.5-RC1/moa-spss-lib-2.0.5-RC1.pom +++ /dev/null @@ -1,333 +0,0 @@ - - - MOA.spss - moa-spss - 2.0.x - - - 4.0.0 - MOA.spss.server - moa-spss-lib - jar - ${moa-spss-version} - MOA SP/SS API - - - ${basedir}/../../../repository - - - - - axis - axis - - - org.apache.axis - axis-jaxrpc - - - org.apache.axis - axis-saaj - - - axis - axis-wsdl4j - - - commons-discovery - commons-discovery - - - commons-logging - commons-logging - - - javax.activation - activation - - - javax.mail - mail - - - junit - junit - - - log4j - log4j - - - org.postgresql - postgresql - - - javax.servlet - servlet-api - provided - - - xalan-bin-dist - xalan - - - - xerces - xercesImpl - - - - xalan-bin-dist - xml-apis - - - xalan-bin-dist - serializer - - - - iaik.prod - iaik_moa - - - iaik.prod - iaik_ixsil - - - iaik.prod - iaik_jce_full - compile - - - iaik.prod - iaik_ecc - compile - - - iaik.prod - iaik_cms - runtime - - - iaik.prod - iaik_Pkcs11Provider - runtime - - - iaik.prod - iaik_Pkcs11Wrapper - runtime - - - iaik.prod - iaik_Pkcs11Wrapper - win32 - dll - runtime - true - - - - - - - - - iaik - iaik_tsl - - - iaik_pki_module - iaik - - - iaik_ecc_signed - iaik - - - iaik_jce_eval_signed - iaik - - - - - - com.sun.xml.bind - jaxb-impl - 2.2.11 - - - - com.sun.xml.bind - jaxb-core - 2.2.11 - - - - - - - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - false - - - - - test-jar - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - true - false - false - true - false - at.gv.egovernment.moa.spss.server.*;at.gv.egovernment.moa.spss.api.impl.*;at.gv.egovernment.moa.spss.impl.* - - - pre - a - Preconditions: - - - post - a - Postconditions: - - - - - API Factory and Services - at.gv.egovernment.moa.spss.api - - - Exceptions - at.gv.egovernment.moa.spss - - - API Objects for Signature Creation - at.gv.egovernment.moa.spss.api.xmlsign - - - API Objects for CMS Signature Verification - at.gv.egovernment.moa.spss.api.cmsverify - - - API Objects for XML Signature Verification - at.gv.egovernment.moa.spss.api.xmlverify - - - Common API Objects - at.gv.egovernment.moa.spss.api.common - - - Builders and Parsers to convert API Objects to and from XML - at.gv.egovernment.moa.spss.api.xmlbind - - - Utilities - at.gv.egovernment.moa.util - at.gv.egovernment.moa.spss.util - - - Logging - at.gv.egovernment.moa.logging - - - - http://docs.oracle.com/javase/7/docs/api/ - http://logging.apache.org/log4j/docs/api/ - - 1.7 - - - - generate-javadoc - package - - jar - - - - - - - - diff --git a/repository/eu/eidas/eidas-commons/eidas.1.0/eidas-commons-eidas.1.0.pom b/repository/eu/eidas/eidas-commons/eidas.1.0/eidas-commons-eidas.1.0.pom index ceb0b4dcb..2b2f3f39e 100644 --- a/repository/eu/eidas/eidas-commons/eidas.1.0/eidas-commons-eidas.1.0.pom +++ b/repository/eu/eidas/eidas-commons/eidas.1.0/eidas-commons-eidas.1.0.pom @@ -11,8 +11,8 @@ eu.eidas eidas-parent - eidas - ../EIDAS-Parent/pom.xml + eidas-1.0 + ../../eidas-parent/eidas-1.0/pom.xml ${project.version} diff --git a/repository/eu/eidas/eidas-configmodule/eidas.1.0/eidas-configmodule-eidas.1.0.pom b/repository/eu/eidas/eidas-configmodule/eidas.1.0/eidas-configmodule-eidas.1.0.pom index cf9691046..00a2ec564 100644 --- a/repository/eu/eidas/eidas-configmodule/eidas.1.0/eidas-configmodule-eidas.1.0.pom +++ b/repository/eu/eidas/eidas-configmodule/eidas.1.0/eidas-configmodule-eidas.1.0.pom @@ -14,8 +14,8 @@ eu.eidas eidas-parent - eidas - ../EIDAS-Parent/pom.xml + eidas-1.0 + ../../eidas-parent/eidas-1.0/pom.xml ${project.version} diff --git a/repository/eu/eidas/eidas-encryption/eidas.1.0/eidas-encryption-eidas.1.0.pom b/repository/eu/eidas/eidas-encryption/eidas.1.0/eidas-encryption-eidas.1.0.pom index e0c1da99c..52652e8dd 100644 --- a/repository/eu/eidas/eidas-encryption/eidas.1.0/eidas-encryption-eidas.1.0.pom +++ b/repository/eu/eidas/eidas-encryption/eidas.1.0/eidas-encryption-eidas.1.0.pom @@ -19,8 +19,8 @@ eu.eidas eidas-parent - eidas - ../EIDAS-Parent/pom.xml + eidas-1.0 + ../../eidas-parent/eidas-1.0/pom.xml diff --git a/repository/eu/eidas/eidas-parent/eidas-1.0/eidas-parent-eidas-1.0.pom b/repository/eu/eidas/eidas-parent/eidas-1.0/eidas-parent-eidas-1.0.pom new file mode 100644 index 000000000..f5652b63f --- /dev/null +++ b/repository/eu/eidas/eidas-parent/eidas-1.0/eidas-parent-eidas-1.0.pom @@ -0,0 +1,86 @@ + + 4.0.0 + eu.eidas + eidas-parent + pom + Eidas Node Parent + + UTF-8 + eidas.1.0 + eidas.1.0 + + + 1.6 + + EIDASParent + EidasNode + 4.1.0.RELEASE + 2.6.5 + eidas.1.0 + war + jar + 0.5.2 + 0.5.1 + + + 2.5 + 2.0 + 1.1.2 + 1.2.5 + 1.18 + 1.7.10 + 1.1.2 + 1.10.19 + 4.12 + 1.9 + 2.4 + 2.6 + 1.1.3 + 3.1 + 3.1 + 3.2 + 1.52 + 1.1.1 + 2.1.0 + 2.2.2 + 1.4.01 + 2.11.0 + 2.7.2 + 2.6 + 1.2.17 + 2.3 + 1.5 + 1.2.2 + 2.3.16.2 + 55.1 + + 2.8.1 + 2.3.2 + 2.0.1 + 2.3 + 2.6 + 1.5 + 2.1.2 + 2.5.2 + 2.6.1 + + ${maven.build.timestamp} + + 7.4.2 + ${vaadin.version} + 1.0.0.beta1 + 0.0.5.RELEASE + 9.2.3.v20140905 + 2.0.5 + + + eidas + + The EIDAS-Parent provides artefacts versions for Eidas Node components. + + + + + diff --git a/repository/eu/eidas/eidas-parent/eidas/eidas-parent-eidas.pom b/repository/eu/eidas/eidas-parent/eidas/eidas-parent-eidas.pom deleted file mode 100644 index f5652b63f..000000000 --- a/repository/eu/eidas/eidas-parent/eidas/eidas-parent-eidas.pom +++ /dev/null @@ -1,86 +0,0 @@ - - 4.0.0 - eu.eidas - eidas-parent - pom - Eidas Node Parent - - UTF-8 - eidas.1.0 - eidas.1.0 - - - 1.6 - - EIDASParent - EidasNode - 4.1.0.RELEASE - 2.6.5 - eidas.1.0 - war - jar - 0.5.2 - 0.5.1 - - - 2.5 - 2.0 - 1.1.2 - 1.2.5 - 1.18 - 1.7.10 - 1.1.2 - 1.10.19 - 4.12 - 1.9 - 2.4 - 2.6 - 1.1.3 - 3.1 - 3.1 - 3.2 - 1.52 - 1.1.1 - 2.1.0 - 2.2.2 - 1.4.01 - 2.11.0 - 2.7.2 - 2.6 - 1.2.17 - 2.3 - 1.5 - 1.2.2 - 2.3.16.2 - 55.1 - - 2.8.1 - 2.3.2 - 2.0.1 - 2.3 - 2.6 - 1.5 - 2.1.2 - 2.5.2 - 2.6.1 - - ${maven.build.timestamp} - - 7.4.2 - ${vaadin.version} - 1.0.0.beta1 - 0.0.5.RELEASE - 9.2.3.v20140905 - 2.0.5 - - - eidas - - The EIDAS-Parent provides artefacts versions for Eidas Node components. - - - - - diff --git a/repository/eu/eidas/saml-engine/eidas.1.0/saml-engine-eidas.1.0.pom b/repository/eu/eidas/saml-engine/eidas.1.0/saml-engine-eidas.1.0.pom index c243709f8..0d7d905e1 100644 --- a/repository/eu/eidas/saml-engine/eidas.1.0/saml-engine-eidas.1.0.pom +++ b/repository/eu/eidas/saml-engine/eidas.1.0/saml-engine-eidas.1.0.pom @@ -15,8 +15,8 @@ eu.eidas eidas-parent - eidas - ../EIDAS-Parent/pom.xml + eidas-1.0 + ../../eidas-parent/eidas-1.0/pom.xml -- cgit v1.2.3