Skip to content

Commit 3d40337

Browse files
committed
change how platform files are included
1 parent 99d2eff commit 3d40337

File tree

1 file changed

+36
-34
lines changed

1 file changed

+36
-34
lines changed

pom.xml

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@
88
<packaging>jar</packaging>
99
<name>nfc4pc</name>
1010
<url>https://github.com/martinpaljak/nfc4pc</url>
11-
<description>Working with smart card readers? This is for you.</description>
11+
<description>Make your PC open links on NFC tags, like a phone!</description>
1212
<properties>
1313
<project.build.outputTimestamp>2024-09-26T12:49:53Z</project.build.outputTimestamp>
14+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
15+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
16+
<javafx.version>21.0.5</javafx.version>
1417
</properties>
1518
<scm>
1619
<url>https://github.com/martinpaljak/nfc4pc</url>
@@ -36,48 +39,18 @@
3639
<dependency>
3740
<groupId>org.openjfx</groupId>
3841
<artifactId>javafx-controls</artifactId>
39-
<version>21.0.5</version>
42+
<version>${javafx.version}</version>
4043
</dependency>
4144
<dependency>
4245
<groupId>org.openjfx</groupId>
4346
<artifactId>javafx-swing</artifactId>
44-
<version>21.0.5</version>
45-
</dependency>
46-
<dependency>
47-
<groupId>org.openjfx</groupId>
48-
<artifactId>javafx-graphics</artifactId>
49-
<version>21.0.5</version>
47+
<version>${javafx.version}</version>
5048
</dependency>
5149
<dependency>
5250
<groupId>com.dustinredmond.fxtrayicon</groupId>
5351
<artifactId>FXTrayIcon</artifactId>
5452
<version>4.2.0</version>
5553
</dependency>
56-
<!-- Runtime files for target platforms for JavaFX -->
57-
<dependency>
58-
<groupId>org.openjfx</groupId>
59-
<artifactId>javafx-graphics</artifactId>
60-
<version>21.0.5</version>
61-
<classifier>win</classifier>
62-
</dependency>
63-
<dependency>
64-
<groupId>org.openjfx</groupId>
65-
<artifactId>javafx-graphics</artifactId>
66-
<version>21.0.5</version>
67-
<classifier>linux</classifier>
68-
</dependency>
69-
<dependency>
70-
<groupId>org.openjfx</groupId>
71-
<artifactId>javafx-graphics</artifactId>
72-
<version>21.0.5</version>
73-
<classifier>mac</classifier>
74-
</dependency>
75-
<dependency>
76-
<groupId>org.openjfx</groupId>
77-
<artifactId>javafx-graphics</artifactId>
78-
<version>21.0.5</version>
79-
<classifier>mac-aarch64</classifier>
80-
</dependency>
8154
<!-- PC/SC -->
8255
<dependency>
8356
<groupId>com.github.martinpaljak</groupId>
@@ -117,12 +90,38 @@
11790
<dependency>
11891
<groupId>org.junit.jupiter</groupId>
11992
<artifactId>junit-jupiter-api</artifactId>
120-
<version>5.10.3</version>
93+
<version>5.11.3</version>
12194
<scope>test</scope>
12295
</dependency>
12396
</dependencies>
12497
<build>
12598
<plugins>
99+
<!-- Minimum Maven version. Not really relevant with wrapper -->
100+
<plugin>
101+
<groupId>org.apache.maven.plugins</groupId>
102+
<artifactId>maven-enforcer-plugin</artifactId>
103+
<version>3.5.0</version>
104+
<executions>
105+
<execution>
106+
<id>enforce-maven-version</id>
107+
<goals>
108+
<goal>enforce</goal>
109+
</goals>
110+
<configuration>
111+
<rules>
112+
<requireJavaVersion>
113+
<version>[17,)</version>
114+
<message>Project requires JDK 17+</message>
115+
</requireJavaVersion>
116+
<requireMavenVersion>
117+
<version>[3.9.9,)</version>
118+
</requireMavenVersion>
119+
<!--requirePluginVersions/-->
120+
</rules>
121+
</configuration>
122+
</execution>
123+
</executions>
124+
</plugin>
126125
<plugin>
127126
<groupId>org.openjfx</groupId>
128127
<artifactId>javafx-maven-plugin</artifactId>
@@ -161,6 +160,9 @@
161160
<configuration>
162161
<finalName>nfc4pc</finalName>
163162
<createDependencyReducedPom>false</createDependencyReducedPom>
163+
<extraArtifacts>
164+
org.openjfx:javafx-graphics:jar:mac:${javafx.version},org.openjfx:javafx-graphics:jar:mac-aarch64:${javafx.version},org.openjfx:javafx-graphics:jar:linux:${javafx.version},org.openjfx:javafx-graphics:jar:win:${javafx.version}
165+
</extraArtifacts>
164166
<transformers>
165167
<transformer
166168
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">

0 commit comments

Comments
 (0)