diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-02-18 13:47:14 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-02-18 13:47:14 +0100 |
| commit | bf086cff8ef680b73ca0300147c3c3b70ab32ae0 (patch) | |
| tree | 1174cdc916982f5f879cde1fc587147a7dced63d /id/server/stork2-commons/pom.xml | |
| parent | 570527d48e3bf03444cdda08a4c1bcf8e7d4ff42 (diff) | |
| parent | 271e22add71f0260f5d421844a2171a09093f505 (diff) | |
| download | moa-id-spss-bf086cff8ef680b73ca0300147c3c3b70ab32ae0.tar.gz moa-id-spss-bf086cff8ef680b73ca0300147c3c3b70ab32ae0.tar.bz2 moa-id-spss-bf086cff8ef680b73ca0300147c3c3b70ab32ae0.zip | |
Merge branch 'datentechnik_modularization' into moa-id-2.2-merge
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
Diffstat (limited to 'id/server/stork2-commons/pom.xml')
| -rw-r--r-- | id/server/stork2-commons/pom.xml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/id/server/stork2-commons/pom.xml b/id/server/stork2-commons/pom.xml index 926651b04..dc9c22515 100644 --- a/id/server/stork2-commons/pom.xml +++ b/id/server/stork2-commons/pom.xml @@ -128,8 +128,8 @@ <artifactId>maven-compiler-plugin</artifactId> <version>3.1</version> <configuration> - <source>1.6</source> - <target>1.6</target> + <source>1.7</source> + <target>1.7</target> <encoding>UTF-8</encoding> </configuration> </plugin> @@ -180,9 +180,8 @@ <configuration> <links> <link>http://commons.apache.org/lang/api/</link> - <link>http://java.sun.com/j2se/1.6.0/docs/api/</link> <link>http://www.bouncycastle.org/docs/docs1.6/</link> - <link>http://docs.oracle.com/javase/6/docs/api/</link> + <link>http://docs.oracle.com/javase/7/docs/api/</link> </links> </configuration> </plugin> |