aboutsummaryrefslogtreecommitdiff
path: root/id/server/moa-id-commons
diff options
context:
space:
mode:
authorBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-02-03 19:04:01 +0100
committerBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-02-03 19:04:01 +0100
commit791615f1f887f81ade19a374e2552f3cb1be89ab (patch)
treecddbd5c8d76fff6c1cec359212ab0bf13c687729 /id/server/moa-id-commons
parentd4d3d93cd9d6338cf1755eb1a0ce47bec7e4c109 (diff)
downloadmoa-id-spss-791615f1f887f81ade19a374e2552f3cb1be89ab.tar.gz
moa-id-spss-791615f1f887f81ade19a374e2552f3cb1be89ab.tar.bz2
moa-id-spss-791615f1f887f81ade19a374e2552f3cb1be89ab.zip
merging again
Diffstat (limited to 'id/server/moa-id-commons')
-rw-r--r--id/server/moa-id-commons/moa-id-commons.iml5
-rw-r--r--id/server/moa-id-commons/pom.xml9
2 files changed, 9 insertions, 5 deletions
diff --git a/id/server/moa-id-commons/moa-id-commons.iml b/id/server/moa-id-commons/moa-id-commons.iml
index 411421a90..3dfcfd427 100644
--- a/id/server/moa-id-commons/moa-id-commons.iml
+++ b/id/server/moa-id-commons/moa-id-commons.iml
@@ -29,11 +29,10 @@
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/xjc" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources/config" type="java-resource" />
- <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/xjc" isTestSource="false" generated="true" />
- <excludeFolder url="file://$MODULE_DIR$/target/apidocs" />
- <excludeFolder url="file://$MODULE_DIR$/target/classes" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index 6ff61a12e..9a3cf4f7c 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>MOA.id</groupId>
<artifactId>moa-id</artifactId>
-cd id
+ <version>1.9.98-SNAPSHOT</version>
</parent>
<artifactId>moa-id-commons</artifactId>
<name>moa-id-commons</name>
@@ -14,7 +14,12 @@ cd id
<id>hyberjaxb</id>
<url>http://repository.highsource.org/maven2/releases/</url>
<releases><enabled>true</enabled></releases>
- </repository>
+ </repository>
+ <repository>
+ <id>JBoss IAIK</id>
+ <url>http://nexus.iaik.tugraz.at/nexus/content/repositories/nexus/</url>
+ <!-- <releases><enabled>true</enabled></releases> -->
+ </repository>
</repositories>
<dependencies>