summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BKUApplet/pom.xml259
-rw-r--r--BKUAppletExt/pom.xml333
-rw-r--r--BKUCommonGUI/pom.xml66
-rw-r--r--BKULocal/pom.xml215
-rw-r--r--BKUOnline/pom.xml94
-rw-r--r--BKUViewer/pom.xml81
-rw-r--r--BKUWebStart/pom.xml60
-rw-r--r--STAL/pom.xml102
-rw-r--r--STALService/pom.xml40
-rw-r--r--STALXService/pom.xml4
-rw-r--r--bkucommon/pom.xml234
-rw-r--r--pom.xml174
-rw-r--r--smcc/pom.xml20
-rw-r--r--smccSTAL/pom.xml20
-rw-r--r--smccTest/pom.xml134
-rw-r--r--utils/pom.xml66
16 files changed, 1117 insertions, 785 deletions
diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 98bca22..b0e71c9 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -11,76 +11,76 @@
<build>
<plugins>
<plugin>
- <groupId>com.pyx4me</groupId>
- <artifactId>proguard-maven-plugin</artifactId>
- <version>2.0.4</version>
- <executions>
- <execution>
- <goals>
- <goal>proguard</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <obfuscate>false</obfuscate>
- <options>
- <option>-keep public class * extends at.gv.egiz.smcc.SignatureCard { *; }</option>
- <option>-keep public class * extends java.applet.Applet { *; }</option>
- <option>-keep @javax.xml.bind.annotation.** class * { *; }</option>
+ <groupId>com.pyx4me</groupId>
+ <artifactId>proguard-maven-plugin</artifactId>
+ <version>2.0.4</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>proguard</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <obfuscate>false</obfuscate>
+ <options>
+ <option>-keep public class * extends at.gv.egiz.smcc.SignatureCard { *; }</option>
+ <option>-keep public class * extends java.applet.Applet { *; }</option>
+ <option>-keep @javax.xml.bind.annotation.** class * { *; }</option>
<option>-keep @javax.xml.ws.** class * { *; }</option>
- <option>-ignorewarnings</option>
+ <option>-ignorewarnings</option>
<option>-printusage ${project.build.directory}/proguard_usage.txt</option>
- <option>-dontoptimize</option>
- <option>-dontpreverify</option>
- <option>-target 1.6</option>
- </options>
- <libs>
+ <option>-dontoptimize</option>
+ <option>-dontpreverify</option>
+ <option>-target 1.6</option>
+ </options>
+ <libs>
<lib>${java.home}/lib/rt.jar</lib>
- <lib>${java.home}/lib/jce.jar</lib>
+ <lib>${java.home}/lib/jce.jar</lib>
<lib>${java.home}/lib/jsse.jar</lib>
- </libs>
- <attach>true</attach>
- <appendClassifier>true</appendClassifier>
+ </libs>
+ <attach>true</attach>
+ <appendClassifier>true</appendClassifier>
<attachArtifactClassifier>single</attachArtifactClassifier>
- <assembly>
- <inclusions>
- <inclusion>
- <groupId>iaik</groupId>
- <artifactId>iaik_jce_me4se</artifactId>
- </inclusion>
- <inclusion>
- <groupId>at.gv.egiz</groupId>
- <artifactId>smcc</artifactId>
- </inclusion>
- <inclusion>
- <groupId>at.gv.egiz</groupId>
- <artifactId>STAL</artifactId>
- </inclusion>
- <inclusion>
- <groupId>at.gv.egiz</groupId>
- <artifactId>STALService</artifactId>
- </inclusion>
- <inclusion>
- <groupId>at.gv.egiz</groupId>
- <artifactId>smccSTAL</artifactId>
- </inclusion>
- <inclusion>
- <groupId>at.gv.egiz</groupId>
- <artifactId>BKUCommonGUI</artifactId>
- </inclusion>
- <inclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </inclusion>
- <inclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- </inclusion>
- </inclusions>
- </assembly>
- </configuration>
- </plugin>
- <plugin>
+ <assembly>
+ <inclusions>
+ <inclusion>
+ <groupId>iaik</groupId>
+ <artifactId>iaik_jce_me4se</artifactId>
+ </inclusion>
+ <inclusion>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>smcc</artifactId>
+ </inclusion>
+ <inclusion>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>STAL</artifactId>
+ </inclusion>
+ <inclusion>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>STALService</artifactId>
+ </inclusion>
+ <inclusion>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>smccSTAL</artifactId>
+ </inclusion>
+ <inclusion>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>BKUCommonGUI</artifactId>
+ </inclusion>
+ <inclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </inclusion>
+ <inclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ </inclusion>
+ </inclusions>
+ </assembly>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<executions>
@@ -94,7 +94,7 @@
<configuration>
<doCheck>false</doCheck>
<doUpdate>false</doUpdate>
- <revisionOnScmFailure>SvnRevMissing</revisionOnScmFailure>
+ <revisionOnScmFailure>SvnRevMissing</revisionOnScmFailure>
</configuration>
</plugin>
<plugin>
@@ -131,30 +131,30 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>proguard-osx</id>
- <activation>
- <os>
- <family>mac</family>
- </os>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>com.pyx4me</groupId>
- <artifactId>proguard-maven-plugin</artifactId>
- <configuration>
- <libs>
- <lib>${java.home}/../Classes/classes.jar</lib>
- <lib>${java.home}/lib/jce.jar</lib>
- <lib>${java.home}/../Classes/jsse.jar</lib>
- </libs>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
+ <profiles>
+ <profile>
+ <id>proguard-osx</id>
+ <activation>
+ <os>
+ <family>mac</family>
+ </os>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.pyx4me</groupId>
+ <artifactId>proguard-maven-plugin</artifactId>
+ <configuration>
+ <libs>
+ <lib>${java.home}/../Classes/classes.jar</lib>
+ <lib>${java.home}/lib/jce.jar</lib>
+ <lib>${java.home}/../Classes/jsse.jar</lib>
+ </libs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
<profile>
<id>pkcs11-sign</id>
<build>
@@ -174,6 +174,63 @@
</plugins>
</build>
</profile>
+ <profile>
+ <!--
+ This profile is here for triggering when another scm than svn is
+ used (for example git). Instead of getting the version build number
+ from svn we will use the build date and the user name.
+ -->
+ <id>buildnumber-git</id>
+ <activation>
+ <file>
+ <missing>.svn</missing>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.groovy.maven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <source>
+ def gitSvnProc = ["sh", "-c", "git svn info | awk '/Revision:/ { print \$2 }'"].execute()
+ gitSvnProc.waitFor()
+ project.properties['gitSvnRev'] = gitSvnProc.in.text.trim()
+ </source>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <doCheck>false</doCheck>
+ <doUpdate>false</doUpdate>
+ <format>{0}</format>
+ <items>
+ <item>${gitSvnRev}</item>
+ </items>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<dependencies>
<dependency>
@@ -206,16 +263,16 @@
<version>${project.parent.version}</version>
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
</dependencies>
</project>
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index fc3035e..bfd9fa7 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -1,16 +1,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>mocca</artifactId>
- <groupId>at.gv.egiz</groupId>
- <version>1.3.6-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>BKUAppletExt</artifactId>
- <name>BKU Applet Ext</name>
- <description>Card management extension for Java Applet used by MOCCA Online</description>
- <build>
- <plugins>
- <plugin>
+ <parent>
+ <artifactId>mocca</artifactId>
+ <groupId>at.gv.egiz</groupId>
+ <version>1.3.6-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>BKUAppletExt</artifactId>
+ <name>BKU Applet Ext</name>
+ <description>Card management extension for Java Applet used by MOCCA Online</description>
+ <build>
+ <plugins>
+ <plugin>
<groupId>com.pyx4me</groupId>
<artifactId>proguard-maven-plugin</artifactId>
<version>2.0.4</version>
@@ -82,77 +82,77 @@
</inclusion>
<!-- card management extensions -->
<inclusion>
- <groupId>at.gv.egiz</groupId>
- <artifactId>STALExt</artifactId>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>STALExt</artifactId>
</inclusion>
<inclusion>
- <groupId>at.gv.egiz</groupId>
- <artifactId>STALXService</artifactId>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>STALXService</artifactId>
</inclusion>
<inclusion>
- <groupId>at.gv.egiz</groupId>
- <artifactId>smccSTALExt</artifactId>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>smccSTALExt</artifactId>
</inclusion>
<inclusion>
- <groupId>at.gv.egiz</groupId>
- <artifactId>BKUGuiExt</artifactId>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>BKUGuiExt</artifactId>
</inclusion>
</inclusions>
</assembly>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>buildnumber-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>create</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <doCheck>false</doCheck>
- <doUpdate>false</doUpdate>
- <revisionOnScmFailure>SvnRevMissing</revisionOnScmFailure>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <groupId>org.apache.maven.plugins</groupId>
- <executions>
- <execution>
- <goals>
- <goal>sign</goal>
- </goals>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <doCheck>false</doCheck>
+ <doUpdate>false</doUpdate>
+ <revisionOnScmFailure>SvnRevMissing</revisionOnScmFailure>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>sign</goal>
+ </goals>
<configuration>
<jarPath>${project.build.directory}/${project.build.finalName}-single.${project.packaging}</jarPath>
</configuration>
- </execution>
- </executions>
- <configuration>
- <archive>
- <addMavenDescriptor>false</addMavenDescriptor>
- <index>false</index>
- <manifest>
- <addClasspath>false</addClasspath>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- <manifestEntries>
- <Implementation-Build>${project.version}-r${buildNumber}</Implementation-Build>
- </manifestEntries>
- </archive>
- <alias>test-applet signer</alias>
- <keystore>./keystore.ks</keystore>
- <storepass>storepass</storepass>
- <keypass>keypass</keypass>
- <verify>true</verify>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <profiles>
+ </execution>
+ </executions>
+ <configuration>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ <index>false</index>
+ <manifest>
+ <addClasspath>false</addClasspath>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+ <Implementation-Build>${project.version}-r${buildNumber}</Implementation-Build>
+ </manifestEntries>
+ </archive>
+ <alias>test-applet signer</alias>
+ <keystore>./keystore.ks</keystore>
+ <storepass>storepass</storepass>
+ <keypass>keypass</keypass>
+ <verify>true</verify>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
<profile>
<id>proguard-osx</id>
<activation>
@@ -176,73 +176,130 @@
</plugins>
</build>
</profile>
- <profile>
- <id>pkcs11-sign</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <groupId>org.apache.maven.plugins</groupId>
- <version>2.2-mocca</version>
- <configuration>
- <keystore>NONE</keystore>
- <type>PKCS11</type>
- <providerClass>iaik.pkcs.pkcs11.provider.IAIKPkcs11</providerClass>
- <alias>a-sit-2</alias>
- <storepass>${pkcs11-pass}</storepass>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
- <dependencies>
- <dependency>
- <groupId>at.gv.egiz</groupId>
- <artifactId>STALExt</artifactId>
- <version>${project.parent.version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>at.gv.egiz</groupId>
- <artifactId>STALXService</artifactId>
- <version>${project.parent.version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>at.gv.egiz</groupId>
- <artifactId>smccSTAL</artifactId>
- <version>${project.parent.version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>at.gv.egiz</groupId>
- <artifactId>BKUApplet</artifactId>
- <version>${project.parent.version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>at.gv.egiz</groupId>
- <artifactId>BKUGuiExt</artifactId>
- <version>${project.parent.version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>at.gv.egiz</groupId>
- <artifactId>smccSTALExt</artifactId>
- <version>${project.parent.version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
- </dependencies>
+ <profile>
+ <id>pkcs11-sign</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <version>2.2-mocca</version>
+ <configuration>
+ <keystore>NONE</keystore>
+ <type>PKCS11</type>
+ <providerClass>iaik.pkcs.pkcs11.provider.IAIKPkcs11</providerClass>
+ <alias>a-sit-2</alias>
+ <storepass>${pkcs11-pass}</storepass>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <!--
+ This profile is here for triggering when another scm than svn is
+ used (for example git). Instead of getting the version build number
+ from svn we will use the build date and the user name.
+ -->
+ <id>buildnumber-git</id>
+ <activation>
+ <file>
+ <missing>.svn</missing>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.groovy.maven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <source>
+ def gitSvnProc = ["sh", "-c", "git svn info | awk '/Revision:/ { print \$2 }'"].execute()
+ gitSvnProc.waitFor()
+ project.properties['gitSvnRev'] = gitSvnProc.in.text.trim()
+ </source>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <doCheck>false</doCheck>
+ <doUpdate>false</doUpdate>
+ <format>{0}</format>
+ <items>
+ <item>${gitSvnRev}</item>
+ </items>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+ <dependencies>
+ <dependency>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>STALExt</artifactId>
+ <version>${project.parent.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>STALXService</artifactId>
+ <version>${project.parent.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>smccSTAL</artifactId>
+ <version>${project.parent.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>BKUApplet</artifactId>
+ <version>${project.parent.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>BKUGuiExt</artifactId>
+ <version>${project.parent.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>smccSTALExt</artifactId>
+ <version>${project.parent.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
</project>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 2fec162..05d742b 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -1,35 +1,35 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>mocca</artifactId>
- <groupId>at.gv.egiz</groupId>
- <version>1.3.6-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>BKUCommonGUI</artifactId>
- <name>BKU Common GUI</name>
- <dependencies>
- <dependency>
- <groupId>at.gv.egiz</groupId>
- <artifactId>smcc</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>at.gv.egiz</groupId>
- <artifactId>STAL</artifactId>
- <version>${project.parent.version}</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
- <description>Common GUI functionality</description>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <groupId>org.apache.maven.plugins</groupId>
- <configuration>
- <debug>false</debug>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <parent>
+ <artifactId>mocca</artifactId>
+ <groupId>at.gv.egiz</groupId>
+ <version>1.3.6-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>BKUCommonGUI</artifactId>
+ <name>BKU Common GUI</name>
+ <dependencies>
+ <dependency>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>smcc</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>STAL</artifactId>
+ <version>${project.parent.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <description>Common GUI functionality</description>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <configuration>
+ <debug>false</debug>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project> \ No newline at end of file
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index adc8273..d9afe8d 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -1,15 +1,15 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>mocca</artifactId>
- <groupId>at.gv.egiz</groupId>
- <version>1.3.6-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>BKULocal</artifactId>
- <packaging>war</packaging>
- <name>MOCCA Local</name>
- <description>MOCCA Local</description>
- <build>
+ <parent>
+ <artifactId>mocca</artifactId>
+ <groupId>at.gv.egiz</groupId>
+ <version>1.3.6-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>BKULocal</artifactId>
+ <packaging>war</packaging>
+ <name>MOCCA Local</name>
+ <description>MOCCA Local</description>
+ <build>
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
@@ -40,7 +40,7 @@
<configuration>
<doCheck>false</doCheck>
<doUpdate>false</doUpdate>
- <revisionOnScmFailure>SvnRevMissing</revisionOnScmFailure>
+ <revisionOnScmFailure>SvnRevMissing</revisionOnScmFailure>
</configuration>
</plugin>
<plugin>
@@ -71,11 +71,11 @@
<outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
</configuration>
</execution>
- <!-- http://jira.egovlabs.gv.at/browse/MOCCA-762
+ <!-- http://jira.egovlabs.gv.at/browse/MOCCA-762
| do not provide certificates in webapp filesystem (default trust/certstores) -->
<execution>
- <id>copy-certificates</id>
+ <id>copy-certificates</id>
<goals>
<goal>unpack-dependencies</goal>
</goals>
@@ -91,27 +91,27 @@
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>at.gv.egiz</groupId>
- <artifactId>STAL</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>at.gv.egiz</groupId>
- <artifactId>bkucommon</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>at.gv.egiz</groupId>
- <artifactId>smcc</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>at.gv.egiz</groupId>
- <artifactId>smccSTAL</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>STAL</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>bkucommon</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>smcc</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>smccSTAL</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>BKUGuiExt</artifactId>
@@ -154,49 +154,106 @@
<groupId>iaik</groupId>
<artifactId>iaik_ecc_signed</artifactId>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <scope>compile</scope>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
- <profiles>
- <profile>
- <id>tomcat-deploy</id>
- <dependencies>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>compile</scope>
- </dependency>
- </dependencies>
- <properties>
- <netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
- </properties>
- </profile>
- </profiles>
+ <profiles>
+ <profile>
+ <id>tomcat-deploy</id>
+ <dependencies>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <properties>
+ <netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
+ </properties>
+ </profile>
+ <profile>
+ <!--
+ This profile is here for triggering when another scm than svn is
+ used (for example git). Instead of getting the version build number
+ from svn we will use the build date and the user name.
+ -->
+ <id>buildnumber-git</id>
+ <activation>
+ <file>
+ <missing>.svn</missing>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.groovy.maven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <source>
+ def gitSvnProc = ["sh", "-c", "git svn info | awk '/Revision:/ { print \$2 }'"].execute()
+ gitSvnProc.waitFor()
+ project.properties['gitSvnRev'] = gitSvnProc.in.text.trim()
+ </source>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <doCheck>false</doCheck>
+ <doUpdate>false</doUpdate>
+ <format>{0}</format>
+ <items>
+ <item>${gitSvnRev}</item>
+ </items>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index a2668e0..b09fa26 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -58,10 +58,10 @@
<groupId>iaik</groupId>
<artifactId>iaik_xsect</artifactId>
</dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_jce_full_signed</artifactId>
- </dependency>
+ <dependency>
+ <groupId>iaik</groupId>
+ <artifactId>iaik_jce_full_signed</artifactId>
+ </dependency>
<dependency>
<groupId>iaik</groupId>
<artifactId>iaik_ecc_signed</artifactId>
@@ -99,9 +99,9 @@
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
</dependency>
- <!--
+ <!--
| see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
- -->
+ -->
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
@@ -112,12 +112,12 @@
<artifactId>wstx-asl</artifactId>
</exclusion>
</exclusions>
- <!--
- conflict with SAAJ from java 6 ? <exclusions> <exclusion>
- <groupId>javax.xml.soap</groupId> <artifactId>saaj-api</artifactId>
- </exclusion> <exclusion>
- <groupId>com.sun.xml.messaging.saaj</groupId>
- <artifactId>saaj-impl</artifactId> </exclusion> </exclusions -->
+ <!--
+ conflict with SAAJ from java 6 ? <exclusions> <exclusion>
+ <groupId>javax.xml.soap</groupId> <artifactId>saaj-api</artifactId>
+ </exclusion> <exclusion>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId> </exclusion> </exclusions -->
</dependency>
<dependency>
<artifactId>sjsxp</artifactId>
@@ -144,11 +144,11 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2</version>
- <type>jar</type>
- <scope>compile</scope>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.2</version>
+ <type>jar</type>
+ <scope>compile</scope>
</dependency>
</dependencies>
<description>MOCCA Online</description>
@@ -173,6 +173,7 @@
</execution>
<execution>
<id>unpack-fonts</id>
+ <phase>package</phase>
<goals>
<goal>unpack-dependencies</goal>
</goals>
@@ -240,7 +241,7 @@
<configuration>
<doCheck>false</doCheck>
<doUpdate>false</doUpdate>
- <revisionOnScmFailure>SvnRevMissing</revisionOnScmFailure>
+ <revisionOnScmFailure>SvnRevMissing</revisionOnScmFailure>
</configuration>
</plugin>
</plugins>
@@ -323,6 +324,63 @@
</dependency>
</dependencies>
</profile>
+ <profile>
+ <!--
+ This profile is here for triggering when another scm than svn is
+ used (for example git). Instead of getting the version build number
+ from svn we will use the build date and the user name.
+ -->
+ <id>buildnumber-git</id>
+ <activation>
+ <file>
+ <missing>.svn</missing>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.groovy.maven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <source>
+ def gitSvnProc = ["sh", "-c", "git svn info | awk '/Revision:/ { print \$2 }'"].execute()
+ gitSvnProc.waitFor()
+ project.properties['gitSvnRev'] = gitSvnProc.in.text.trim()
+ </source>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <doCheck>false</doCheck>
+ <doUpdate>false</doUpdate>
+ <format>{0}</format>
+ <items>
+ <item>${gitSvnRev}</item>
+ </items>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<properties>
<netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 5dc37a2..b781eff 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -1,41 +1,42 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>mocca</artifactId>
- <groupId>at.gv.egiz</groupId>
- <version>1.3.6-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>BKUViewer</artifactId>
- <name>BKU Viewer</name>
- <description>Validator for plain text and XHTML to-be signed content</description>
- <dependencies>
- <dependency>
- <groupId>at.gv.egiz</groupId>
- <artifactId>bkucommon</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.w3c</groupId>
- <artifactId>css-validator</artifactId>
- <version>2.1-mocca</version>
- <exclusions>
- <exclusion>
- <groupId>org.w3c</groupId>
- <artifactId>jigsaw</artifactId>
- </exclusion>
- <exclusion>
- <groupId>tagsoup</groupId>
- <artifactId>tagsoup</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- </dependencies>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>mocca</artifactId>
+ <groupId>at.gv.egiz</groupId>
+ <version>1.3.6-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>BKUViewer</artifactId>
+ <name>BKU Viewer</name>
+ <description>Validator for plain text and XHTML to-be signed content</description>
+ <dependencies>
+ <dependency>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>bkucommon</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.w3c</groupId>
+ <artifactId>css-validator</artifactId>
+ <version>2.1-mocca</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.w3c</groupId>
+ <artifactId>jigsaw</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>tagsoup</groupId>
+ <artifactId>tagsoup</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ </dependencies>
</project>
diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml
index 7c6abfe..c87282a 100644
--- a/BKUWebStart/pom.xml
+++ b/BKUWebStart/pom.xml
@@ -52,7 +52,7 @@
<configuration>
<doCheck>false</doCheck>
<doUpdate>false</doUpdate>
- <revisionOnScmFailure>SvnRevMissing</revisionOnScmFailure>
+ <revisionOnScmFailure>SvnRevMissing</revisionOnScmFailure>
</configuration>
</plugin>
@@ -206,6 +206,64 @@
</build>
<!-- TODO somehow provide javaws.jar on manifest class-path -->
</profile>
+
+ <profile>
+ <!--
+ This profile is here for triggering when another scm than svn is
+ used (for example git). Instead of getting the version build number
+ from svn we will use the build date and the user name.
+ -->
+ <id>buildnumber-git</id>
+ <activation>
+ <file>
+ <missing>.svn</missing>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.groovy.maven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <source>
+ def gitSvnProc = ["sh", "-c", "git svn info | awk '/Revision:/ { print \$2 }'"].execute()
+ gitSvnProc.waitFor()
+ project.properties['gitSvnRev'] = gitSvnProc.in.text.trim()
+ </source>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <doCheck>false</doCheck>
+ <doUpdate>false</doUpdate>
+ <format>{0}</format>
+ <items>
+ <item>${gitSvnRev}</item>
+ </items>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<dependencies>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index d1eb4e3..7fdefca 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -1,54 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>mocca</artifactId>
- <groupId>at.gv.egiz</groupId>
- <version>1.3.6-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>STAL</artifactId>
- <name>STAL</name>
- <dependencies>
- </dependencies>
- <description>Security Token Access Layer</description>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <groupId>org.apache.maven.plugins</groupId>
- <configuration>
- <debug>false</debug>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <!--build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxws-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>wsimport</goal>
- </goals>
- <configuration>
- <verbose>true</verbose>
- <bindingDirectory>${basedir}/src/main/custom-binding</bindingDirectory>
- <bindingFiles>
- <bindingFile>stalservice-custom.xml</bindingFile>
- <bindingFile>staltypes-custom.xml</bindingFile>
- </bindingFiles>
- <wsdlDirectory>${basedir}/src/main/wsdl</wsdlDirectory>
- <wsdlFiles>
- <wsdlFile>stal.wsdl</wsdlFile>
- </wsdlFiles>
- <sourceDestDir>${project.build.directory}/generated-sources/wsimport</sourceDestDir>
- <staleFile>${project.build.directory}/generated-sources/wsimport/.staleFlag</staleFile>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build-->
+ <parent>
+ <artifactId>mocca</artifactId>
+ <groupId>at.gv.egiz</groupId>
+ <version>1.3.6-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>STAL</artifactId>
+ <name>STAL</name>
+ <dependencies>
+ </dependencies>
+ <description>Security Token Access Layer</description>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <configuration>
+ <debug>false</debug>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <!--build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jaxws-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>wsimport</goal>
+ </goals>
+ <configuration>
+ <verbose>true</verbose>
+ <bindingDirectory>${basedir}/src/main/custom-binding</bindingDirectory>
+ <bindingFiles>
+ <bindingFile>stalservice-custom.xml</bindingFile>
+ <bindingFile>staltypes-custom.xml</bindingFile>
+ </bindingFiles>
+ <wsdlDirectory>${basedir}/src/main/wsdl</wsdlDirectory>
+ <wsdlFiles>
+ <wsdlFile>stal.wsdl</wsdlFile>
+ </wsdlFiles>
+ <sourceDestDir>${project.build.directory}/generated-sources/wsimport</sourceDestDir>
+ <staleFile>${project.build.directory}/generated-sources/wsimport/.staleFlag</staleFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build-->
</project> \ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index a1545c4..2f68987 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>mocca</artifactId>
- <groupId>at.gv.egiz</groupId>
- <version>1.3.6-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>STALService</artifactId>
- <name>STAL Service</name>
- <description>STAL webservice interface</description>
- <dependencies>
- <dependency>
- <groupId>at.gv.egiz</groupId>
- <artifactId>STAL</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- </dependencies>
+ <parent>
+ <artifactId>mocca</artifactId>
+ <groupId>at.gv.egiz</groupId>
+ <version>1.3.6-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>STALService</artifactId>
+ <name>STAL Service</name>
+ <description>STAL webservice interface</description>
+ <dependencies>
+ <dependency>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>STAL</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ </dependencies>
</project> \ No newline at end of file
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index c79670c..60aa5e5 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -20,8 +20,8 @@
<version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
</dependencies>
</project> \ No newline at end of file
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index 777877a..5f05409 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -1,53 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>mocca</artifactId>
- <groupId>at.gv.egiz</groupId>
- <version>1.3.6-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>bkucommon</artifactId>
- <name>BKU Common</name>
- <build>
- <plugins>
- <!--
- plugin> <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxws-maven-plugin</artifactId> <executions> <execution>
- <id>MOA-SPSS</id> <goals> <goal>wsimport</goal> </goals>
- </execution> </executions> <configuration>
- <extension>true</extension> <verbose>true</verbose>
- <packageName>moaspss.generated</packageName>
- <wsdlDirectory>${basedir}/src/test/wsdl</wsdlDirectory> <wsdlFiles>
- <wsdlFile>MOA-SPSS-1.3.wsdl</wsdlFile> </wsdlFiles>
- <sourceDestDir>${project.build.directory}/generated-sources/moaspss</sourceDestDir>
- <staleFile>${project.build.directory}/generated-sources/moaspss/.staleFlag</staleFile>
- <xnocompile>true</xnocompile> </configuration> </plugin -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- </manifest>
- <manifestEntries>
- <SignatureLayout>1.0</SignatureLayout>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>at.gv.egiz</groupId>
- <artifactId>utils</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>at.gv.egiz</groupId>
- <artifactId>STALExt</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>mocca</artifactId>
+ <groupId>at.gv.egiz</groupId>
+ <version>1.3.6-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>bkucommon</artifactId>
+ <name>BKU Common</name>
+ <build>
+ <plugins>
+ <!-- plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>jaxws-maven-plugin</artifactId>
+ <executions> <execution> <id>MOA-SPSS</id> <goals> <goal>wsimport</goal>
+ </goals> </execution> </executions> <configuration> <extension>true</extension>
+ <verbose>true</verbose> <packageName>moaspss.generated</packageName> <wsdlDirectory>${basedir}/src/test/wsdl</wsdlDirectory>
+ <wsdlFiles> <wsdlFile>MOA-SPSS-1.3.wsdl</wsdlFile> </wsdlFiles> <sourceDestDir>${project.build.directory}/generated-sources/moaspss</sourceDestDir>
+ <staleFile>${project.build.directory}/generated-sources/moaspss/.staleFlag</staleFile>
+ <xnocompile>true</xnocompile> </configuration> </plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ </manifest>
+ <manifestEntries>
+ <SignatureLayout>1.0</SignatureLayout>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>utils</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>STALExt</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
<!-- bkucommon implements default FontProvider (ResourceFontLoader) -->
<dependency>
<groupId>at.gv.egiz</groupId>
@@ -55,83 +51,81 @@
<version>${project.parent.version}</version>
</dependency>
- <!--
- | ResourceFontLoader needs font resources on runtime classpath.
- | Runtime dependency on BKUFonts ensures that transitive dependency
- | remains (not true for provided), see BKUViewer, BKULocal and
- | BKUOnline -->
+ <!-- | ResourceFontLoader needs font resources on runtime classpath. |
+ Runtime dependency on BKUFonts ensures that transitive dependency | remains
+ (not true for provided), see BKUViewer, BKULocal and | BKUOnline -->
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>BKUFonts</artifactId>
<scope>runtime</scope>
</dependency>
-
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_jce_full_signed</artifactId>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_ecc_signed</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_xsect</artifactId>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_pki</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
+
+ <dependency>
+ <groupId>iaik</groupId>
+ <artifactId>iaik_jce_full_signed</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>iaik</groupId>
+ <artifactId>iaik_ecc_signed</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>iaik</groupId>
+ <artifactId>iaik_xsect</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>iaik</groupId>
+ <artifactId>iaik_pki</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
<scope>test</scope>
- </dependency>
- <!-- dependency to ensure NamespacePrefixmapper -->
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- </dependencies>
- <reporting>
- <plugins>
+ </dependency>
+ <!-- dependency to ensure NamespacePrefixmapper -->
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <reporting>
+ <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -149,6 +143,6 @@
</reportSet>
</reportSets>
</plugin>
- </plugins>
- </reporting>
+ </plugins>
+ </reporting>
</project> \ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 9b781e4..64c4f42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
<description>MOCCA (Modular Open Citizen Card Architecture) project</description>
<url>http://mocca.egovlabs.gv.at</url>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<modules>
<module>utils</module>
@@ -61,13 +61,13 @@
<name>E-Government Innovation Center (EGIZ)</name>
<url>http://www.egiz.gv.at</url>
</organization>
- <licenses>
- <license>
- <name>EUPL v1.1</name>
- <url>http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1</url>
- <distribution>manually</distribution>
- </license>
- </licenses>
+ <licenses>
+ <license>
+ <name>EUPL v1.1</name>
+ <url>http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1</url>
+ <distribution>manually</distribution>
+ </license>
+ </licenses>
<build>
<pluginManagement>
<plugins>
@@ -77,9 +77,9 @@
<version>2.1</version>
<configuration>
<!--
- <fork>true</fork>
+ <fork>true</fork>
<executable>${java_150_sun}/bin/javac</executable>
- <compilerVersion>1.5</compilerVersion>
+ <compilerVersion>1.5</compilerVersion>
-->
<source>1.6</source>
<target>1.6</target>
@@ -103,12 +103,12 @@
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>2.1</version>
+ <version>2.3</version>
</plugin>
- <!--
- plugin> <artifactId>maven-jaxb2-plugin</artifactId>
- <groupId>org.jvnet.jaxb2.maven2</groupId> <version>0.6.0</version>
- </plugin -->
+ <!--
+ plugin> <artifactId>maven-jaxb2-plugin</artifactId>
+ <groupId>org.jvnet.jaxb2.maven2</groupId> <version>0.6.0</version>
+ </plugin -->
<plugin>
<artifactId>jaxws-maven-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId>
@@ -122,7 +122,7 @@
<plugin>
<artifactId>buildnumber-maven-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId>
- <version>1.0-beta-4</version>
+ <version>1.0</version>
</plugin>
<plugin>
<artifactId>webstart-maven-plugin</artifactId>
@@ -141,13 +141,60 @@
<groupId>org.apache.maven.plugins</groupId>
<version>2.5</version>
<configuration>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.1</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.maven.plugins
+ </groupId>
+ <artifactId>
+ maven-dependency-plugin
+ </artifactId>
+ <versionRange>[2.1,)</versionRange>
+ <goals>
+ <goal>copy-dependencies</goal>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.codehaus.groovy.maven
+ </groupId>
+ <artifactId>
+ gmaven-plugin
+ </artifactId>
+ <versionRange>[1.0,)</versionRange>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute />
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
</plugin>
</plugins>
</pluginManagement>
@@ -187,28 +234,28 @@
</dependency>
</dependencies>
<reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.1.2</version>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.1.2</version>
<configuration>
<dependencyDetailsEnabled>true</dependencyDetailsEnabled>
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
</configuration>
- <reportSets>
- <reportSet>
- <reports>
+ <reportSets>
+ <reportSet>
+ <reports>
<report>index</report>
<report>summary</report>
<report>license</report>
<report>dependencies</report>
<report>dependency-management</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- </plugins>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
</reporting>
<dependencyManagement>
<dependencies>
@@ -261,12 +308,12 @@
<version>1.0-MOCCA</version>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
@@ -311,7 +358,7 @@
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>BKUCertificates</artifactId>
- <version>1.5</version>
+ <version>1.6</version>
</dependency>
<dependency>
<groupId>at.gv.egiz</groupId>
@@ -319,14 +366,14 @@
<version>1.2</version>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>2.5.5</version>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>2.5.5</version>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>1.6</version>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -336,25 +383,25 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.5.11</version>
- <type>jar</type>
- <scope>compile</scope>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.11</version>
+ <type>jar</type>
+ <scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
<version>1.5.11</version>
<type>jar</type>
- <scope>runtime</scope>
- </dependency>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>2.5.5</version>
- <type>jar</type>
- <scope>compile</scope>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>2.5.5</version>
+ <type>jar</type>
+ <scope>compile</scope>
</dependency>
</dependencies>
</dependencyManagement>
@@ -364,5 +411,8 @@
<url>scp://egovlabs.gv.at/var/lib/gforge/chroot/home/groups/mocca/htdocs</url>
</site>
</distributionManagement>
-
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://jira.egovlabs.gv.at/</url>
+ </issueManagement>
</project> \ No newline at end of file
diff --git a/smcc/pom.xml b/smcc/pom.xml
index f594348..45cdd62 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -10,16 +10,16 @@
<packaging>jar</packaging>
<description>Smart card communication</description>
<build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <groupId>org.apache.maven.plugins</groupId>
- <configuration>
- <debug>false</debug>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <configuration>
+ <debug>false</debug>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index 3532413..1fca889 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -9,16 +9,16 @@
<name>smcc STAL</name>
<description>STAL implementation for smart cards using smcc</description>
<build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <groupId>org.apache.maven.plugins</groupId>
- <configuration>
- <debug>false</debug>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <configuration>
+ <debug>false</debug>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<dependency>
<groupId>at.gv.egiz</groupId>
diff --git a/smccTest/pom.xml b/smccTest/pom.xml
index a7d2df9..526cc24 100644
--- a/smccTest/pom.xml
+++ b/smccTest/pom.xml
@@ -1,73 +1,73 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>mocca</artifactId>
- <groupId>at.gv.egiz</groupId>
- <version>1.3.6-SNAPSHOT</version>
- </parent>
- <groupId>at.gv.egiz</groupId>
- <artifactId>smccTest</artifactId>
- <version>1.3.6-SNAPSHOT</version>
- <name>SMCC Test</name>
- <description>Card Terminal and Smart Card Tests</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- <classpathPrefix>lib/</classpathPrefix>
- <mainClass>at.gv.egiz.smcctest.PKCS15Test</mainClass>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <phase>package</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/lib</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>at.gv.egiz</groupId>
- <artifactId>smcc</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_jce_me4se</artifactId>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_jce_full_signed</artifactId>
- </dependency>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>mocca</artifactId>
+ <groupId>at.gv.egiz</groupId>
+ <version>1.3.6-SNAPSHOT</version>
+ </parent>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>smccTest</artifactId>
+ <version>1.3.6-SNAPSHOT</version>
+ <name>SMCC Test</name>
+ <description>Card Terminal and Smart Card Tests</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ <classpathPrefix>lib/</classpathPrefix>
+ <mainClass>at.gv.egiz.smcctest.PKCS15Test</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/lib</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>smcc</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>iaik</groupId>
+ <artifactId>iaik_jce_me4se</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>iaik</groupId>
+ <artifactId>iaik_jce_full_signed</artifactId>
+ </dependency>
<dependency>
<groupId>iaik</groupId>
<artifactId>iaik_ecc_signed</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ </dependencies>
</project> \ No newline at end of file
diff --git a/utils/pom.xml b/utils/pom.xml
index bc291f7..96aac94 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -1,35 +1,35 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>mocca</artifactId>
- <groupId>at.gv.egiz</groupId>
- <version>1.3.6-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>utils</artifactId>
- <name>Utils</name>
- <packaging>jar</packaging>
- <description>Utilities</description>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_jce_full_signed</artifactId>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_ecc_signed</artifactId>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_xsect</artifactId>
- </dependency>
- <!-- dependency to ensure NamespacePrefixmapper -->
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- </dependencies>
+ <parent>
+ <artifactId>mocca</artifactId>
+ <groupId>at.gv.egiz</groupId>
+ <version>1.3.6-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>utils</artifactId>
+ <name>Utils</name>
+ <packaging>jar</packaging>
+ <description>Utilities</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>iaik</groupId>
+ <artifactId>iaik_jce_full_signed</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>iaik</groupId>
+ <artifactId>iaik_ecc_signed</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>iaik</groupId>
+ <artifactId>iaik_xsect</artifactId>
+ </dependency>
+ <!-- dependency to ensure NamespacePrefixmapper -->
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </dependency>
+ </dependencies>
</project>