diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2013-11-13 10:21:57 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2013-11-13 10:21:57 +0100 |
| commit | ad6cd1e156a7fcdadedf7fe7b54dedf8c0c897b1 (patch) | |
| tree | f01ad482013d2b45e275be3fc39b59ba02a8de72 /id | |
| parent | 5a75a47186f080508052b8c197aaec8eba013362 (diff) | |
| parent | f6c9d4d2f12db71cf1195f0f0f932cf808289bb4 (diff) | |
| download | moa-id-spss-ad6cd1e156a7fcdadedf7fe7b54dedf8c0c897b1.tar.gz moa-id-spss-ad6cd1e156a7fcdadedf7fe7b54dedf8c0c897b1.tar.bz2 moa-id-spss-ad6cd1e156a7fcdadedf7fe7b54dedf8c0c897b1.zip | |
Merge branch 'moa2_0_tlenz' into moa_2.0_OAuth
Conflicts:
id/ConfigWebTool/pom.xml
Diffstat (limited to 'id')
| -rw-r--r-- | id/ConfigWebTool/.classpath | 1 | ||||
| -rw-r--r-- | id/ConfigWebTool/pom.xml | 2 | ||||
| -rw-r--r-- | id/server/stork-saml-engine/pom.xml | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/id/ConfigWebTool/.classpath b/id/ConfigWebTool/.classpath index 0e6d0b69f..5bde2110d 100644 --- a/id/ConfigWebTool/.classpath +++ b/id/ConfigWebTool/.classpath @@ -26,7 +26,6 @@ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> <attributes> <attribute name="maven.pomderived" value="true"/> - <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/> </attributes> </classpathentry> <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"> diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml index 7450c4949..dd56a6151 100644 --- a/id/ConfigWebTool/pom.xml +++ b/id/ConfigWebTool/pom.xml @@ -16,7 +16,6 @@ <properties> <repositoryPath>${basedir}/../../repository</repositoryPath> </properties> - <dependencies> <dependency> @@ -76,6 +75,7 @@ <artifactId>commons-iaik</artifactId> <version>0.7.1</version> </dependency> + </dependencies> </project>
\ No newline at end of file diff --git a/id/server/stork-saml-engine/pom.xml b/id/server/stork-saml-engine/pom.xml index 4243dc8fc..1988b9af0 100644 --- a/id/server/stork-saml-engine/pom.xml +++ b/id/server/stork-saml-engine/pom.xml @@ -86,7 +86,7 @@ <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.6.4</version>
- <scope>runtime</scope>
+ <!-- scope>runtime</scope -->
</dependency>
</dependencies>
</project>
\ No newline at end of file |