diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-05-10 15:50:52 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-05-10 15:50:52 +0200 |
| commit | aa4f6b8a17400e6ebbe83d92e26b25413deb9aa1 (patch) | |
| tree | 0798f107e13d8a8546c1b15c6432e5360a656e92 /id/oa/pom.xml | |
| parent | 576f5ea5cfaf2ea174f198dc5df238c1ca0c331a (diff) | |
| parent | c3e07d7fb87b2d132ffc838e4878b9479da361a7 (diff) | |
| download | moa-id-spss-aa4f6b8a17400e6ebbe83d92e26b25413deb9aa1.tar.gz moa-id-spss-aa4f6b8a17400e6ebbe83d92e26b25413deb9aa1.tar.bz2 moa-id-spss-aa4f6b8a17400e6ebbe83d92e26b25413deb9aa1.zip | |
Update to MOA-SPSS 3.0.0-RC1
Merge branch 'moa-id-3.2_(OPB)' into moa-id_with_moa-sig_and_eccelerate
Conflicts:
id/moa-spss-container/pom.xml
pom.xml
Diffstat (limited to 'id/oa/pom.xml')
| -rw-r--r-- | id/oa/pom.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/id/oa/pom.xml b/id/oa/pom.xml index 8abd75461..c2eb6238c 100644 --- a/id/oa/pom.xml +++ b/id/oa/pom.xml @@ -70,11 +70,11 @@ <version>1.2</version> <scope>provided</scope> </dependency> - <dependency> +<!-- <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <scope>provided</scope> - </dependency> + </dependency> --> <dependency> <groupId>org.opensaml</groupId> @@ -98,7 +98,7 @@ </dependency> <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>javax.servlet-api</artifactId> <scope>provided</scope> </dependency> <dependency> |