diff options
| author | Thomas Knall <t.knall@datentechnik-innovation.com> | 2015-01-30 13:15:05 +0100 |
|---|---|---|
| committer | Thomas Knall <t.knall@datentechnik-innovation.com> | 2015-01-30 13:36:17 +0100 |
| commit | a4b6ed0c8098600a19b122ae819e342b324ba66e (patch) | |
| tree | ec8d51e257db7d47e4b5d631fe8df114245088b6 /id/server/idserverlib/pom.xml | |
| parent | 373641cfb0e404e89f4d9a011ae53d8b8cfc06c5 (diff) | |
| parent | fca585327afd4fd3dc0b5f1146cbb5d8648c3a41 (diff) | |
| download | moa-id-spss-a4b6ed0c8098600a19b122ae819e342b324ba66e.tar.gz moa-id-spss-a4b6ed0c8098600a19b122ae819e342b324ba66e.tar.bz2 moa-id-spss-a4b6ed0c8098600a19b122ae819e342b324ba66e.zip | |
Merge remote-tracking branch 'remotes/origin/MOAID-62'
Conflicts:
id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/AuthModuleImpl.java
id/server/idserverlib/src/main/resources/META-INF/services/at.gv.egovernment.moa.id.moduls.moduleregistration.AuthModule
Diffstat (limited to 'id/server/idserverlib/pom.xml')
| -rw-r--r-- | id/server/idserverlib/pom.xml | 77 |
1 files changed, 59 insertions, 18 deletions
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index 530e00d74..7666db141 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -15,7 +15,6 @@ <properties>
<repositoryPath>${basedir}/../../../repository</repositoryPath>
- <com.datentechnik.process-engine.version>0.0.1-SNAPSHOT</com.datentechnik.process-engine.version>
</properties>
<repositories>
@@ -25,13 +24,19 @@ <url>https://build.shibboleth.net/nexus/content/groups/public/</url>
</repository>
</repositories>
-
+
<dependencies>
- <dependency>
- <groupId>eu.stork</groupId>
- <artifactId>oasis-dss-api</artifactId>
- <version>1.0.0-RELEASE</version>
- </dependency>
+ <dependency>
+ <groupId>eu.stork</groupId>
+ <artifactId>oasis-dss-api</artifactId>
+ <version>1.0.0-RELEASE</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-io</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>MOA.id.server</groupId>
@@ -219,12 +224,7 @@ <artifactId>jul-to-slf4j</artifactId>
<version>1.7.6</version>
</dependency> -->
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
+
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
@@ -407,16 +407,57 @@ </dependency>
<dependency>
- <groupId>com.datentechnik.process-engine</groupId>
- <artifactId>dti-process-engine-spring-web</artifactId>
- <version>${com.datentechnik.process-engine.version}</version>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
+ <!-- testing -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- tools -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+
+ <!-- spring -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
|