Skip to content
GitLab
Commit 4eba5283 authored by Mike Prechtl's avatar Mike Prechtl
Browse files

Provide a src-parent module and move installer stuff to packager module

parent 6751eb25
Hide whitespace changes
Inline Side-by-side
addon/pom.xml
View file @ 4eba5283
......@@ -2,11 +2,12 @@
<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>app</artifactId>
<version>1.3.1-SNAPSHOT</version>
</parent>
<parent>
<groupId>org.openecard</groupId>
<artifactId>src-parent</artifactId>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../src-parent/</relativePath>
</parent>
<groupId>org.openecard</groupId>
<artifactId>addon</artifactId>
......
addons/pom.xml
View file @ 4eba5283
......@@ -4,8 +4,9 @@
<parent>
<groupId>org.openecard</groupId>
<artifactId>app</artifactId>
<artifactId>src-parent</artifactId>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../src-parent/</relativePath>
</parent>
<groupId>org.openecard</groupId>
......
bindings/pom.xml
View file @ 4eba5283
......@@ -2,11 +2,12 @@
<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>app</artifactId>
<groupId>org.openecard</groupId>
<version>1.3.1-SNAPSHOT</version>
</parent>
<parent>
<groupId>org.openecard</groupId>
<artifactId>src-parent</artifactId>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../src-parent/</relativePath>
</parent>
<groupId>org.openecard</groupId>
<artifactId>bindings</artifactId>
......
cifs/pom.xml
View file @ 4eba5283
......@@ -4,8 +4,9 @@
<parent>
<groupId>org.openecard</groupId>
<artifactId>app</artifactId>
<artifactId>src-parent</artifactId>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../src-parent/</relativePath>
</parent>
<groupId>org.openecard</groupId>
......
clients/pom.xml
View file @ 4eba5283
......@@ -4,8 +4,9 @@
<parent>
<groupId>org.openecard</groupId>
<artifactId>app</artifactId>
<artifactId>src-parent</artifactId>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../src-parent/</relativePath>
</parent>
<groupId>org.openecard</groupId>
......@@ -18,8 +19,6 @@
<module>richclient</module>
<module>android-core</module>
<module>android-lib</module>
<module>richclient-bundle</module>
<module>richclient-jlink</module>
</modules>
</project>
clients/richclient-bundle/pom.xml deleted 100644 → 0
View file @ 6751eb25
<?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>
common/pom.xml
View file @ 4eba5283
......@@ -4,8 +4,9 @@
<parent>
<groupId>org.openecard</groupId>
<artifactId>app</artifactId>
<artifactId>src-parent</artifactId>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../src-parent/</relativePath>
</parent>
<groupId>org.openecard</groupId>
......
crypto/pom.xml
View file @ 4eba5283
......@@ -4,8 +4,9 @@
<parent>
<groupId>org.openecard</groupId>
<artifactId>app</artifactId>
<artifactId>src-parent</artifactId>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../src-parent/</relativePath>
</parent>
<groupId>org.openecard</groupId>
......
gui/pom.xml
View file @ 4eba5283
......@@ -4,8 +4,9 @@
<parent>
<groupId>org.openecard</groupId>
<artifactId>app</artifactId>
<artifactId>src-parent</artifactId>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../src-parent/</relativePath>
</parent>
<groupId>org.openecard</groupId>
......
i18n/pom.xml
View file @ 4eba5283
......@@ -4,8 +4,9 @@
<parent>
<groupId>org.openecard</groupId>
<artifactId>app</artifactId>
<artifactId>src-parent</artifactId>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../src-parent/</relativePath>
</parent>
<groupId>org.openecard</groupId>
......
ifd/pom.xml
View file @ 4eba5283
......@@ -4,8 +4,9 @@
<parent>
<groupId>org.openecard</groupId>
<artifactId>app</artifactId>
<artifactId>src-parent</artifactId>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../src-parent/</relativePath>
</parent>
<groupId>org.openecard</groupId>
......
management/pom.xml
View file @ 4eba5283
......@@ -4,8 +4,9 @@
<parent>
<groupId>org.openecard</groupId>
<artifactId>app</artifactId>
<artifactId>src-parent</artifactId>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../src-parent/</relativePath>
</parent>
<groupId>org.openecard</groupId>
......
packager/pom.xml 0 → 100644
View file @ 4eba5283
<?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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.openecard</groupId>
<artifactId>app</artifactId>
<version>1.3.1-SNAPSHOT</version>
</parent>
<groupId>org.openecard</groupId>
<artifactId>packager</artifactId>
<packaging>pom</packaging>
<name>Packager</name>
<modules>
<module>richclient-bundle</module>
<module>richclient-packager</module>
</modules>
</project>
\ No newline at end of file
packager/richclient-bundle/pom.xml 0 → 100644
View file @ 4eba5283
<?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>
<parent>
<groupId>org.openecard</groupId>
<artifactId>packager</artifactId>
<version>1.3.1-SNAPSHOT</version>
</parent>
<groupId>org.openecard.clients</groupId>
<artifactId>richclient-bundle</artifactId>
<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>${project.version}</version>
</dependency>
</dependencies>
</project>
clients/richclient-jlink/pom.xml → packager/richclient-packager/pom.xml
View file @ 4eba5283
......@@ -2,22 +2,20 @@
<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>packager</artifactId>
<version>1.3.1-SNAPSHOT</version>
</parent>
<groupId>org.openecard.clients</groupId>
<artifactId>richclient-jlink</artifactId>
<version>1.0.0-SNAPSHOT</version>
<artifactId>richclient-packager</artifactId>
<packaging>jpackager</packaging>
<name>Rich Client (JLink)</name>
<name>Rich Client (Packager)</name>
<properties>
<openecard.release.version>1.3.0</openecard.release.version>
<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>
......@@ -127,6 +125,14 @@
</execution>
</executions>
</plugin>
<!-- Skip install step of install-plugin-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<!-- Jpackage plugin to create installers -->
<plugin>
<groupId>net.agilhard.maven.plugins</groupId>
......@@ -137,7 +143,7 @@
<!-- Jpackage arguments -->
<name>open-ecard</name>
<identifier>org.openecard.richclient</identifier>
<appVersion>${openecard.release.version}</appVersion>
<appVersion>${project.version}</appVersion>
<module>org.openecard.richclient/org.openecard.richclient.RichClient</module>
<jdkToolchain>
<version>[14,)</version>
......@@ -159,7 +165,7 @@
<argument>-Djavax.xml.stream.supportDTD=false</argument>
</arguments>
<!-- Application package metadata -->
<licenseFile>src/main/resources/licenses/LICENSE.GPL</licenseFile>
<licenseFile>${project.basedir}/src/main/resources/licenses/LICENSE.GPL</licenseFile>
<copyright>2019 ecsec GmbH</copyright>
<linuxOptions>
<bundleName>Open eCard App</bundleName>
......@@ -207,7 +213,7 @@
<dependency>
<groupId>org.openecard.clients</groupId>
<artifactId>richclient-bundle</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.openecard.clients</groupId>
......@@ -220,36 +226,30 @@
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<version>${version.openjfx}</version>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-swing</artifactId>
<version>${version.openjfx}</version>
</dependency>
<!-- BouncyCastle -->
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>${version.bouncycastle}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bctls-jdk15on</artifactId>
<version>${version.bouncycastle}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<version>${version.bouncycastle}</version>
</dependency>
<!-- JAXB -->
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>${version.jaxb.runtime}</version>
<exclusions>
<exclusion>
<groupId>jakarta.activation</groupId>
......
clients/richclient-jlink/src/main/java/module-info.java → packager/richclient-packager/src/main/java/module-info.java
View file @ 4eba5283
......@@ -23,6 +23,6 @@
module org.openecard.richclient.bundle {
requires org.openecard.richclient;
/* JAXB-Runtime */
requires com.sun.xml.bind;
/* JAXB-Runtime */
requires com.sun.xml.bind;
}
Supports Markdown
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