Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ecsec Public
reqesidta-prototype
client-signer
Commits
1be647b9
Commit
1be647b9
authored
Nov 07, 2019
by
Mike Prechtl
Browse files
Create a non-modular application image
parent
824ad5c0
Changes
4
Hide whitespace changes
Inline
Side-by-side
packager/richclient-bundle/assembly.xml
View file @
1be647b9
...
...
@@ -13,20 +13,6 @@
<useProjectArtifact>
true
</useProjectArtifact>
<unpack>
true
</unpack>
<scope>
runtime
</scope>
<!-- Modularized dependencies will be excluded, they will become part of the runtime later -->
<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>
packager/richclient-bundle/src/main/java/module-info.java
deleted
100644 → 0
View file @
824ad5c0
/****************************************************************************
* 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
java
.
sql
;
// for jackson serialization
/* BouncyCastle modules */
requires
org
.
bouncycastle
.
provider
;
requires
org
.
bouncycastle
.
tls
;
requires
org
.
bouncycastle
.
pkix
;
/* JAXB module */
requires
java
.
xml
.
bind
;
/* JavaFX modules */
requires
javafx
.
base
;
requires
javafx
.
controls
;
requires
javafx
.
graphics
;
/* Open JAXB classes for reflection */
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
;
opens
jnasmartcardio
to
java
.
base
;
}
packager/richclient-packager/pom.xml
View file @
1be647b9
...
...
@@ -54,11 +54,11 @@
<!-- Don't use spaces in application name, because of problems with install scripts ... -->
<identifier>
org.openecard.richclient
</identifier>
<appVersion>
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}
</appVersion>
<module>
org.openecard.richclient/org.openecard.richclient.RichClient
</module>
<mainJar>
richclient-bundle-${project.version}.jar
</mainJar>
<inputDirectoryPackage>
${project.basedir}/../richclient-bundle/target
</inputDirectoryPackage>
<jdkToolchain>
<version>
[14,)
</version>
</jdkToolchain>
<runtimeImage>
${project.build.directory}/open-ecard
</runtimeImage>
<skipModulesInclude>
true
</skipModulesInclude>
<!-- JVM arguments of the application -->
<jvmArgs>
...
...
@@ -293,7 +293,6 @@
</goals>
<configuration>
<!-- JLink arguments -->
<launcher>
open-ecard=org.openecard.richclient/org.openecard.richclient.RichClient
</launcher>
<compress>
2
</compress>
<noHeaderFiles>
true
</noHeaderFiles>
<noManPages>
true
</noManPages>
...
...
@@ -312,58 +311,6 @@
</build>
<dependencies>
<!-- Open eCard RichClient Bundle -->
<dependency>
<groupId>
org.openecard.clients
</groupId>
<artifactId>
richclient-bundle
</artifactId>
<version>
${project.version}
</version>
<exclusions>
<exclusion>
<groupId>
org.openecard.clients
</groupId>
<artifactId>
richclient
</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- JavaFX -->
<dependency>
<groupId>
org.openjfx
</groupId>
<artifactId>
javafx-controls
</artifactId>
</dependency>
<dependency>
<groupId>
org.openjfx
</groupId>
<artifactId>
javafx-swing
</artifactId>
</dependency>
<!-- BouncyCastle -->
<dependency>
<groupId>
org.bouncycastle
</groupId>
<artifactId>
bcprov-jdk15on
</artifactId>
</dependency>
<dependency>
<groupId>
org.bouncycastle
</groupId>
<artifactId>
bctls-jdk15on
</artifactId>
</dependency>
<dependency>
<groupId>
org.bouncycastle
</groupId>
<artifactId>
bcpkix-jdk15on
</artifactId>
</dependency>
<!-- JAXB -->
<dependency>
<groupId>
org.glassfish.jaxb
</groupId>
<artifactId>
jaxb-runtime
</artifactId>
<exclusions>
<exclusion>
<groupId>
jakarta.activation
</groupId>
<artifactId>
jakarta.activation-api
</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>
com.sun.activation
</groupId>
<artifactId>
jakarta.activation
</artifactId>
</dependency>
</dependencies>
</project>
packager/richclient-packager/src/main/java/module-info.java
View file @
1be647b9
...
...
@@ -21,8 +21,9 @@
***************************************************************************/
module
org
.
openecard
.
richclient
.
bundle
{
requires
org
.
openecard
.
richclient
;
/* JAXB-Runtime */
requires
com
.
sun
.
xml
.
bind
;
module
org
.
openecard
.
richclient
.
builder
{
requires
java
.
smartcardio
;
requires
java
.
logging
;
requires
java
.
desktop
;
requires
java
.
sql
;
// for jackson serialization
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment