diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2018-07-16 18:34:17 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2018-07-16 18:34:17 +0200 |
| commit | 43b57a3c903669fc9de36c46e99773bac97a2102 (patch) | |
| tree | 1e5cd74c040f79709d0265acb134bb50085848e3 /id/moa-spss-container/pom.xml | |
| parent | 05d5c29bb3be38d40484f9c5bb5fdbdc131cba9f (diff) | |
| parent | 4ae32fabc822b3c8ed51d380969f7db682d1bfae (diff) | |
| download | moa-id-spss-43b57a3c903669fc9de36c46e99773bac97a2102.tar.gz moa-id-spss-43b57a3c903669fc9de36c46e99773bac97a2102.tar.bz2 moa-id-spss-43b57a3c903669fc9de36c46e99773bac97a2102.zip | |
Merge branch 'huge_refactoring' into development_preview
# Conflicts:
# id/server/doc/handbook/config/config.html
# id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameterDecorator.java
# id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
# id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyAuthenticationBlockTask.java
# id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/validator/CreateXMLSignatureResponseValidator.java
Diffstat (limited to 'id/moa-spss-container/pom.xml')
| -rw-r--r-- | id/moa-spss-container/pom.xml | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/id/moa-spss-container/pom.xml b/id/moa-spss-container/pom.xml index d66a09621..1a2a5750d 100644 --- a/id/moa-spss-container/pom.xml +++ b/id/moa-spss-container/pom.xml @@ -47,7 +47,7 @@ <dependency> <groupId>MOA.spss.server</groupId> <artifactId>moa-sig-lib</artifactId> - <version>3.1.1</version> + <version>3.1.2</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -65,12 +65,12 @@ <dependency> <groupId>MOA.spss</groupId> <artifactId>common</artifactId> - <version>3.1.1</version> + <version>3.1.2</version> </dependency> <dependency> <groupId>MOA.spss</groupId> <artifactId>tsl_lib</artifactId> - <version>2.0.0</version> + <version>2.0.1</version> </dependency> <dependency> <groupId>iaik.prod</groupId> @@ -201,36 +201,36 @@ <version>${jaxb.version}</version> </dependency> - <dependency> +<!-- <dependency> <groupId>xalan-bin-dist</groupId> <artifactId>xalan</artifactId> - <!-- should be provided by the container or jre --> - <!-- <scope>provided</scope> --> + should be provided by the container or jre + <scope>provided</scope> <exclusions> <exclusion> <artifactId>serializer</artifactId> <groupId>xalan</groupId> </exclusion> </exclusions> - </dependency> - <dependency> + </dependency> --> +<!-- <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <!-- should be provided by the container or jre --> - <!-- <scope>provided</scope> --> - </dependency> - <dependency> + should be provided by the container or jre + <scope>provided</scope> + </dependency> --> +<!-- <dependency> <groupId>xalan-bin-dist</groupId> <artifactId>xml-apis</artifactId> - <!-- should be provided by the container or jre --> - <!-- <scope>provided</scope> --> + should be provided by the container or jre + <scope>provided</scope> </dependency> <dependency> <groupId>xalan-bin-dist</groupId> <artifactId>serializer</artifactId> - <!-- should be provided by the container or jre --> - <!-- <scope>provided</scope> --> - </dependency> + should be provided by the container or jre + <scope>provided</scope> + </dependency> --> </dependencies> |