diff options
| author | Christian Maierhofer <cmaierhofer@iaik.tugraz.at> | 2016-06-29 15:30:11 +0200 |
|---|---|---|
| committer | Christian Maierhofer <cmaierhofer@iaik.tugraz.at> | 2016-06-29 15:30:11 +0200 |
| commit | 00201834551ca5bb5a48ccdc67fc60d86b0aaa6b (patch) | |
| tree | b5fff339bf0d0c84001cd4216d590c954c29f82f /id/moa-spss-container | |
| parent | 66a7c51bbad7e4394c656b627bc0cddf2a063741 (diff) | |
| parent | 1d9f9528cba4b85c852aebdffd8699df5f22b302 (diff) | |
| download | moa-id-spss-00201834551ca5bb5a48ccdc67fc60d86b0aaa6b.tar.gz moa-id-spss-00201834551ca5bb5a48ccdc67fc60d86b0aaa6b.tar.bz2 moa-id-spss-00201834551ca5bb5a48ccdc67fc60d86b0aaa6b.zip | |
Merge branch 'currenteidas' into moapid-3.2-opb-redis
Conflicts:
id/server/modules/moa-id-module-openID/src/test/java/test/at/gv/egovernment/moa/id/auth/oauth/CertTest.java
Diffstat (limited to 'id/moa-spss-container')
| -rw-r--r-- | id/moa-spss-container/pom.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/id/moa-spss-container/pom.xml b/id/moa-spss-container/pom.xml index bddc25f71..824b5c555 100644 --- a/id/moa-spss-container/pom.xml +++ b/id/moa-spss-container/pom.xml @@ -12,7 +12,7 @@ <description>This module holds MOA-SPSS and all required library</description> <properties> - <repositoryPath>${basedir}/../../../repository</repositoryPath> + <repositoryPath>${basedir}/../../repository</repositoryPath> </properties> <repositories> @@ -35,7 +35,7 @@ <artifactId>maven-compiler-plugin</artifactId> <configuration> <includes> - <include>${basedir}/../../../repository/MOA/spss/ext_libs/*.jar</include> + <include>${basedir}/../../repository/MOA/spss/ext_libs/*.jar</include> </includes> </configuration> </plugin> |