Commit 3ca2efe7 authored by Tobias Wich's avatar Tobias Wich
Browse files

Merge branch 'java11' into reqesidta

parents 39c8ab2f 68caf9b9
......@@ -18,6 +18,8 @@
<module>richclient</module>
<module>android-core</module>
<module>android-lib</module>
<module>richclient-bundle</module>
<module>richclient-jlink</module>
</modules>
</project>
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
<id>fat-jar</id>
<formats>
<format>jar</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<dependencySets>
<dependencySet>
<outputDirectory>/</outputDirectory>
<useProjectArtifact>true</useProjectArtifact>
<unpack>true</unpack>
<scope>runtime</scope>
<excludes>
<!-- BouncyCastle dependencies -->
<exclude>org.bouncycastle:*</exclude>
<!-- JAXB dependencies -->
<exclude>javax.xml.bind:jaxb-api</exclude>
<exclude>com.sun.istack:istack-commons-runtime</exclude>
<exclude>org.glassfish.jaxb:jaxb-runtime</exclude>
<exclude>javax.activation:*</exclude>
<!-- JavaFX dependencies -->
<exclude>org.openjfx:*</exclude>
</excludes>
</dependencySet>
</dependencySets>
</assembly>
<?xml version="1.0"?>
<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>
<groupId>org.openecard.clients</groupId>
<artifactId>richclient-bundle</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Rich Client (Bundle)</name>
<properties>
<maven.compiler.release>11</maven.compiler.release>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4.1</version>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<archive>
<manifest>
<addClasspath>true</addClasspath>
<mainClass>org.openecard.richclient.RichClient</mainClass>
</manifest>
</archive>
<descriptors>
<descriptor>assembly.xml</descriptor>
</descriptors>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<!-- bind to the packaging phase -->
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.openecard.clients</groupId>
<artifactId>richclient</artifactId>
<version>1.3.1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
/****************************************************************************
* Copyright (C) 2019 ecsec GmbH.
* All rights reserved.
* Contact: ecsec GmbH (info@ecsec.de)
*
* This file is part of the Open eCard App.
*
* GNU General Public License Usage
* This file may be used under the terms of the GNU General Public
* License version 3.0 as published by the Free Software Foundation
* and appearing in the file LICENSE.GPL included in the packaging of
* this file. Please review the following information to ensure the
* GNU General Public License version 3.0 requirements will be met:
* http://www.gnu.org/copyleft/gpl.html.
*
* Other Usage
* Alternatively, this file may be used in accordance with the terms
* and conditions contained in a signed written agreement between
* you and ecsec GmbH.
*
***************************************************************************/
module org.openecard.richclient {
requires java.smartcardio;
requires java.logging;
requires java.desktop;
requires org.bouncycastle.provider;
requires org.bouncycastle.tls;
requires org.bouncycastle.pkix;
requires java.xml.bind;
requires javafx.base;
requires javafx.controls;
requires javafx.graphics;
opens de.bund.bsi.ecard.api._1;
opens iso.std.iso_iec._24727.tech.schema;
opens oasis.names.tc.dss._1_0.core.schema;
opens oasis.names.tc.dss_x._1_0.profiles.verificationreport.schema_;
opens oasis.names.tc.saml._1_0.assertion;
opens oasis.names.tc.saml._2_0.assertion;
opens org.etsi.uri._01903.v1_3;
opens org.etsi.uri._02231.v3_1;
opens org.openecard.ws;
opens org.openecard.ws.chipgateway;
opens org.openecard.ws.schema;
opens org.w3._2000._09.xmldsig_;
opens org.w3._2001._04.xmldsig_more_;
opens org.w3._2001._04.xmlenc_;
opens org.w3._2007._05.xmldsig_more_;
opens org.w3._2009.xmlenc11_;
opens generated;
opens org.openecard.mdlw.sal.config to java.xml.bind;
opens org.openecard.addon.manifest to java.xml.bind;
}
......@@ -2,103 +2,148 @@
<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>
<groupId>org.openecard</groupId>
<artifactId>clients</artifactId>
<version>1.3.1-SNAPSHOT</version>
</parent>
<groupId>org.openecard.clients</groupId>
<artifactId>richclient-jlink</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>jlink</packaging>
<name>Rich Client (JLink)</name>
<properties>
<application.name>Open eCard App</application.name>
<maven.compiler.release>11</maven.compiler.release>
<version.bouncycastle>1.62</version.bouncycastle>
<version.openjfx>12.0.1</version.openjfx>
<version.jaxb.runtime>2.3.2</version.jaxb.runtime>
</properties>
<repositories>
<repository>
<id>openecard-repos</id>
<name>Openecard Repos</name>
<url>https://mvn.ecsec.de/repository/openecard-public</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>openecard-repos</id>
<url>https://mvn.ecsec.de/repository/openecard-public</url>
</pluginRepository>
</pluginRepositories>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
<debug>true</debug>
<debuglevel>source,lines,vars</debuglevel>
<optimize>false</optimize>
</configuration>
<executions>
<execution>
<id>default-compile</id>
<goals>
<goal>compile</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jlink-plugin</artifactId>
<version>3.0.0-alpha-2-20190731</version>
<extensions>true</extensions>
<dependencies>
<!-- Use newer version of ASM -->
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>7.1</version>
</dependency>
</dependencies>
<configuration>
<excludeModules>
<module>javafx.baseEmpty</module>
<module>javafx.controlsEmpty</module>
<module>javafx.graphicsEmpty</module>
<module>javafx.swingEmpty</module>
</excludeModules>
<launcher>openecard=org.openecard.richclient/org.openecard.richclient.RichClient</launcher>
<ignoreSigningInformation>true</ignoreSigningInformation>
<noHeaderFiles>true</noHeaderFiles>
<noManPages>true</noManPages>
<stripDebug>true</stripDebug>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jarsigner-plugin</artifactId>
<executions>
<execution>
<id>sign</id>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<dependencies>
<!-- Open eCard RichClient Bundle -->
<dependency>
<groupId>org.openecard.clients</groupId>
<artifactId>richclient</artifactId>
<version>${project.version}</version>
<artifactId>richclient-bundle</artifactId>
<version>1.0.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.openecard.clients</groupId>
<artifactId>richclient</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- JavaFX -->
<dependency>
<groupId>org.openecard.clients</groupId>
<artifactId>java-version-check</artifactId>
<version>${project.version}</version>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<version>${version.openjfx}</version>
</dependency>
<!-- JAXB API and implementation -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<groupId>org.openjfx</groupId>
<artifactId>javafx-swing</artifactId>
<version>${version.openjfx}</version>
</dependency>
<!-- BouncyCastle -->
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>${version.bouncycastle}</version>
</dependency>
<!-- This must be named explicitly because the parent pom interferes with the dependency resolution -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<groupId>org.bouncycastle</groupId>
<artifactId>bctls-jdk15on</artifactId>
<version>${version.bouncycastle}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<version>${version.bouncycastle}</version>
</dependency>
<!-- Annotation Module: annotations -->
<!-- JAXB -->
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>annotations</artifactId>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>${version.jaxb.runtime}</version>
<exclusions>
<exclusion>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Java-Annotation Module: java.annotations -->
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
<version>1.2.2-20190731</version>
</dependency>
</dependencies>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment