diff options
| author | bschnalzer <bianca.schnalzer@egiz.gv.at> | 2017-03-24 10:47:17 +0100 |
|---|---|---|
| committer | bschnalzer <bianca.schnalzer@egiz.gv.at> | 2017-03-24 10:47:17 +0100 |
| commit | b2e526abe712fe1bc89b003c9660b96c90e8c2e0 (patch) | |
| tree | 06b5adf1cc7e1609e96ea3f86af237fd0488f64c | |
| parent | c012d65f4cf8c8e5caaaa94971a85264f3122dcc (diff) | |
| download | mocca-b2e526abe712fe1bc89b003c9660b96c90e8c2e0.tar.gz mocca-b2e526abe712fe1bc89b003c9660b96c90e8c2e0.tar.bz2 mocca-b2e526abe712fe1bc89b003c9660b96c90e8c2e0.zip | |
pom update
| -rw-r--r-- | BKUApplet/pom.xml | 636 | ||||
| -rw-r--r-- | BKUAppletExt/pom.xml | 690 | ||||
| -rw-r--r-- | BKUCertificates/pom.xml | 74 | ||||
| -rw-r--r-- | BKUFonts/pom.xml | 58 | ||||
| -rw-r--r-- | BKUGuiExt/pom.xml | 44 | ||||
| -rw-r--r-- | BKUHelp/pom.xml | 32 | ||||
| -rw-r--r-- | BKUHelpWebStart/pom.xml | 32 | ||||
| -rw-r--r-- | BKULocal/pom.xml | 530 | ||||
| -rw-r--r-- | BKUOnline/pom.xml | 2 | ||||
| -rw-r--r-- | BKUViewer/pom.xml | 82 | ||||
| -rw-r--r-- | BKUWebStart/pom.xml | 836 | ||||
| -rw-r--r-- | STAL/pom.xml | 106 | ||||
| -rw-r--r-- | STALExt/pom.xml | 34 | ||||
| -rw-r--r-- | STALService/pom.xml | 44 | ||||
| -rw-r--r-- | STALXService/pom.xml | 52 | ||||
| -rw-r--r-- | bkucommon/pom.xml | 2 | ||||
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | smcc/pom.xml | 96 | ||||
| -rw-r--r-- | smccSTALExt/pom.xml | 52 | ||||
| -rw-r--r-- | utils/pom.xml | 2 |
20 files changed, 1703 insertions, 1703 deletions
diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml index 11116037..9c003b43 100644 --- a/BKUApplet/pom.xml +++ b/BKUApplet/pom.xml @@ -1,318 +1,318 @@ -<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.26-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>BKUApplet</artifactId> - <name>BKU Applet</name> - <description>Java Applet used by MOCCA Online</description> - <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 public class * implements iaik.me.security.MessageDigest { *; }</option> - <option>-keep class org.openecard.scio.osx.* { *; }</option> - <option>-keep @javax.xml.bind.annotation.** class * { *; }</option> - <option>-keep @javax.xml.ws.** class * { *; }</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> - <proguardVersion>5.2.1</proguardVersion> - <libs> - <lib>${java.home}/lib/rt.jar</lib> - <lib>${java.home}/lib/jce.jar</lib> - <lib>${java.home}/lib/jsse.jar</lib> - </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> - <dependencies> - <dependency> - <groupId>net.sf.proguard</groupId> - <artifactId>proguard</artifactId> - <version>5.2.1</version> - <scope>runtime</scope> - </dependency> - </dependencies> - </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> - <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> - <Application-Name>MOCCA</Application-Name> - <Implementation-Build>${project.version}-r${buildNumber}</Implementation-Build> - <Permissions>all-permissions</Permissions> - <Codebase>*</Codebase> - <Caller-Allowable-Codebase>*</Caller-Allowable-Codebase> - <Trusted-Library>true</Trusted-Library> - </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> - <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> - <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> - <id>ks-sign</id> - <build> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <groupId>org.apache.maven.plugins</groupId> - <version>2.2-mocca</version> - <configuration> - <keystore>${ks-file}</keystore> - <alias>a-sit-3</alias> - <storepass>${ks-pass}</storepass> - <keypass>${ks-pass}</keypass> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> - <!-- - This profile is here for triggering when another scm than svn is - used (for example git). Get the git commit hash. - --> - <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 shell = "sh" - def param = "-c" - if (System.getProperty("os.name").toUpperCase().contains("WINDOWS")) { - shell = "cmd" - param = "/c" - } - def gitSvnProc = [shell, param, "git rev-parse --short HEAD"].execute() - gitSvnProc.waitFor() - def svnref = gitSvnProc.in.text.trim() - project.properties['gitSvnRev'] = svnref - </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>smcc</artifactId> - <version>${project.parent.version}</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>at.gv.egiz</groupId> - <artifactId>STAL</artifactId> - <version>${project.parent.version}</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>at.gv.egiz</groupId> - <artifactId>STALService</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>BKUCommonGUI</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> +<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.25</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>BKUApplet</artifactId>
+ <name>BKU Applet</name>
+ <description>Java Applet used by MOCCA Online</description>
+ <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 public class * implements iaik.me.security.MessageDigest { *; }</option>
+ <option>-keep class org.openecard.scio.osx.* { *; }</option>
+ <option>-keep @javax.xml.bind.annotation.** class * { *; }</option>
+ <option>-keep @javax.xml.ws.** class * { *; }</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>
+ <proguardVersion>5.2.1</proguardVersion>
+ <libs>
+ <lib>${java.home}/lib/rt.jar</lib>
+ <lib>${java.home}/lib/jce.jar</lib>
+ <lib>${java.home}/lib/jsse.jar</lib>
+ </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>
+ <dependencies>
+ <dependency>
+ <groupId>net.sf.proguard</groupId>
+ <artifactId>proguard</artifactId>
+ <version>5.2.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </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>
+ <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>
+ <Application-Name>MOCCA</Application-Name>
+ <Implementation-Build>${project.version}-r${buildNumber}</Implementation-Build>
+ <Permissions>all-permissions</Permissions>
+ <Codebase>*</Codebase>
+ <Caller-Allowable-Codebase>*</Caller-Allowable-Codebase>
+ <Trusted-Library>true</Trusted-Library>
+ </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>
+ <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>
+ <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>
+ <id>ks-sign</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <version>2.2-mocca</version>
+ <configuration>
+ <keystore>${ks-file}</keystore>
+ <alias>a-sit-3</alias>
+ <storepass>${ks-pass}</storepass>
+ <keypass>${ks-pass}</keypass>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <!--
+ This profile is here for triggering when another scm than svn is
+ used (for example git). Get the git commit hash.
+ -->
+ <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 shell = "sh"
+ def param = "-c"
+ if (System.getProperty("os.name").toUpperCase().contains("WINDOWS")) {
+ shell = "cmd"
+ param = "/c"
+ }
+ def gitSvnProc = [shell, param, "git rev-parse --short HEAD"].execute()
+ gitSvnProc.waitFor()
+ def svnref = gitSvnProc.in.text.trim()
+ project.properties['gitSvnRev'] = svnref
+ </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>smcc</artifactId>
+ <version>${project.parent.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>STAL</artifactId>
+ <version>${project.parent.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>STALService</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>BKUCommonGUI</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/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml index 0e011288..af4d032f 100644 --- a/BKUAppletExt/pom.xml +++ b/BKUAppletExt/pom.xml @@ -1,345 +1,345 @@ -<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.26-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> - <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 public class * implements iaik.me.security.MessageDigest { *; }</option> - <option>-keep class org.openecard.scio.osx.* { *; }</option> - <option>-keep @javax.xml.bind.annotation.** class * { *; }</option> - <option>-keep @javax.xml.ws.** class * { *; }</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> - <proguardVersion>5.2.1</proguardVersion> - <libs> - <lib>${java.home}/lib/rt.jar</lib> - <lib>${java.home}/lib/jce.jar</lib> - <lib>${java.home}/lib/jsse.jar</lib> - </libs> - <attach>true</attach> - <appendClassifier>true</appendClassifier> - <attachArtifactClassifier>single</attachArtifactClassifier> - <assembly> - <inclusions> - <inclusion> - <groupId>at.gv.egiz</groupId> - <artifactId>BKUApplet</artifactId> - </inclusion> - <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> - <!-- card management extensions --> - <inclusion> - <groupId>at.gv.egiz</groupId> - <artifactId>STALExt</artifactId> - </inclusion> - <inclusion> - <groupId>at.gv.egiz</groupId> - <artifactId>STALXService</artifactId> - </inclusion> - <inclusion> - <groupId>at.gv.egiz</groupId> - <artifactId>smccSTALExt</artifactId> - </inclusion> - <inclusion> - <groupId>at.gv.egiz</groupId> - <artifactId>BKUGuiExt</artifactId> - </inclusion> - </inclusions> - </assembly> - </configuration> - <dependencies> - <dependency> - <groupId>net.sf.proguard</groupId> - <artifactId>proguard</artifactId> - <version>5.2.1</version> - <scope>runtime</scope> - </dependency> - </dependencies> - </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> - <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> - <Application-Name>MOCCA</Application-Name> - <Implementation-Build>${project.version}-r${buildNumber}</Implementation-Build> - <Permissions>all-permissions</Permissions> - <Codebase>*</Codebase> - <Caller-Allowable-Codebase>*</Caller-Allowable-Codebase> - <Trusted-Library>true</Trusted-Library> - </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> - <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> - <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> - <id>ks-sign</id> - <build> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <groupId>org.apache.maven.plugins</groupId> - <version>2.2-mocca</version> - <configuration> - <keystore>${ks-file}</keystore> - <alias>a-sit-3</alias> - <storepass>${ks-pass}</storepass> - <keypass>${ks-pass}</keypass> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> - <!-- - This profile is here for triggering when another scm than svn is - used (for example git). Get the git commit hash. - --> - <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 shell = "sh" - def param = "-c" - if (System.getProperty("os.name").toUpperCase().contains("WINDOWS")) { - shell = "cmd" - param = "/c" - } - def gitSvnProc = [shell, param, "git rev-parse --short HEAD"].execute() - gitSvnProc.waitFor() - def svnref = gitSvnProc.in.text.trim() - project.properties['gitSvnRev'] = svnref - </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> +<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.25</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>
+ <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 public class * implements iaik.me.security.MessageDigest { *; }</option>
+ <option>-keep class org.openecard.scio.osx.* { *; }</option>
+ <option>-keep @javax.xml.bind.annotation.** class * { *; }</option>
+ <option>-keep @javax.xml.ws.** class * { *; }</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>
+ <proguardVersion>5.2.1</proguardVersion>
+ <libs>
+ <lib>${java.home}/lib/rt.jar</lib>
+ <lib>${java.home}/lib/jce.jar</lib>
+ <lib>${java.home}/lib/jsse.jar</lib>
+ </libs>
+ <attach>true</attach>
+ <appendClassifier>true</appendClassifier>
+ <attachArtifactClassifier>single</attachArtifactClassifier>
+ <assembly>
+ <inclusions>
+ <inclusion>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>BKUApplet</artifactId>
+ </inclusion>
+ <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>
+ <!-- card management extensions -->
+ <inclusion>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>STALExt</artifactId>
+ </inclusion>
+ <inclusion>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>STALXService</artifactId>
+ </inclusion>
+ <inclusion>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>smccSTALExt</artifactId>
+ </inclusion>
+ <inclusion>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>BKUGuiExt</artifactId>
+ </inclusion>
+ </inclusions>
+ </assembly>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>net.sf.proguard</groupId>
+ <artifactId>proguard</artifactId>
+ <version>5.2.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </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>
+ <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>
+ <Application-Name>MOCCA</Application-Name>
+ <Implementation-Build>${project.version}-r${buildNumber}</Implementation-Build>
+ <Permissions>all-permissions</Permissions>
+ <Codebase>*</Codebase>
+ <Caller-Allowable-Codebase>*</Caller-Allowable-Codebase>
+ <Trusted-Library>true</Trusted-Library>
+ </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>
+ <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>
+ <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>
+ <id>ks-sign</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <version>2.2-mocca</version>
+ <configuration>
+ <keystore>${ks-file}</keystore>
+ <alias>a-sit-3</alias>
+ <storepass>${ks-pass}</storepass>
+ <keypass>${ks-pass}</keypass>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <!--
+ This profile is here for triggering when another scm than svn is
+ used (for example git). Get the git commit hash.
+ -->
+ <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 shell = "sh"
+ def param = "-c"
+ if (System.getProperty("os.name").toUpperCase().contains("WINDOWS")) {
+ shell = "cmd"
+ param = "/c"
+ }
+ def gitSvnProc = [shell, param, "git rev-parse --short HEAD"].execute()
+ gitSvnProc.waitFor()
+ def svnref = gitSvnProc.in.text.trim()
+ project.properties['gitSvnRev'] = svnref
+ </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/BKUCertificates/pom.xml b/BKUCertificates/pom.xml index 63eb070b..07d1da50 100644 --- a/BKUCertificates/pom.xml +++ b/BKUCertificates/pom.xml @@ -1,37 +1,37 @@ -<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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>mocca</artifactId> - <groupId>at.gv.egiz</groupId> - <version>1.3.26-SNAPSHOT</version> - </parent> - <artifactId>BKUCertificates</artifactId> - <!-- DON'T CHANGE VERSION UNLESS THE INCLUDED CERTIFICATES CHANGED - | PLEASE COMMIT CHANGES to src/main/changes/changes.txt - | and don't forget to update version in main pom - |--> - <version>1.1.15-SNAPSHOT</version> - <name>BKU Certificates</name> - - <description>Trusted certificates for TLS/SSL authentication</description> - <build> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <groupId>org.apache.maven.plugins</groupId> - <configuration> - <archive> - <!--index>true</index--> - <manifest> - <!-- BKUWebStart requires Implementation-Version attribute - | BKUWebStart assumes certs to be under at/gv/egiz/bku/certs - |--> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - </archive> - <verbose>true</verbose> - </configuration> - </plugin> - </plugins> - </build> -</project> +<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>mocca</artifactId>
+ <groupId>at.gv.egiz</groupId>
+ <version>1.3.25</version>
+ </parent>
+ <artifactId>BKUCertificates</artifactId>
+ <!-- DON'T CHANGE VERSION UNLESS THE INCLUDED CERTIFICATES CHANGED
+ | PLEASE COMMIT CHANGES to src/main/changes/changes.txt
+ | and don't forget to update version in main pom
+ |-->
+ <version>1.1.15-SNAPSHOT</version>
+ <name>BKU Certificates</name>
+
+ <description>Trusted certificates for TLS/SSL authentication</description>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <configuration>
+ <archive>
+ <!--index>true</index-->
+ <manifest>
+ <!-- BKUWebStart requires Implementation-Version attribute
+ | BKUWebStart assumes certs to be under at/gv/egiz/bku/certs
+ |-->
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ <verbose>true</verbose>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/BKUFonts/pom.xml b/BKUFonts/pom.xml index 371b1cc3..ad86ceb1 100644 --- a/BKUFonts/pom.xml +++ b/BKUFonts/pom.xml @@ -1,29 +1,29 @@ -<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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>mocca</artifactId> - <groupId>at.gv.egiz</groupId> - <version>1.3.26-SNAPSHOT</version> - </parent> - <artifactId>BKUFonts</artifactId> - <version>1.3-SNAPSHOT</version> - <name>BKU Fonts</name> - <description> - <!-- - | 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 --> - - Fonts used by validators and viewers - - - </description> - <build> - <resources> - <resource> - <directory>src/main/fonts</directory> - </resource> - </resources> - </build> -</project> +<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>mocca</artifactId>
+ <groupId>at.gv.egiz</groupId>
+ <version>1.3.25</version>
+ </parent>
+ <artifactId>BKUFonts</artifactId>
+ <version>1.3-SNAPSHOT</version>
+ <name>BKU Fonts</name>
+ <description>
+ <!--
+ | 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 -->
+
+ Fonts used by validators and viewers
+
+
+ </description>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/fonts</directory>
+ </resource>
+ </resources>
+ </build>
+</project>
diff --git a/BKUGuiExt/pom.xml b/BKUGuiExt/pom.xml index 5099f929..b7f9f1fb 100644 --- a/BKUGuiExt/pom.xml +++ b/BKUGuiExt/pom.xml @@ -1,23 +1,23 @@ -<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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>mocca</artifactId> - <groupId>at.gv.egiz</groupId> - <version>1.3.26-SNAPSHOT</version> - </parent> - <artifactId>BKUGuiExt</artifactId> - <name>BKU GUI Ext</name> - <description>Common BKU GUI functionality extension for card managment</description> - <dependencies> - <dependency> - <groupId>at.gv.egiz</groupId> - <artifactId>STALXService</artifactId> - <version>${project.parent.version}</version> - </dependency> - <dependency> - <groupId>at.gv.egiz</groupId> - <artifactId>smccSTAL</artifactId> - <version>${project.parent.version}</version> - </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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>mocca</artifactId>
+ <groupId>at.gv.egiz</groupId>
+ <version>1.3.25</version>
+ </parent>
+ <artifactId>BKUGuiExt</artifactId>
+ <name>BKU GUI Ext</name>
+ <description>Common BKU GUI functionality extension for card managment</description>
+ <dependencies>
+ <dependency>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>STALXService</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>smccSTAL</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file diff --git a/BKUHelp/pom.xml b/BKUHelp/pom.xml index 87ca6a0a..b271a839 100644 --- a/BKUHelp/pom.xml +++ b/BKUHelp/pom.xml @@ -1,17 +1,17 @@ -<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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>mocca</artifactId> - <groupId>at.gv.egiz</groupId> - <version>1.3.26-SNAPSHOT</version> - </parent> - <artifactId>BKUHelp</artifactId> - <name>BKU Help</name> - <build> - <resources> - <resource> - <directory>src/main/webapp</directory> - </resource> - </resources> - </build> +<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>mocca</artifactId>
+ <groupId>at.gv.egiz</groupId>
+ <version>1.3.25</version>
+ </parent>
+ <artifactId>BKUHelp</artifactId>
+ <name>BKU Help</name>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/webapp</directory>
+ </resource>
+ </resources>
+ </build>
</project>
\ No newline at end of file diff --git a/BKUHelpWebStart/pom.xml b/BKUHelpWebStart/pom.xml index 9b76d0ae..a8e099b5 100644 --- a/BKUHelpWebStart/pom.xml +++ b/BKUHelpWebStart/pom.xml @@ -1,17 +1,17 @@ -<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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>mocca</artifactId> - <groupId>at.gv.egiz</groupId> - <version>1.3.26-SNAPSHOT</version> - </parent> - <artifactId>BKUHelpWebStart</artifactId> - <name>BKU Help WebStart</name> - <build> - <resources> - <resource> - <directory>src/main/webappOverlay</directory> - </resource> - </resources> - </build> +<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>mocca</artifactId>
+ <groupId>at.gv.egiz</groupId>
+ <version>1.3.25</version>
+ </parent>
+ <artifactId>BKUHelpWebStart</artifactId>
+ <name>BKU Help WebStart</name>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/webappOverlay</directory>
+ </resource>
+ </resources>
+ </build>
</project>
\ No newline at end of file diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml index 1a55eeca..a4f3808f 100644 --- a/BKULocal/pom.xml +++ b/BKULocal/pom.xml @@ -1,265 +1,265 @@ -<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.26-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> - <configuration> - <manifest> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - <!-- TODO: load webapp jars via jnlp - <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes--> - <archive> - <manifestEntries> - <Implementation-Build>${project.version}-r${buildNumber}</Implementation-Build> - </manifestEntries> - </archive> - </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-dependency-plugin</artifactId> - <groupId>org.apache.maven.plugins</groupId> - <executions> - <execution> - <id>copy-help</id> - <goals> - <goal>unpack-dependencies</goal> - </goals> - <configuration> - <includeArtifactIds>BKUHelp</includeArtifactIds> - <includeGroupIds>at.gv.egiz</includeGroupIds> - <excludes>META-INF/</excludes> - <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory> - </configuration> - </execution> - <execution> - <id>copy-help-overlay</id> - <goals> - <goal>unpack-dependencies</goal> - </goals> - <configuration> - <includeArtifactIds>BKUHelpWebStart</includeArtifactIds> - <includeGroupIds>at.gv.egiz</includeGroupIds> - <excludes>META-INF/</excludes> - <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory> - </configuration> - </execution> - <!-- http://jira.egovlabs.gv.at/browse/MOCCA-762 - | do not provide certificates in webapp filesystem (default trust/certstores) --> - - <execution> - <id>copy-certificates</id> - <goals> - <goal>unpack-dependencies</goal> - </goals> - <configuration> - <includeArtifactIds>BKUCertificates</includeArtifactIds> - <includeGroupIds>at.gv.egiz</includeGroupIds> - <excludes>META-INF/</excludes> - <outputDirectory>${project.build.directory}/classes</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - </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> - <dependency> - <groupId>at.gv.egiz</groupId> - <artifactId>BKUGuiExt</artifactId> - <version>${project.parent.version}</version> - </dependency> - <dependency> - <groupId>at.gv.egiz</groupId> - <artifactId>smccSTALExt</artifactId> - <version>${project.parent.version}</version> - </dependency> - <dependency> - <groupId>at.gv.egiz</groupId> - <artifactId>BKUViewer</artifactId> - <version>${project.parent.version}</version> - </dependency> - <dependency> - <artifactId>BKUHelp</artifactId> - <groupId>at.gv.egiz</groupId> - <version>${project.parent.version}</version> - </dependency> - <dependency> - <artifactId>BKUHelpWebStart</artifactId> - <groupId>at.gv.egiz</groupId> - <version>${project.parent.version}</version> - </dependency> - <dependency> - <artifactId>BKUCertificates</artifactId> - <groupId>at.gv.egiz</groupId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>iaik</groupId> - <artifactId>iaik_xsect_signed</artifactId> - </dependency> - <dependency> - <groupId>iaik</groupId> - <artifactId>iaik_jce_full_signed</artifactId> - </dependency> - <dependency> - <groupId>iaik</groupId> - <artifactId>iaik_eccelerate</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> - - <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). Get the git commit hash. - --> - <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 shell = "sh" - def param = "-c" - if (System.getProperty("os.name").toUpperCase().contains("WINDOWS")) { - shell = "cmd" - param = "/c" - } - def gitSvnProc = [shell, param, "git rev-parse --short HEAD"].execute() - gitSvnProc.waitFor() - def svnref = gitSvnProc.in.text.trim() - project.properties['gitSvnRev'] = svnref - </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> +<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.25</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>
+ <configuration>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <!-- TODO: load webapp jars via jnlp
+ <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes-->
+ <archive>
+ <manifestEntries>
+ <Implementation-Build>${project.version}-r${buildNumber}</Implementation-Build>
+ </manifestEntries>
+ </archive>
+ </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-dependency-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <executions>
+ <execution>
+ <id>copy-help</id>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeArtifactIds>BKUHelp</includeArtifactIds>
+ <includeGroupIds>at.gv.egiz</includeGroupIds>
+ <excludes>META-INF/</excludes>
+ <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-help-overlay</id>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeArtifactIds>BKUHelpWebStart</includeArtifactIds>
+ <includeGroupIds>at.gv.egiz</includeGroupIds>
+ <excludes>META-INF/</excludes>
+ <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
+ </configuration>
+ </execution>
+ <!-- http://jira.egovlabs.gv.at/browse/MOCCA-762
+ | do not provide certificates in webapp filesystem (default trust/certstores) -->
+
+ <execution>
+ <id>copy-certificates</id>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeArtifactIds>BKUCertificates</includeArtifactIds>
+ <includeGroupIds>at.gv.egiz</includeGroupIds>
+ <excludes>META-INF/</excludes>
+ <outputDirectory>${project.build.directory}/classes</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </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>
+ <dependency>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>BKUGuiExt</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>smccSTALExt</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>BKUViewer</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <artifactId>BKUHelp</artifactId>
+ <groupId>at.gv.egiz</groupId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <artifactId>BKUHelpWebStart</artifactId>
+ <groupId>at.gv.egiz</groupId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <artifactId>BKUCertificates</artifactId>
+ <groupId>at.gv.egiz</groupId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>iaik</groupId>
+ <artifactId>iaik_xsect_signed</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>iaik</groupId>
+ <artifactId>iaik_jce_full_signed</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>iaik</groupId>
+ <artifactId>iaik_eccelerate</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>
+
+ <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). Get the git commit hash.
+ -->
+ <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 shell = "sh"
+ def param = "-c"
+ if (System.getProperty("os.name").toUpperCase().contains("WINDOWS")) {
+ shell = "cmd"
+ param = "/c"
+ }
+ def gitSvnProc = [shell, param, "git rev-parse --short HEAD"].execute()
+ gitSvnProc.waitFor()
+ def svnref = gitSvnProc.in.text.trim()
+ project.properties['gitSvnRev'] = svnref
+ </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 d05d44f2..0cc5c4ab 100644 --- a/BKUOnline/pom.xml +++ b/BKUOnline/pom.xml @@ -3,7 +3,7 @@ <parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.3.26-SNAPSHOT</version>
+ <version>1.3.25</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>BKUOnline</artifactId>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml index eaeb34f7..0ef2d58c 100644 --- a/BKUViewer/pom.xml +++ b/BKUViewer/pom.xml @@ -1,41 +1,41 @@ -<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.26-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> +<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.25</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 8581afa8..1ca8aa1d 100644 --- a/BKUWebStart/pom.xml +++ b/BKUWebStart/pom.xml @@ -1,418 +1,418 @@ -<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.26-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>BKUWebStart</artifactId> - <packaging>jar</packaging> - <name>MOCCA Webstart</name> - <url>http://joinup.ec.europa.eu/site/mocca/</url> - <description>Bürgerkartenumgebung</description> - - <build> - <plugins> - - <!-- Include the BKULocal war artifact in the BKUWebStart jar - | BKULauncher resolves resource and copies it to jetty's webapp dir - | - | don't: overlay BKULocal with maven-war-plugin - | don't: unpack BKULocal dependency (jetty and webstart classloaders interfere) --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-resources</id> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <includeArtifactIds>BKULocal</includeArtifactIds> - <includeGroupIds>at.gv.egiz</includeGroupIds> - <outputDirectory>${project.build.directory}/classes</outputDirectory> - <stripVersion>true</stripVersion> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>buildnumber-maven-plugin</artifactId> - <groupId>org.codehaus.mojo</groupId> - <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> - <configuration> - <archive> - <manifest> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - <manifestEntries> - <Application-Name>MOCCA</Application-Name> - <Implementation-Build>${project.version}-r${buildNumber}</Implementation-Build> - <Permissions>all-permissions</Permissions> - <Codebase>*</Codebase> - </manifestEntries> - </archive> - <verbose>true</verbose> - </configuration> - </plugin> - - <plugin> - <artifactId>webstart-maven-plugin</artifactId> - <groupId>org.codehaus.mojo.webstart</groupId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>jnlp-inline</goal> - </goals> - </execution> - </executions> - <configuration> - <excludeTransitive>false</excludeTransitive> - <jnlp> - <inputTemplateResourcePath>${project.basedir}/src/main/jnlp</inputTemplateResourcePath> - <inputTemplate>template-unstable.xml</inputTemplate> - <outputFile>mocca.jnlp</outputFile> - <mainClass>at.gv.egiz.bku.webstart.Launcher</mainClass> - </jnlp> - <sign> - <alias>test-applet signer</alias> - <keystore>${project.basedir}/src/main/jnlp/keystore.ks</keystore> - <storepass>storepass</storepass> - <keypass>keypass</keypass> - <verify>true</verify> - <keystoreConfig> - <delete>false</delete> - <gen>false</gen> - </keystoreConfig> - </sign> - <pack200>false</pack200> - <gzip>false</gzip> - <outputJarVersions>false</outputJarVersions> - <unsignAlreadySignedJars>true</unsignAlreadySignedJars> - <verbose>true</verbose> - </configuration> - </plugin> - - </plugins> - </build> - - <profiles> - <profile> - <!-- development profile --> - <id>local-webstart</id> - <build> - <plugins> - <plugin> - <artifactId>webstart-maven-plugin</artifactId> - <groupId>org.codehaus.mojo.webstart</groupId> - <configuration> - <jnlp> - <inputTemplate>template-local.xml</inputTemplate> - <outputFile>mocca-local.jnlp</outputFile> - </jnlp> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>pkcs11-sign</id> - <build> - <plugins> - <plugin> - <artifactId>webstart-maven-plugin</artifactId> - <groupId>org.codehaus.mojo.webstart</groupId> - <!-- use pkcs11-patched webstart-maven-plugin--> - <version>1.0-beta-1-mocca</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>jnlp-inline</goal> - </goals> - </execution> - </executions> - <configuration> - <excludeTransitive>false</excludeTransitive> - <jnlp> - <inputTemplateResourcePath>${project.basedir}/src/main/jnlp</inputTemplateResourcePath> - <inputTemplate>template.xml</inputTemplate> - <outputFile>mocca.jnlp</outputFile> - <mainClass>at.gv.egiz.bku.webstart.Launcher</mainClass> - </jnlp> - <sign> - <keystore>NONE</keystore> - <storetype>PKCS11</storetype> - <providerClass>iaik.pkcs.pkcs11.provider.IAIKPkcs11</providerClass> - <alias>a-sit-2</alias> - <storepass>${pkcs11-pass}</storepass> - <verify>true</verify> - <keystoreConfig> - <delete>false</delete> - <gen>false</gen> - </keystoreConfig> - </sign> - <pack200>false</pack200> - <gzip>false</gzip> - <outputJarVersions>false</outputJarVersions> - <unsignAlreadySignedJars>true</unsignAlreadySignedJars> - <verbose>true</verbose> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>ks-sign</id> - <build> - <plugins> - <plugin> - <artifactId>webstart-maven-plugin</artifactId> - <groupId>org.codehaus.mojo.webstart</groupId> - <!-- use pkcs11-patched webstart-maven-plugin--> - <version>1.0-beta-1-mocca</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>jnlp-inline</goal> - </goals> - </execution> - </executions> - <configuration> - <excludeTransitive>false</excludeTransitive> - <jnlp> - <inputTemplateResourcePath>${project.basedir}/src/main/jnlp</inputTemplateResourcePath> - <inputTemplate>template.xml</inputTemplate> - <outputFile>mocca.jnlp</outputFile> - <mainClass>at.gv.egiz.bku.webstart.Launcher</mainClass> - </jnlp> - <sign> - <keystore>${ks-file}</keystore> - <alias>a-sit-3</alias> - <storepass>${ks-pass}</storepass> - <keypass>${ks-pass}</keypass> - <verify>true</verify> - <keystoreConfig> - <delete>false</delete> - <gen>false</gen> - </keystoreConfig> - </sign> - <pack200>false</pack200> - <gzip>false</gzip> - <outputJarVersions>false</outputJarVersions> - <unsignAlreadySignedJars>true</unsignAlreadySignedJars> - <verbose>true</verbose> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>non-webstart</id> - <build> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <groupId>org.apache.maven.plugins</groupId> - <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - <mainClass>at.gv.egiz.bku.webstart.Launcher</mainClass> - </manifest> - <manifestEntries> - <mode>development</mode> - <url>${project.url}</url> - <SplashScreen-Image>at/gv/egiz/bku/webstart/splash.png</SplashScreen-Image> - </manifestEntries> - </archive> - </configuration> - </plugin> - </plugins> - </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). Get the git commit hash. - --> - <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 shell = "sh" - def param = "-c" - if (System.getProperty("os.name").toUpperCase().contains("WINDOWS")) { - shell = "cmd" - param = "/c" - } - def gitSvnProc = [shell, param, "git rev-parse --short HEAD"].execute() - gitSvnProc.waitFor() - def svnref = gitSvnProc.in.text.trim() - project.properties['gitSvnRev'] = svnref - </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> - <!-- ATTENTION update of application descriptor (jnlp file) is special... - | The JNLP Client must use the Last-Modified header field returned by - | the Web Server to determine if a newer JNLP file is present on the Web - | server. - | Don't assume changes to the descriptor (changes in dependencies) to - | appear directly on the client descriptor (even if 'update available' - | was shown to user). - | Note: Download via browser ensures the updated jnlp file is used. --> - <dependency> - <groupId>at.gv.egiz</groupId> - <artifactId>BKULocal</artifactId> - <version>${project.version}</version> - <type>war</type> - <!-- make dependency not transitive --> - <optional>true</optional> - </dependency> - <dependency> - <groupId>at.gv.egiz</groupId> - <artifactId>BKUCertificates</artifactId> - </dependency> - <dependency> - <groupId>iaik</groupId> - <artifactId>iaik_jce_full_signed</artifactId> - <scope>compile</scope> - </dependency> - - <!-- Jetty 6.1.15+ required, see - | http://jira.codehaus.org/browse/JETTY-843 - |--> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - <version>6.1.19</version> - </dependency> - <!-- JSP support - | http://jira.codehaus.org/browse/JETTY-827 - | jsp-2.1-jetty-6.1.19 depends on the required jsp-2.1-glassfish jars (?) - | - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jsp-2.1-jetty</artifactId> - <version>6.1.19</version> - </dependency--> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>compile</scope> - </dependency> - - <!-- javax.jnlp.* not included in SUN JDK's rt.jar, - | don't declare here if using OpenJDK --> - <dependency> - <groupId>jre</groupId> - <artifactId>javaws</artifactId> - <version>6.0</version> - <type>jar</type> - <scope>system</scope> - <systemPath>${java.home}/lib/javaws.jar</systemPath> - </dependency> - </dependencies> - <reporting> - <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> - <report>index</report> - <report>summary</report> - <report>license</report> - <report>dependencies</report> - <report>dependency-management</report> - </reports> - </reportSet> - </reportSets> - </plugin> - </plugins> - </reporting> -</project> +<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.25</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>BKUWebStart</artifactId>
+ <packaging>jar</packaging>
+ <name>MOCCA Webstart</name>
+ <url>http://joinup.ec.europa.eu/site/mocca/</url>
+ <description>Bürgerkartenumgebung</description>
+
+ <build>
+ <plugins>
+
+ <!-- Include the BKULocal war artifact in the BKUWebStart jar
+ | BKULauncher resolves resource and copies it to jetty's webapp dir
+ |
+ | don't: overlay BKULocal with maven-war-plugin
+ | don't: unpack BKULocal dependency (jetty and webstart classloaders interfere) -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeArtifactIds>BKULocal</includeArtifactIds>
+ <includeGroupIds>at.gv.egiz</includeGroupIds>
+ <outputDirectory>${project.build.directory}/classes</outputDirectory>
+ <stripVersion>true</stripVersion>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <groupId>org.codehaus.mojo</groupId>
+ <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>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+ <Application-Name>MOCCA</Application-Name>
+ <Implementation-Build>${project.version}-r${buildNumber}</Implementation-Build>
+ <Permissions>all-permissions</Permissions>
+ <Codebase>*</Codebase>
+ </manifestEntries>
+ </archive>
+ <verbose>true</verbose>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>webstart-maven-plugin</artifactId>
+ <groupId>org.codehaus.mojo.webstart</groupId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>jnlp-inline</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <excludeTransitive>false</excludeTransitive>
+ <jnlp>
+ <inputTemplateResourcePath>${project.basedir}/src/main/jnlp</inputTemplateResourcePath>
+ <inputTemplate>template-unstable.xml</inputTemplate>
+ <outputFile>mocca.jnlp</outputFile>
+ <mainClass>at.gv.egiz.bku.webstart.Launcher</mainClass>
+ </jnlp>
+ <sign>
+ <alias>test-applet signer</alias>
+ <keystore>${project.basedir}/src/main/jnlp/keystore.ks</keystore>
+ <storepass>storepass</storepass>
+ <keypass>keypass</keypass>
+ <verify>true</verify>
+ <keystoreConfig>
+ <delete>false</delete>
+ <gen>false</gen>
+ </keystoreConfig>
+ </sign>
+ <pack200>false</pack200>
+ <gzip>false</gzip>
+ <outputJarVersions>false</outputJarVersions>
+ <unsignAlreadySignedJars>true</unsignAlreadySignedJars>
+ <verbose>true</verbose>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <!-- development profile -->
+ <id>local-webstart</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>webstart-maven-plugin</artifactId>
+ <groupId>org.codehaus.mojo.webstart</groupId>
+ <configuration>
+ <jnlp>
+ <inputTemplate>template-local.xml</inputTemplate>
+ <outputFile>mocca-local.jnlp</outputFile>
+ </jnlp>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>pkcs11-sign</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>webstart-maven-plugin</artifactId>
+ <groupId>org.codehaus.mojo.webstart</groupId>
+ <!-- use pkcs11-patched webstart-maven-plugin-->
+ <version>1.0-beta-1-mocca</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>jnlp-inline</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <excludeTransitive>false</excludeTransitive>
+ <jnlp>
+ <inputTemplateResourcePath>${project.basedir}/src/main/jnlp</inputTemplateResourcePath>
+ <inputTemplate>template.xml</inputTemplate>
+ <outputFile>mocca.jnlp</outputFile>
+ <mainClass>at.gv.egiz.bku.webstart.Launcher</mainClass>
+ </jnlp>
+ <sign>
+ <keystore>NONE</keystore>
+ <storetype>PKCS11</storetype>
+ <providerClass>iaik.pkcs.pkcs11.provider.IAIKPkcs11</providerClass>
+ <alias>a-sit-2</alias>
+ <storepass>${pkcs11-pass}</storepass>
+ <verify>true</verify>
+ <keystoreConfig>
+ <delete>false</delete>
+ <gen>false</gen>
+ </keystoreConfig>
+ </sign>
+ <pack200>false</pack200>
+ <gzip>false</gzip>
+ <outputJarVersions>false</outputJarVersions>
+ <unsignAlreadySignedJars>true</unsignAlreadySignedJars>
+ <verbose>true</verbose>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>ks-sign</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>webstart-maven-plugin</artifactId>
+ <groupId>org.codehaus.mojo.webstart</groupId>
+ <!-- use pkcs11-patched webstart-maven-plugin-->
+ <version>1.0-beta-1-mocca</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>jnlp-inline</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <excludeTransitive>false</excludeTransitive>
+ <jnlp>
+ <inputTemplateResourcePath>${project.basedir}/src/main/jnlp</inputTemplateResourcePath>
+ <inputTemplate>template.xml</inputTemplate>
+ <outputFile>mocca.jnlp</outputFile>
+ <mainClass>at.gv.egiz.bku.webstart.Launcher</mainClass>
+ </jnlp>
+ <sign>
+ <keystore>${ks-file}</keystore>
+ <alias>a-sit-3</alias>
+ <storepass>${ks-pass}</storepass>
+ <keypass>${ks-pass}</keypass>
+ <verify>true</verify>
+ <keystoreConfig>
+ <delete>false</delete>
+ <gen>false</gen>
+ </keystoreConfig>
+ </sign>
+ <pack200>false</pack200>
+ <gzip>false</gzip>
+ <outputJarVersions>false</outputJarVersions>
+ <unsignAlreadySignedJars>true</unsignAlreadySignedJars>
+ <verbose>true</verbose>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>non-webstart</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ <mainClass>at.gv.egiz.bku.webstart.Launcher</mainClass>
+ </manifest>
+ <manifestEntries>
+ <mode>development</mode>
+ <url>${project.url}</url>
+ <SplashScreen-Image>at/gv/egiz/bku/webstart/splash.png</SplashScreen-Image>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </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). Get the git commit hash.
+ -->
+ <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 shell = "sh"
+ def param = "-c"
+ if (System.getProperty("os.name").toUpperCase().contains("WINDOWS")) {
+ shell = "cmd"
+ param = "/c"
+ }
+ def gitSvnProc = [shell, param, "git rev-parse --short HEAD"].execute()
+ gitSvnProc.waitFor()
+ def svnref = gitSvnProc.in.text.trim()
+ project.properties['gitSvnRev'] = svnref
+ </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>
+ <!-- ATTENTION update of application descriptor (jnlp file) is special...
+ | The JNLP Client must use the Last-Modified header field returned by
+ | the Web Server to determine if a newer JNLP file is present on the Web
+ | server.
+ | Don't assume changes to the descriptor (changes in dependencies) to
+ | appear directly on the client descriptor (even if 'update available'
+ | was shown to user).
+ | Note: Download via browser ensures the updated jnlp file is used. -->
+ <dependency>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>BKULocal</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ <!-- make dependency not transitive -->
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>BKUCertificates</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>iaik</groupId>
+ <artifactId>iaik_jce_full_signed</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- Jetty 6.1.15+ required, see
+ | http://jira.codehaus.org/browse/JETTY-843
+ |-->
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.19</version>
+ </dependency>
+ <!-- JSP support
+ | http://jira.codehaus.org/browse/JETTY-827
+ | jsp-2.1-jetty-6.1.19 depends on the required jsp-2.1-glassfish jars (?)
+ |
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-2.1-jetty</artifactId>
+ <version>6.1.19</version>
+ </dependency-->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- javax.jnlp.* not included in SUN JDK's rt.jar,
+ | don't declare here if using OpenJDK -->
+ <dependency>
+ <groupId>jre</groupId>
+ <artifactId>javaws</artifactId>
+ <version>6.0</version>
+ <type>jar</type>
+ <scope>system</scope>
+ <systemPath>${java.home}/lib/javaws.jar</systemPath>
+ </dependency>
+ </dependencies>
+ <reporting>
+ <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>
+ <report>index</report>
+ <report>summary</report>
+ <report>license</report>
+ <report>dependencies</report>
+ <report>dependency-management</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
diff --git a/STAL/pom.xml b/STAL/pom.xml index dee4d4d0..febfad8a 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.26-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--> +<?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.25</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/STALExt/pom.xml b/STALExt/pom.xml index 67d438f9..a451ad67 100644 --- a/STALExt/pom.xml +++ b/STALExt/pom.xml @@ -1,18 +1,18 @@ -<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.26-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>STALExt</artifactId> - <name>STAL Ext</name> - <description>STAL extensions for card management</description> - <dependencies> - <dependency> - <groupId>at.gv.egiz</groupId> - <artifactId>STAL</artifactId> - <version>${project.parent.version}</version> - </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.25</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>STALExt</artifactId>
+ <name>STAL Ext</name>
+ <description>STAL extensions for card management</description>
+ <dependencies>
+ <dependency>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>STAL</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file diff --git a/STALService/pom.xml b/STALService/pom.xml index 3011cf2d..a8224a2f 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.26-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> +<?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.25</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 f1b2dff6..4e2b0143 100644 --- a/STALXService/pom.xml +++ b/STALXService/pom.xml @@ -1,27 +1,27 @@ -<?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.26-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>STALXService</artifactId> - <name>STAL Ext Service</name> - <description>STAL extension webservice interface</description> - <dependencies> - <dependency> - <artifactId>STALService</artifactId> - <groupId>at.gv.egiz</groupId> - <version>${project.parent.version}</version> - </dependency> - <dependency> - <artifactId>STALExt</artifactId> - <groupId>at.gv.egiz</groupId> - <version>${project.parent.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - </dependencies> +<?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.25</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>STALXService</artifactId>
+ <name>STAL Ext Service</name>
+ <description>STAL extension webservice interface</description>
+ <dependencies>
+ <dependency>
+ <artifactId>STALService</artifactId>
+ <groupId>at.gv.egiz</groupId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <artifactId>STALExt</artifactId>
+ <groupId>at.gv.egiz</groupId>
+ <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/bkucommon/pom.xml b/bkucommon/pom.xml index ba171a43..e81dd322 100644 --- a/bkucommon/pom.xml +++ b/bkucommon/pom.xml @@ -3,7 +3,7 @@ <parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.3.26-SNAPSHOT</version>
+ <version>1.3.25</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>bkucommon</artifactId>
@@ -4,7 +4,7 @@ <groupId>at.gv.egiz</groupId>
<artifactId>mocca</artifactId>
<packaging>pom</packaging>
- <version>1.3.26-SNAPSHOT</version>
+ <version>1.3.25</version>
<name>MOCCA</name>
<description>MOCCA (Modular Open Citizen Card Architecture) project</description>
<url>http://joinup.ec.europa.eu/site/mocca/</url>
diff --git a/smcc/pom.xml b/smcc/pom.xml index a89212aa..e3aa9dae 100644 --- a/smcc/pom.xml +++ b/smcc/pom.xml @@ -1,48 +1,48 @@ -<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.26-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>smcc</artifactId> - <name>smcc</name> - <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> - <dependencies> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>iaik</groupId> - <artifactId>iaik_jce_full_signed</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>iaik</groupId> - <artifactId>iaik_jce_me4se</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <scope>test</scope> - </dependency> - </dependencies> -</project> +<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.25</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>smcc</artifactId>
+ <name>smcc</name>
+ <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>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>iaik</groupId>
+ <artifactId>iaik_jce_full_signed</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>iaik</groupId>
+ <artifactId>iaik_jce_me4se</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/smccSTALExt/pom.xml b/smccSTALExt/pom.xml index c517ce00..17c63e6e 100644 --- a/smccSTALExt/pom.xml +++ b/smccSTALExt/pom.xml @@ -1,27 +1,27 @@ -<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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>mocca</artifactId> - <groupId>at.gv.egiz</groupId> - <version>1.3.26-SNAPSHOT</version> - </parent> - <artifactId>smccSTALExt</artifactId> - <name>smcc STAL Ext</name> - <description>STAL Ext implementation for smart cards using smcc</description> - <dependencies> - <dependency> - <groupId>at.gv.egiz</groupId> - <artifactId>smccSTAL</artifactId> - <version>${project.parent.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>at.gv.egiz</groupId> - <artifactId>BKUGuiExt</artifactId> - <version>${project.parent.version}</version> - </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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>mocca</artifactId>
+ <groupId>at.gv.egiz</groupId>
+ <version>1.3.25</version>
+ </parent>
+ <artifactId>smccSTALExt</artifactId>
+ <name>smcc STAL Ext</name>
+ <description>STAL Ext implementation for smart cards using smcc</description>
+ <dependencies>
+ <dependency>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>smccSTAL</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>BKUGuiExt</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file diff --git a/utils/pom.xml b/utils/pom.xml index b31c2359..8a705821 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -2,7 +2,7 @@ <parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.3.26-SNAPSHOT</version>
+ <version>1.3.25</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>utils</artifactId>
|