Merge branch 'main' of github.com:kneitzel/JavaFXMavenApp
# Conflicts: # pom.xml
This commit is contained in:
commit
ddea75dfb3
42
pom.xml
42
pom.xml
@ -29,9 +29,15 @@
|
|||||||
<jetbrains.annotations.version>23.0.0</jetbrains.annotations.version>
|
<jetbrains.annotations.version>23.0.0</jetbrains.annotations.version>
|
||||||
|
|
||||||
<!-- Plugin dependencies -->
|
<!-- Plugin dependencies -->
|
||||||
|
<maven.clean.plugin>3.1.0</maven.clean.plugin>
|
||||||
<maven.compiler.plugin>3.8.1</maven.compiler.plugin>
|
<maven.compiler.plugin>3.8.1</maven.compiler.plugin>
|
||||||
<maven.dependency.plugin>3.1.2</maven.dependency.plugin>
|
<maven.dependency.plugin>3.1.2</maven.dependency.plugin>
|
||||||
|
<maven.deploy.plugin>2.8.2</maven.deploy.plugin>
|
||||||
<maven.enforcer.plugin>3.1.0</maven.enforcer.plugin>
|
<maven.enforcer.plugin>3.1.0</maven.enforcer.plugin>
|
||||||
|
<maven.install.plugin>2.5.2</maven.install.plugin>
|
||||||
|
<maven.jar.plugin>3.2.0</maven.jar.plugin>
|
||||||
|
<maven.resources.plugin>3.2.0</maven.resources.plugin>
|
||||||
|
<maven.site.plugin>3.3</maven.site.plugin>
|
||||||
<maven.surfire.plugin>3.0.0-M5</maven.surfire.plugin>
|
<maven.surfire.plugin>3.0.0-M5</maven.surfire.plugin>
|
||||||
<moditect.maven.plugin>1.0.0.RC1</moditect.maven.plugin>
|
<moditect.maven.plugin>1.0.0.RC1</moditect.maven.plugin>
|
||||||
<jpackage.maven.plugin>0.1.2</jpackage.maven.plugin>
|
<jpackage.maven.plugin>0.1.2</jpackage.maven.plugin>
|
||||||
@ -127,6 +133,42 @@
|
|||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-clean-plugin</artifactId>
|
||||||
|
<version>${maven.clean.plugin}</version>
|
||||||
|
</plugin>
|
||||||
|
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-deploy-plugin</artifactId>
|
||||||
|
<version>${maven.deploy.plugin}</version>
|
||||||
|
</plugin>
|
||||||
|
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-install-plugin</artifactId>
|
||||||
|
<version>${maven.install.plugin}</version>
|
||||||
|
</plugin>
|
||||||
|
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-jar-plugin</artifactId>
|
||||||
|
<version>${maven.jar.plugin}</version>
|
||||||
|
</plugin>
|
||||||
|
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-resources-plugin</artifactId>
|
||||||
|
<version>${maven.resources.plugin}</version>
|
||||||
|
</plugin>
|
||||||
|
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-site-plugin</artifactId>
|
||||||
|
<version>${maven.site.plugin}</version>
|
||||||
|
</plugin>
|
||||||
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-surefire-plugin</artifactId>
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user