Age | Commit message (Collapse) | Author | Files | Lines |
|
|
|
Conflicts:
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeProviderFactory.java
id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/CustomAttributeQueryValidator.java
id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/MultipleAssertionResponseValidator.java
|
|
|
|
|
|
|
|
|
|
Conflicts:
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java
id/server/stork2-commons/pom.xml
id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/entries
id/server/stork2-commons/src/main/resources/.svn/entries
id/server/stork2-saml-engine/pom.xml
pom.xml
|
|
|
|
- Disable erroneous IAIK PKI logger initialization (should be addressed by.
- Remove redundant maven-dependency version declarations.
- Fix maven/eclipse lifecyle warning problem.
|
|
- Remove svn metadata.
- Fix local repository (inappropriate xalan-bin-dist dependency file names and copy-past error in dependency pom).
- Switch jdk 1.5/1.6 to 1.7.
- Exclude non working tests.
|
|
|
|
|
|
gitlab.iaik.tugraz.at:afitzek/moa-idspss into moa-2.1-Snapshot"
This reverts commit 775e39a724baf237085280510216fbd688df6dd9, reversing
changes made to 1fbff5f5a86733bc6a75c8ae901153baa0963441.
|
|
|
|
- opensaml > 2.6.3
- iaik-moa > 1.51
- iaik_jce_full > 5.2
- iaik_cms > 5.0
|
|
> org.apache.struts:struts2-core 2.3.16.3
> org.apache.struts:struts2-json-plugin 2.3.16.3
> joda-time:joda-time 2.4
> org.slf4j:jcl-over-slf4j 1.7.7
> org.slf4j:jul-to-slf4j 1.7.7
> org.slf4j:slf4j-api 1.7.7
> org.slf4j:slf4j-log4j12 1.7.7
> mysql:mysql-connector-java 5.1.32
> org.hibernate:hibernate-core 4.3.6.Final
> org.hibernate:hibernate-entitymanager 4.3.6.Final
> org.hibernate:hibernate-c3p0 4.3.6.Final
> com.google.http-client:google-http-client-jackson2 1.19.0
> com.google.oauth-client:google-oauth-client-jetty 1.19.0
> org.apache.commons:commons-lang3 3.3.2
> commons-codec:commons-codec 1.9
> commons-logging:commons-logging 1.2
> xerces:xercesImpl 2.11.0
> postgresql:postgresql 9.3-1102-jdbc41
> junit:junit 3.8.2
|
|
|
|
This reverts commit e147bdb7da8e48c1483c7732a0eb6b6f54699b66.
Conflicts:
id/ConfigWebTool/pom.xml
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|