aboutsummaryrefslogtreecommitdiff
path: root/id/server/stork-saml-engine
diff options
context:
space:
mode:
authorBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-01-27 17:42:51 +0100
committerBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-01-27 17:42:51 +0100
commitaba2defe8f95cf960395158f6eb2ad7b1fb6e150 (patch)
tree298a0165a30b8538b89abb93a399c615f91702d3 /id/server/stork-saml-engine
parented9ad9b0c13ee0de3231bab038f35b01beeb0d0b (diff)
parentcea2f395ec773b386ec628d60120752cf320f6b6 (diff)
downloadmoa-id-spss-aba2defe8f95cf960395158f6eb2ad7b1fb6e150.tar.gz
moa-id-spss-aba2defe8f95cf960395158f6eb2ad7b1fb6e150.tar.bz2
moa-id-spss-aba2defe8f95cf960395158f6eb2ad7b1fb6e150.zip
merging
Diffstat (limited to 'id/server/stork-saml-engine')
-rw-r--r--id/server/stork-saml-engine/pom.xml6
-rw-r--r--id/server/stork-saml-engine/stork-saml-engine.iml6
2 files changed, 5 insertions, 7 deletions
diff --git a/id/server/stork-saml-engine/pom.xml b/id/server/stork-saml-engine/pom.xml
index c10e4daf7..41bfde6d1 100644
--- a/id/server/stork-saml-engine/pom.xml
+++ b/id/server/stork-saml-engine/pom.xml
@@ -17,8 +17,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
-<source>1.5</source>
-<target>1.5</target>
+<source>1.6</source>
+<target>1.6</target>
</configuration>
</plugin>
</plugins>
@@ -90,4 +90,4 @@
<!-- scope>runtime</scope -->
</dependency>
</dependencies>
-</project> \ No newline at end of file
+</project>
diff --git a/id/server/stork-saml-engine/stork-saml-engine.iml b/id/server/stork-saml-engine/stork-saml-engine.iml
index f905ffd42..f42931ee7 100644
--- a/id/server/stork-saml-engine/stork-saml-engine.iml
+++ b/id/server/stork-saml-engine/stork-saml-engine.iml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
@@ -10,8 +10,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.3" level="project" />
- <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.4" level="project" />
<orderEntry type="library" name="Maven: org.opensaml:opensaml:2.5.3" level="project" />
<orderEntry type="library" name="Maven: org.opensaml:openws:1.4.4" level="project" />
<orderEntry type="library" name="Maven: org.opensaml:xmltooling:1.3.4" level="project" />
@@ -33,7 +31,7 @@
<orderEntry type="library" name="Maven: org.owasp.esapi:esapi:2.0.1" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.6.4" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.4" level="project" />
- <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
+ <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
</component>
</module>