Skip to content
This repository was archived by the owner on Jan 18, 2024. It is now read-only.

Commit b80c360

Browse files
authored
Merge branch 'Java8' into Java16
2 parents 3b11c0a + ebd4e9e commit b80c360

1 file changed

Lines changed: 6 additions & 34 deletions

File tree

pom.xml

Lines changed: 6 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.xdev-software</groupId>
77
<artifactId>xapi-fx</artifactId>
8-
<version>1.0.0_java16-SNAPSHOT</version>
8+
<version>1.0.0_java8-SNAPSHOT</version>
99
<packaging>jar</packaging>
1010

1111
<name>XDEV Application Framework JavaFX</name>
@@ -83,18 +83,11 @@
8383
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
8484
</repository>
8585
</distributionManagement>
86-
8786
<dependencies>
88-
<dependency>
89-
<groupId>org.openjfx</groupId>
90-
<artifactId>javafx-swing</artifactId>
91-
<version>16</version>
92-
</dependency>
93-
<dependency>
94-
<groupId>org.openjfx</groupId>
95-
<artifactId>javafx-web</artifactId>
96-
<version>16</version>
97-
</dependency>
87+
88+
<!-- There are no JavaFX dependencies here, because with Java8 JavaFX has
89+
to come with the JDK. There are no maven dependencies we can use. -->
90+
9891
</dependencies>
9992

10093
<build>
@@ -239,26 +232,7 @@
239232
</goals>
240233
</execution>
241234
</executions>
242-
</plugin>
243-
<plugin>
244-
<groupId>org.apache.maven.plugins</groupId>
245-
<artifactId>maven-assembly-plugin</artifactId>
246-
<version>3.1.1</version>
247-
<configuration>
248-
<descriptorRefs>
249-
<descriptorRef>jar-with-dependencies</descriptorRef>
250-
</descriptorRefs>
251-
</configuration>
252-
<executions>
253-
<execution>
254-
<id>make-assembly</id>
255-
<phase>package</phase>
256-
<goals>
257-
<goal>single</goal>
258-
</goals>
259-
</execution>
260-
</executions>
261-
</plugin>
235+
</plugin>
262236

263237
<plugin>
264238
<groupId>org.apache.maven.plugins</groupId>
@@ -291,8 +265,6 @@
291265
</execution>
292266
</executions>
293267
</plugin>
294-
295-
296268
</plugins>
297269
</build>
298270

0 commit comments

Comments
 (0)