diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-03-20 13:46:11 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-03-20 13:46:11 +0100 |
| commit | a81cea6b42fcc46ea1f1a6a2e263f1398464c638 (patch) | |
| tree | 33539395ff60793f57d37ef4df41e80ae84e3c88 /pom.xml | |
| parent | 97535aec057fa529c5e7bb16799e33831c1f5e87 (diff) | |
| parent | fa1389bd2c34f5230afccbeb516cbcf7a17ba97f (diff) | |
| download | moa-id-spss-a81cea6b42fcc46ea1f1a6a2e263f1398464c638.tar.gz moa-id-spss-a81cea6b42fcc46ea1f1a6a2e263f1398464c638.tar.bz2 moa-id-spss-a81cea6b42fcc46ea1f1a6a2e263f1398464c638.zip | |
Merge remote-tracking branch 'remotes/origin/moa_spss_1.5.2' into moa2_0_tlenz
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 24 |
1 files changed, 13 insertions, 11 deletions
@@ -9,6 +9,7 @@ <properties>
<repositoryPath>${basedir}/repository</repositoryPath>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<profiles>
@@ -23,7 +24,7 @@ <modules>
<module>common</module>
<module>spss</module>
- <module>id</module>
+ <!-- <module>id</module>-->
</modules>
</profile>
</profiles>
@@ -64,12 +65,13 @@ <plugin>
<inherited>false</inherited>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
+ <version>2.2-beta-1</version>
+ <!-- TODO Update Version 2.2-beta-1 for MOA-SPSS -->
<configuration>
<finalName>moa</finalName>
<descriptors>
- <descriptor>id/assembly-auth.xml</descriptor>
- <descriptor>id/assembly-proxy.xml</descriptor>
+ <!-- <descriptor>id/assembly-auth.xml</descriptor>
+ <descriptor>id/assembly-proxy.xml</descriptor>-->
<descriptor>spss/assembly.xml</descriptor>
<descriptor>spss/assembly-lib.xml</descriptor>
</descriptors>
@@ -195,12 +197,12 @@ <version>2.0.0</version>
<scope>compile</scope>
</dependency>
- <dependency>
+ <!-- <dependency>
<groupId>MOA.id.server</groupId>
<artifactId>moa-id-lib</artifactId>
<version>2.0-RC2</version>
<scope>compile</scope>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>MOA.spss.server</groupId>
<artifactId>moa-spss-lib</artifactId>
@@ -352,18 +354,18 @@ <!-- TSL -->
<dependency>
- <groupId>iaik.prod</groupId>
+ <groupId>iaik</groupId>
<artifactId>iaik_tsl</artifactId>
<version>1.0</version>
</dependency>
<dependency>
- <groupId>iaik.prod</groupId>
+ <groupId>iaik</groupId>
<artifactId>iaik_util</artifactId>
<version>0.23</version>
</dependency>
<dependency>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_xsect</artifactId>
+ <groupId>iaik</groupId>
+ <artifactId>iaik_xsect_eval</artifactId>
<version>1.1709142</version>
</dependency>
<dependency>
@@ -382,7 +384,7 @@ <version>3.7.8-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>iaik.prod</groupId>
+ <groupId>iaik</groupId>
<artifactId>iaik_jsse</artifactId>
<version>4.4</version>
</dependency>
|