diff options
44 files changed, 101 insertions, 293 deletions
diff --git a/eaaf_core/pom.xml b/eaaf_core/pom.xml index df2a321b..8cff6df2 100644 --- a/eaaf_core/pom.xml +++ b/eaaf_core/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>at.gv.egiz</groupId> <artifactId>eaaf</artifactId> - <version>1.1.5-SNAPSHOT</version> + <version>1.1.6-SNAPSHOT</version> </parent> <groupId>at.gv.egiz.eaaf</groupId> diff --git a/eaaf_core_api/pom.xml b/eaaf_core_api/pom.xml index 7a2e2042..ef606e46 100644 --- a/eaaf_core_api/pom.xml +++ b/eaaf_core_api/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>at.gv.egiz</groupId> <artifactId>eaaf</artifactId> - <version>1.1.5-SNAPSHOT</version> + <version>1.1.6-SNAPSHOT</version> </parent> <groupId>at.gv.egiz.eaaf</groupId> <artifactId>eaaf_core_api</artifactId> diff --git a/eaaf_core_utils/pom.xml b/eaaf_core_utils/pom.xml index 9c9c20af..02c7839b 100644 --- a/eaaf_core_utils/pom.xml +++ b/eaaf_core_utils/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>at.gv.egiz</groupId> <artifactId>eaaf</artifactId> - <version>1.1.5-SNAPSHOT</version> + <version>1.1.6-SNAPSHOT</version> </parent> <groupId>at.gv.egiz.eaaf</groupId> <artifactId>eaaf_core_utils</artifactId> diff --git a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/http/HttpUtils.java b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/http/HttpUtils.java index eafd8a04..81ebe1fe 100644 --- a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/http/HttpUtils.java +++ b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/http/HttpUtils.java @@ -162,42 +162,108 @@ public class HttpUtils { boolean trustAllServerCertificates, @Nonnull String friendlyName) throws EaafConfigurationException, EaafFactoryException { try { - log.trace("Open SSL Client-Auth keystore with password: {}", keyPasswordString); - final char[] keyPassword = keyPasswordString == null ? StringUtils.EMPTY.toCharArray() - : keyPasswordString.toCharArray(); - SSLContextBuilder sslContextBuilder = SSLContexts.custom(); - if (keyStore.getSecond() != null) { - Provider provider = new BouncyCastleJsseProvider(keyStore.getSecond()); - log.debug("KeyStore: {} provide special security-provider. Inject: {} into SSLContext", - friendlyName, provider.getName()); - sslContextBuilder.setProvider(provider); - - } - if (StringUtils.isNotEmpty(keyAlias)) { - sslContextBuilder = sslContextBuilder - .loadKeyMaterial(keyStore.getFirst(), keyPassword, new EaafSslKeySelectionStrategy(keyAlias)); - - } else { - sslContextBuilder = sslContextBuilder - .loadKeyMaterial(keyStore.getFirst(), keyPassword); - } - - if (trustAllServerCertificates) { - log.warn("Http-client:{} trusts ALL TLS server-certificates!"); - final TrustStrategy trustStrategy = new TrustAllStrategy(); - sslContextBuilder = sslContextBuilder.loadTrustMaterial(trustStrategy); + injectKeyStore(sslContextBuilder, keyStore, keyAlias, keyPasswordString, friendlyName); + + injectTrustStore(sslContextBuilder, null, trustAllServerCertificates, friendlyName); + + return sslContextBuilder.build(); - } + } catch (NoSuchAlgorithmException | KeyManagementException | UnrecoverableKeyException + | KeyStoreException e) { + throw new EaafFactoryException(ERROR_03, new Object[] { friendlyName, e.getMessage() }, e); + } + } + + /** + * Initialize a {@link SSLContext} with a {@link KeyStore} that uses X509 Client + * authentication and a custom TrustStore as {@link KeyStore}. + * + * @param keyStore KeyStore with private keys that should be + * used + * @param keyAlias Alias of the key that should be used. If + * the alias is null, than the first key that + * is found will be selected. + * @param keyPasswordString Password of the Key in this keystore + * @param trustStore TrustStore with trusted SSL certificates + * @param trustAllServerCertificates Deactivate SSL server-certificate + * validation + * @param friendlyName FriendlyName of the http client for logging + * purposes + * @return {@link SSLContext} with X509 client authentication + * @throws EaafConfigurationException In case of a configuration error + * @throws EaafFactoryException In case of a {@link SSLContext} + * initialization error + */ + public static SSLContext buildSslContextWithSslClientAuthentication(@Nonnull final Pair<KeyStore, Provider> keyStore, + @Nullable String keyAlias, @Nullable String keyPasswordString, + @Nullable final Pair<KeyStore, Provider> trustStore, boolean trustAllServerCertificates, + @Nonnull String friendlyName) + throws EaafConfigurationException, EaafFactoryException { + try { + SSLContextBuilder sslContextBuilder = SSLContexts.custom(); + + injectKeyStore(sslContextBuilder, keyStore, keyAlias, keyPasswordString, friendlyName); + + injectTrustStore(sslContextBuilder, trustStore, trustAllServerCertificates, friendlyName); + return sslContextBuilder.build(); } catch (NoSuchAlgorithmException | KeyManagementException | UnrecoverableKeyException | KeyStoreException e) { throw new EaafFactoryException(ERROR_03, new Object[] { friendlyName, e.getMessage() }, e); + } + } + + private static void injectTrustStore(SSLContextBuilder sslContextBuilder, + Pair<KeyStore, Provider> trustStore, boolean trustAllServerCertificates, String friendlyName) + throws NoSuchAlgorithmException, KeyStoreException { + + TrustStrategy trustStrategy = null; + if (trustAllServerCertificates) { + log.warn("Http-client:{} trusts ALL TLS server-certificates!", friendlyName); + trustStrategy = new TrustAllStrategy(); + + } + + KeyStore trustStoreImpl = null; + if (trustStore != null) { + log.info("Http-client: {} uses custom TrustStore.", friendlyName); + trustStoreImpl = trustStore.getFirst(); + + } + + sslContextBuilder.loadTrustMaterial(trustStoreImpl, trustStrategy); + + } + + private static void injectKeyStore(SSLContextBuilder sslContextBuilder, Pair<KeyStore, Provider> keyStore, + String keyAlias, String keyPasswordString, String friendlyName) + throws UnrecoverableKeyException, NoSuchAlgorithmException, KeyStoreException { + if (keyStore.getSecond() != null) { + Provider provider = new BouncyCastleJsseProvider(keyStore.getSecond()); + log.debug("KeyStore: {} provide special security-provider. Inject: {} into SSLContext", + friendlyName, provider.getName()); + sslContextBuilder.setProvider(provider); + + } + + log.trace("Open SSL Client-Auth keystore with password: {}", keyPasswordString); + final char[] keyPassword = keyPasswordString == null ? StringUtils.EMPTY.toCharArray() + : keyPasswordString.toCharArray(); + + if (StringUtils.isNotEmpty(keyAlias)) { + sslContextBuilder + .loadKeyMaterial(keyStore.getFirst(), keyPassword, new EaafSslKeySelectionStrategy(keyAlias)); + + } else { + sslContextBuilder.loadKeyMaterial(keyStore.getFirst(), keyPassword); + } + } } diff --git a/eaaf_modules/eaaf_module_auth_sl20/pom.xml b/eaaf_modules/eaaf_module_auth_sl20/pom.xml index d5a9cea8..d8efcfa1 100644 --- a/eaaf_modules/eaaf_module_auth_sl20/pom.xml +++ b/eaaf_modules/eaaf_module_auth_sl20/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>at.gv.egiz.eaaf</groupId> <artifactId>eaaf_modules</artifactId> - <version>1.1.5-SNAPSHOT</version> + <version>1.1.6-SNAPSHOT</version> </parent> <artifactId>eaaf_module_auth_sl20</artifactId> <name>Generic SL2.0 authentication</name> diff --git a/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/tasks/AbstractCreateQualEidRequestTask.java b/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/tasks/AbstractCreateQualEidRequestTask.java index 032ac8ee..7fa50e3f 100644 --- a/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/tasks/AbstractCreateQualEidRequestTask.java +++ b/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/tasks/AbstractCreateQualEidRequestTask.java @@ -43,7 +43,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.i18n.LocaleContextHolder; -import org.springframework.web.servlet.support.RequestContextUtils; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -221,7 +220,6 @@ public abstract class AbstractCreateQualEidRequestTask extends AbstractAuthServl //set i18n language into VDA request final Locale locale = LocaleContextHolder.getLocale(); - RequestContextUtils.getLocaleResolver(request); final String language = locale.getLanguage(); if (StringUtils.isNotEmpty(language)) { log.trace("Find i18n context. Inject locale: {} into VDA request", locale.getLanguage()); diff --git a/eaaf_modules/eaaf_module_moa-sig/pom.xml b/eaaf_modules/eaaf_module_moa-sig/pom.xml index 0bea1aa6..e147a38e 100644 --- a/eaaf_modules/eaaf_module_moa-sig/pom.xml +++ b/eaaf_modules/eaaf_module_moa-sig/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>at.gv.egiz.eaaf</groupId> <artifactId>eaaf_modules</artifactId> - <version>1.1.5-SNAPSHOT</version> + <version>1.1.6-SNAPSHOT</version> </parent> <artifactId>eaaf_module_moa-sig</artifactId> <name>MOA-Sig signature verification module</name> diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_cms/5.1/_remote.repositories b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_cms/5.1/_remote.repositories deleted file mode 100644 index bf48e71f..00000000 --- a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_cms/5.1/_remote.repositories +++ /dev/null @@ -1,4 +0,0 @@ -#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice. -#Fri Aug 02 10:15:26 CEST 2019 -iaik_cms-5.1.jar>= -iaik_cms-5.1.pom>= diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_cms/maven-metadata-local.xml b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_cms/maven-metadata-local.xml deleted file mode 100644 index cf983a9a..00000000 --- a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_cms/maven-metadata-local.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<metadata> - <groupId>iaik.prod</groupId> - <artifactId>iaik_cms</artifactId> - <versioning> - <release>5.1</release> - <versions> - <version>5.1</version> - </versions> - <lastUpdated>20190802081526</lastUpdated> - </versioning> -</metadata> diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_cpades/2.5.1_moa/_remote.repositories b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_cpades/2.5.1_moa/_remote.repositories deleted file mode 100644 index 94972b34..00000000 --- a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_cpades/2.5.1_moa/_remote.repositories +++ /dev/null @@ -1,4 +0,0 @@ -#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice. -#Fri Aug 02 10:15:14 CEST 2019 -iaik_cpades-2.5.1_moa.jar>= -iaik_cpades-2.5.1_moa.pom>= diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_cpades/maven-metadata-local.xml b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_cpades/maven-metadata-local.xml deleted file mode 100644 index 32137191..00000000 --- a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_cpades/maven-metadata-local.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<metadata> - <groupId>iaik.prod</groupId> - <artifactId>iaik_cpades</artifactId> - <versioning> - <release>2.5.1_moa</release> - <versions> - <version>2.5.1_moa</version> - </versions> - <lastUpdated>20190802081514</lastUpdated> - </versioning> -</metadata> diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_cpxlevel/0.9_moa/_remote.repositories b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_cpxlevel/0.9_moa/_remote.repositories deleted file mode 100644 index cbbb35ef..00000000 --- a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_cpxlevel/0.9_moa/_remote.repositories +++ /dev/null @@ -1,4 +0,0 @@ -#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice. -#Fri Aug 02 10:15:13 CEST 2019 -iaik_cpxlevel-0.9_moa.jar>= -iaik_cpxlevel-0.9_moa.pom>= diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_cpxlevel/maven-metadata-local.xml b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_cpxlevel/maven-metadata-local.xml deleted file mode 100644 index 3d8a158f..00000000 --- a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_cpxlevel/maven-metadata-local.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<metadata> - <groupId>iaik.prod</groupId> - <artifactId>iaik_cpxlevel</artifactId> - <versioning> - <release>0.9_moa</release> - <versions> - <version>0.9_moa</version> - </versions> - <lastUpdated>20190802081513</lastUpdated> - </versioning> -</metadata> diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_eccelerate/5.01/_remote.repositories b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_eccelerate/5.01/_remote.repositories deleted file mode 100644 index 8921e467..00000000 --- a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_eccelerate/5.01/_remote.repositories +++ /dev/null @@ -1,4 +0,0 @@ -#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice. -#Fri Aug 02 10:15:20 CEST 2019 -iaik_eccelerate-5.01.jar>= -iaik_eccelerate-5.01.pom>= diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_eccelerate/maven-metadata-local.xml b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_eccelerate/maven-metadata-local.xml deleted file mode 100644 index a503da91..00000000 --- a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_eccelerate/maven-metadata-local.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<metadata> - <groupId>iaik.prod</groupId> - <artifactId>iaik_eccelerate</artifactId> - <versioning> - <release>5.01</release> - <versions> - <version>5.01</version> - </versions> - <lastUpdated>20190802081520</lastUpdated> - </versioning> -</metadata> diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_eccelerate_addon/5.01/_remote.repositories b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_eccelerate_addon/5.01/_remote.repositories deleted file mode 100644 index 3c6373a0..00000000 --- a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_eccelerate_addon/5.01/_remote.repositories +++ /dev/null @@ -1,4 +0,0 @@ -#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice. -#Fri Aug 02 10:15:15 CEST 2019 -iaik_eccelerate_addon-5.01.pom>= -iaik_eccelerate_addon-5.01.jar>= diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_eccelerate_addon/maven-metadata-local.xml b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_eccelerate_addon/maven-metadata-local.xml deleted file mode 100644 index ffca7133..00000000 --- a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_eccelerate_addon/maven-metadata-local.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<metadata> - <groupId>iaik.prod</groupId> - <artifactId>iaik_eccelerate_addon</artifactId> - <versioning> - <release>5.01</release> - <versions> - <version>5.01</version> - </versions> - <lastUpdated>20190802081515</lastUpdated> - </versioning> -</metadata> diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_eccelerate_cms/5.01/_remote.repositories b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_eccelerate_cms/5.01/_remote.repositories deleted file mode 100644 index e1f24d7e..00000000 --- a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_eccelerate_cms/5.01/_remote.repositories +++ /dev/null @@ -1,4 +0,0 @@ -#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice. -#Fri Aug 02 10:15:21 CEST 2019 -iaik_eccelerate_cms-5.01.pom>= -iaik_eccelerate_cms-5.01.jar>= diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_eccelerate_cms/maven-metadata-local.xml b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_eccelerate_cms/maven-metadata-local.xml deleted file mode 100644 index e994c73c..00000000 --- a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_eccelerate_cms/maven-metadata-local.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<metadata> - <groupId>iaik.prod</groupId> - <artifactId>iaik_eccelerate_cms</artifactId> - <versioning> - <release>5.01</release> - <versions> - <version>5.01</version> - </versions> - <lastUpdated>20190802081522</lastUpdated> - </versioning> -</metadata> diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_ixsil/1.2.2.5/_remote.repositories b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_ixsil/1.2.2.5/_remote.repositories deleted file mode 100644 index 7d2568d9..00000000 --- a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_ixsil/1.2.2.5/_remote.repositories +++ /dev/null @@ -1,4 +0,0 @@ -#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice. -#Fri Aug 02 10:15:06 CEST 2019 -iaik_ixsil-1.2.2.5.jar>= -iaik_ixsil-1.2.2.5.pom>= diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_ixsil/maven-metadata-local.xml b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_ixsil/maven-metadata-local.xml deleted file mode 100644 index 5c190625..00000000 --- a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_ixsil/maven-metadata-local.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<metadata> - <groupId>iaik.prod</groupId> - <artifactId>iaik_ixsil</artifactId> - <versioning> - <release>1.2.2.5</release> - <versions> - <version>1.2.2.5</version> - </versions> - <lastUpdated>20190802081506</lastUpdated> - </versioning> -</metadata> diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_jce_full/5.52_moa/_remote.repositories b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_jce_full/5.52_moa/_remote.repositories deleted file mode 100644 index aa8aa788..00000000 --- a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_jce_full/5.52_moa/_remote.repositories +++ /dev/null @@ -1,4 +0,0 @@ -#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice. -#Fri Aug 02 10:15:24 CEST 2019 -iaik_jce_full-5.52_moa.pom>= -iaik_jce_full-5.52_moa.jar>= diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_jce_full/maven-metadata-local.xml b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_jce_full/maven-metadata-local.xml deleted file mode 100644 index 5d1c160c..00000000 --- a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_jce_full/maven-metadata-local.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<metadata> - <groupId>iaik.prod</groupId> - <artifactId>iaik_jce_full</artifactId> - <versioning> - <release>5.52_moa</release> - <versions> - <version>5.52_moa</version> - </versions> - <lastUpdated>20190802081524</lastUpdated> - </versioning> -</metadata> diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_jsse/4.4/_remote.repositories b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_jsse/4.4/_remote.repositories deleted file mode 100644 index 4b692f1f..00000000 --- a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_jsse/4.4/_remote.repositories +++ /dev/null @@ -1,4 +0,0 @@ -#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice. -#Fri Aug 02 10:15:06 CEST 2019 -iaik_jsse-4.4.jar>= -iaik_jsse-4.4.pom>= diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_jsse/maven-metadata-local.xml b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_jsse/maven-metadata-local.xml deleted file mode 100644 index 5a7a319f..00000000 --- a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_jsse/maven-metadata-local.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<metadata> - <groupId>iaik.prod</groupId> - <artifactId>iaik_jsse</artifactId> - <versioning> - <release>4.4</release> - <versions> - <version>4.4</version> - </versions> - <lastUpdated>20190802081506</lastUpdated> - </versioning> -</metadata> diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_moa/2.06/_remote.repositories b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_moa/2.06/_remote.repositories deleted file mode 100644 index e2c65c24..00000000 --- a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_moa/2.06/_remote.repositories +++ /dev/null @@ -1,4 +0,0 @@ -#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice. -#Fri Aug 02 10:15:27 CEST 2019 -iaik_moa-2.06.jar>= -iaik_moa-2.06.pom>= diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_moa/maven-metadata-local.xml b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_moa/maven-metadata-local.xml deleted file mode 100644 index d55ab915..00000000 --- a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_moa/maven-metadata-local.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<metadata> - <groupId>iaik.prod</groupId> - <artifactId>iaik_moa</artifactId> - <versioning> - <release>2.06</release> - <versions> - <version>2.06</version> - </versions> - <lastUpdated>20190802081527</lastUpdated> - </versioning> -</metadata> diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_pki_module/2.01_moa/_remote.repositories b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_pki_module/2.01_moa/_remote.repositories deleted file mode 100644 index add0ea40..00000000 --- a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_pki_module/2.01_moa/_remote.repositories +++ /dev/null @@ -1,4 +0,0 @@ -#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice. -#Fri Aug 02 10:15:17 CEST 2019 -iaik_pki_module-2.01_moa.jar>= -iaik_pki_module-2.01_moa.pom>= diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_pki_module/maven-metadata-local.xml b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_pki_module/maven-metadata-local.xml deleted file mode 100644 index e4d6960c..00000000 --- a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_pki_module/maven-metadata-local.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<metadata> - <groupId>iaik.prod</groupId> - <artifactId>iaik_pki_module</artifactId> - <versioning> - <release>2.01_moa</release> - <versions> - <version>2.01_moa</version> - </versions> - <lastUpdated>20190802081517</lastUpdated> - </versioning> -</metadata> diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_sva/1.0.3_moa/_remote.repositories b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_sva/1.0.3_moa/_remote.repositories deleted file mode 100644 index b66b9ea6..00000000 --- a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_sva/1.0.3_moa/_remote.repositories +++ /dev/null @@ -1,4 +0,0 @@ -#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice. -#Fri Aug 02 10:15:23 CEST 2019 -iaik_sva-1.0.3_moa.pom>= -iaik_sva-1.0.3_moa.jar>= diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_sva/maven-metadata-local.xml b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_sva/maven-metadata-local.xml deleted file mode 100644 index c35d2589..00000000 --- a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_sva/maven-metadata-local.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<metadata> - <groupId>iaik.prod</groupId> - <artifactId>iaik_sva</artifactId> - <versioning> - <release>1.0.3_moa</release> - <versions> - <version>1.0.3_moa</version> - </versions> - <lastUpdated>20190802081523</lastUpdated> - </versioning> -</metadata> diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_tsp/2.32_eval/_remote.repositories b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_tsp/2.32_eval/_remote.repositories deleted file mode 100644 index 69225450..00000000 --- a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_tsp/2.32_eval/_remote.repositories +++ /dev/null @@ -1,4 +0,0 @@ -#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice. -#Fri Aug 02 10:15:06 CEST 2019 -iaik_tsp-2.32_eval.jar>= -iaik_tsp-2.32_eval.pom>= diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_tsp/maven-metadata-local.xml b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_tsp/maven-metadata-local.xml deleted file mode 100644 index 368cc1b0..00000000 --- a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_tsp/maven-metadata-local.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<metadata> - <groupId>iaik.prod</groupId> - <artifactId>iaik_tsp</artifactId> - <versioning> - <release>2.32_eval</release> - <versions> - <version>2.32_eval</version> - </versions> - <lastUpdated>20190802081506</lastUpdated> - </versioning> -</metadata> diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_util/0.23/_remote.repositories b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_util/0.23/_remote.repositories deleted file mode 100644 index 236735f2..00000000 --- a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_util/0.23/_remote.repositories +++ /dev/null @@ -1,4 +0,0 @@ -#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice. -#Fri Aug 02 10:15:05 CEST 2019 -iaik_util-0.23.jar>= -iaik_util-0.23.pom>= diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_util/maven-metadata-local.xml b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_util/maven-metadata-local.xml deleted file mode 100644 index 31b9ea63..00000000 --- a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_util/maven-metadata-local.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<metadata> - <groupId>iaik.prod</groupId> - <artifactId>iaik_util</artifactId> - <versioning> - <release>0.23</release> - <versions> - <version>0.23</version> - </versions> - <lastUpdated>20190802081505</lastUpdated> - </versioning> -</metadata> diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_xades/2.13_moa/_remote.repositories b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_xades/2.13_moa/_remote.repositories deleted file mode 100644 index 4a8351bd..00000000 --- a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_xades/2.13_moa/_remote.repositories +++ /dev/null @@ -1,4 +0,0 @@ -#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice. -#Fri Aug 02 10:15:15 CEST 2019 -iaik_xades-2.13_moa.pom>= -iaik_xades-2.13_moa.jar>= diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_xades/maven-metadata-local.xml b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_xades/maven-metadata-local.xml deleted file mode 100644 index c268797f..00000000 --- a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_xades/maven-metadata-local.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<metadata> - <groupId>iaik.prod</groupId> - <artifactId>iaik_xades</artifactId> - <versioning> - <release>2.13_moa</release> - <versions> - <version>2.13_moa</version> - </versions> - <lastUpdated>20190802081515</lastUpdated> - </versioning> -</metadata> diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_xsect/2.13_moa/_remote.repositories b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_xsect/2.13_moa/_remote.repositories deleted file mode 100644 index 5ecef39c..00000000 --- a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_xsect/2.13_moa/_remote.repositories +++ /dev/null @@ -1,4 +0,0 @@ -#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice. -#Fri Aug 02 10:15:20 CEST 2019 -iaik_xsect-2.13_moa.pom>= -iaik_xsect-2.13_moa.jar>= diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_xsect/maven-metadata-local.xml b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_xsect/maven-metadata-local.xml deleted file mode 100644 index 3ada4dea..00000000 --- a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_xsect/maven-metadata-local.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<metadata> - <groupId>iaik.prod</groupId> - <artifactId>iaik_xsect</artifactId> - <versioning> - <release>2.13_moa</release> - <versions> - <version>2.13_moa</version> - </versions> - <lastUpdated>20190802081520</lastUpdated> - </versioning> -</metadata> diff --git a/eaaf_modules/eaaf_module_pvp2_core/pom.xml b/eaaf_modules/eaaf_module_pvp2_core/pom.xml index 2439c457..3704e049 100644 --- a/eaaf_modules/eaaf_module_pvp2_core/pom.xml +++ b/eaaf_modules/eaaf_module_pvp2_core/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>at.gv.egiz.eaaf</groupId> <artifactId>eaaf_modules</artifactId> - <version>1.1.5-SNAPSHOT</version> + <version>1.1.6-SNAPSHOT</version> </parent> <artifactId>eaaf_module_pvp2_core</artifactId> <name>eaaf_module_pvp2_core</name> diff --git a/eaaf_modules/eaaf_module_pvp2_idp/pom.xml b/eaaf_modules/eaaf_module_pvp2_idp/pom.xml index 296e0a84..5bef731f 100644 --- a/eaaf_modules/eaaf_module_pvp2_idp/pom.xml +++ b/eaaf_modules/eaaf_module_pvp2_idp/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>at.gv.egiz.eaaf</groupId> <artifactId>eaaf_modules</artifactId> - <version>1.1.5-SNAPSHOT</version> + <version>1.1.6-SNAPSHOT</version> </parent> <artifactId>eaaf_module_pvp2_idp</artifactId> <name>eaaf_module_pvp2_idp</name> diff --git a/eaaf_modules/eaaf_module_pvp2_sp/pom.xml b/eaaf_modules/eaaf_module_pvp2_sp/pom.xml index 9cc3e934..70218961 100644 --- a/eaaf_modules/eaaf_module_pvp2_sp/pom.xml +++ b/eaaf_modules/eaaf_module_pvp2_sp/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>at.gv.egiz.eaaf</groupId> <artifactId>eaaf_modules</artifactId> - <version>1.1.5-SNAPSHOT</version> + <version>1.1.6-SNAPSHOT</version> </parent> <artifactId>eaaf_module_pvp2_sp</artifactId> <name>eaaf_module_pvp2_sp</name> diff --git a/eaaf_modules/pom.xml b/eaaf_modules/pom.xml index d9c4ba76..e33acb93 100644 --- a/eaaf_modules/pom.xml +++ b/eaaf_modules/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>at.gv.egiz</groupId> <artifactId>eaaf</artifactId> - <version>1.1.5-SNAPSHOT</version> + <version>1.1.6-SNAPSHOT</version> </parent> <groupId>at.gv.egiz.eaaf</groupId> @@ -6,7 +6,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>at.gv.egiz</groupId> <artifactId>eaaf</artifactId> - <version>1.1.5-SNAPSHOT</version> + <version>1.1.6-SNAPSHOT</version> <packaging>pom</packaging> <name>EGIZ EAAF components</name> |