aboutsummaryrefslogtreecommitdiff
path: root/pom.xml
diff options
context:
space:
mode:
authorBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-02-04 13:35:09 +0100
committerBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-02-04 13:35:09 +0100
commit0a4c2f12ad6115ec40d325f5df8a3afb07d536dc (patch)
treef5ca85181fa6129bc1a42e918b5b64dd9cbdc744 /pom.xml
parent791615f1f887f81ade19a374e2552f3cb1be89ab (diff)
parent265a005d263ef99d57f53169cbd15b94d09046c8 (diff)
downloadmoa-id-spss-0a4c2f12ad6115ec40d325f5df8a3afb07d536dc.tar.gz
moa-id-spss-0a4c2f12ad6115ec40d325f5df8a3afb07d536dc.tar.bz2
moa-id-spss-0a4c2f12ad6115ec40d325f5df8a3afb07d536dc.zip
Merge branch 'moa2_0_tlenz' of gitlab.iaik.tugraz.at:afitzek/moa-idspss into moa2_0_tlenz_bs_2
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/pom.xml b/pom.xml
index c162aba71..33ca79239 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
</activation>
<modules>
<module>common</module>
- <!-- <module>spss</module> -->
+ <module>spss</module>
<module>id</module>
</modules>
</profile>
@@ -69,9 +69,9 @@
<finalName>moa</finalName>
<descriptors>
<descriptor>id/assembly-auth.xml</descriptor>
-<!-- <descriptor>id/assembly-proxy.xml</descriptor>
+ <descriptor>id/assembly-proxy.xml</descriptor>
<descriptor>spss/assembly.xml</descriptor>
- <descriptor>spss/assembly-lib.xml</descriptor> -->
+ <descriptor>spss/assembly-lib.xml</descriptor>
</descriptors>
</configuration>
</plugin>