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
e1069432
Commit
e1069432
authored
Sep 18, 2019
by
Mike Prechtl
Browse files
Activate jpackage procedure based on a property
parent
c4ac3d09
Changes
4
Hide whitespace changes
Inline
Side-by-side
packager/pom.xml
View file @
e1069432
...
...
@@ -16,15 +16,7 @@
<modules>
<module>
richclient-bundle
</module>
<module>
richclient-packager
</module>
</modules>
<profiles>
<profile>
<id>
desktop-package
</id>
<modules>
<module>
richclient-packager
</module>
</modules>
</profile>
</profiles>
</project>
packager/richclient-bundle/assembly.xml
View file @
e1069432
<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>
<!-- This JAR bundles all dependencies which are not modularized -->
<id>
bundle
</id>
<formats>
<format>
jar
</format>
</formats>
...
...
@@ -12,6 +13,7 @@
<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>
...
...
packager/richclient-bundle/src/main/java/module-info.java
View file @
e1069432
...
...
@@ -26,16 +26,20 @@ module org.openecard.richclient {
requires
java
.
logging
;
requires
java
.
desktop
;
/* 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
;
...
...
packager/richclient-packager/pom.xml
View file @
e1069432
...
...
@@ -29,12 +29,88 @@
</properties>
<profiles>
<profile>
<id>
desktop-package
</id>
<activation>
<property>
<name>
desktop-package
</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>
net.agilhard.maven.plugins
</groupId>
<artifactId>
jlink-jpackager-maven-plugin
</artifactId>
<extensions>
true
</extensions>
<executions>
<execution>
<id>
jpackage
</id>
<phase>
package
</phase>
<goals>
<goal>
jpackager
</goal>
</goals>
<configuration>
<!-- Jpackage arguments -->
<!-- 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>
<jdkToolchain>
<version>
[14,)
</version>
</jdkToolchain>
<runtimeImage>
${project.build.directory}/open-ecard
</runtimeImage>
<skipModulesInclude>
true
</skipModulesInclude>
<!-- JVM arguments of the application -->
<arguments>
<argument>
-XX:-UsePerfData
</argument>
<argument>
-XX:-Inline
</argument>
<argument>
-XX:+AggressiveOpts
</argument>
<argument>
-Xms16m
</argument>
<argument>
-Xmx64m
</argument>
<argument>
-XX:+UseG1GC
</argument>
<argument>
-XX:MinHeapFreeRatio=1
</argument>
<argument>
-XX:MaxHeapFreeRatio=5
</argument>
<argument>
-XX:G1ReservePercent=5
</argument>
<argument>
-Djavax.xml.stream.isSupportingExternalEntities=false
</argument>
<argument>
-Djavax.xml.stream.supportDTD=false
</argument>
</arguments>
<!-- Application package metadata -->
<vendor>
${app.vendor}
</vendor>
<description>
${app.description}
</description>
<licenseFile>
${project.basedir}/src/main/resources/licenses/LICENSE.GPL
</licenseFile>
<copyright>
2019 ecsec GmbH
</copyright>
<linuxOptions>
<bundleName>
${package.identifier}
</bundleName>
<debMaintainer>
${app.maintainer}
</debMaintainer>
<rpmLicenseType>
GPL v3
</rpmLicenseType>
<menuGroup>
Network;
</menuGroup>
<packageDeps>
${package.deps}
</packageDeps>
</linuxOptions>
<macOptions>
<bundleName>
${app.identifier}
</bundleName>
<bundleIdentifier>
org.openecard.richclient
</bundleIdentifier>
</macOptions>
<windowsOptions>
<dirChooser>
true
</dirChooser>
<menuGroup>
misc
</menuGroup>
<upgradeUUID>
CB11CB66-71B5-42C1-8076-15F1FEDCC22A
</upgradeUUID>
</windowsOptions>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>
app-bundles-Linux
</id>
<activation>
<os>
<family>
Unix
</family>
</os>
<property>
<name>
desktop-package
</name>
</property>
</activation>
<build>
<plugins>
...
...
@@ -67,7 +143,6 @@
<name>
${package.identifier}
</name>
<icon>
${project.basedir}/src/main/resources/linux/Open-eCard-App.png
</icon>
<resourceDir>
${project.basedir}/target/linux/resources
</resourceDir>
<type>
deb
</type>
</configuration>
</plugin>
</plugins>
...
...
@@ -79,6 +154,9 @@
<os>
<family>
windows
</family>
</os>
<property>
<name>
desktop-package
</name>
</property>
</activation>
<build>
<plugins>
...
...
@@ -143,6 +221,9 @@
<os>
<family>
mac
</family>
</os>
<property>
<name>
desktop-package
</name>
</property>
</activation>
<build>
<plugins>
...
...
@@ -153,7 +234,6 @@
<name>
${app.identifier}
</name>
<icon>
${project.basedir}/src/main/resources/mac-os/Open-eCard-App.icns
</icon>
<resourceDir>
${project.basedir}/src/main/resources/mac-os
</resourceDir>
<type>
dmg
</type>
</configuration>
</plugin>
</plugins>
...
...
@@ -226,60 +306,6 @@
</jdkToolchain>
</configuration>
</execution>
<execution>
<id>
jpackage
</id>
<phase>
package
</phase>
<goals>
<goal>
jpackager
</goal>
</goals>
<configuration>
<!-- Jpackage arguments -->
<!-- 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>
<jdkToolchain>
<version>
[14,)
</version>
</jdkToolchain>
<runtimeImage>
${project.build.directory}/open-ecard
</runtimeImage>
<skipModulesInclude>
true
</skipModulesInclude>
<!-- JVM arguments of the application -->
<arguments>
<argument>
-XX:-UsePerfData
</argument>
<argument>
-XX:-Inline
</argument>
<argument>
-XX:+AggressiveOpts
</argument>
<argument>
-Xms16m
</argument>
<argument>
-Xmx64m
</argument>
<argument>
-XX:+UseG1GC
</argument>
<argument>
-XX:MinHeapFreeRatio=1
</argument>
<argument>
-XX:MaxHeapFreeRatio=5
</argument>
<argument>
-XX:G1ReservePercent=5
</argument>
<argument>
-Djavax.xml.stream.isSupportingExternalEntities=false
</argument>
<argument>
-Djavax.xml.stream.supportDTD=false
</argument>
</arguments>
<!-- Application package metadata -->
<vendor>
${app.vendor}
</vendor>
<description>
${app.description}
</description>
<licenseFile>
${project.basedir}/src/main/resources/licenses/LICENSE.GPL
</licenseFile>
<copyright>
2019 ecsec GmbH
</copyright>
<linuxOptions>
<bundleName>
${package.identifier}
</bundleName>
<debMaintainer>
${app.maintainer}
</debMaintainer>
<rpmLicenseType>
GPL v3
</rpmLicenseType>
<menuGroup>
Network;
</menuGroup>
<packageDeps>
${package.deps}
</packageDeps>
</linuxOptions>
<macOptions>
<bundleName>
${app.identifier}
</bundleName>
<bundleIdentifier>
org.openecard.richclient
</bundleIdentifier>
</macOptions>
<windowsOptions>
<dirChooser>
true
</dirChooser>
<menuGroup>
misc
</menuGroup>
<upgradeUUID>
CB11CB66-71B5-42C1-8076-15F1FEDCC22A
</upgradeUUID>
</windowsOptions>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
...
...
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