From 72b8d996dad9f184f856ba7a823b4781a6503ffb Mon Sep 17 00:00:00 2001
From: Jurrie Overgoor <1213142+Jurrie@users.noreply.github.com>
Date: Sun, 4 Aug 2024 12:06:45 +0200
Subject: [PATCH] Add versioning, bump plugins, random Maven project
improvement
---
pom.xml | 205 ++++++++++++++++--
.../x32/osc/xremoteproxy/XRemoteProxy.java | 23 ++
.../behringer/x32/osc/xremoteproxy/Main.java | 10 +-
3 files changed, 222 insertions(+), 16 deletions(-)
create mode 100644 src/main/java-templates/org/jurr/behringer/x32/osc/xremoteproxy/XRemoteProxy.java
diff --git a/pom.xml b/pom.xml
index 8e067e7..9d0e456 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
org.slf4j
slf4j-api
- 2.0.13
+ 2.1.0-alpha1
ch.qos.logback
@@ -90,11 +90,6 @@
-
- org.apache.maven.plugins
- maven-enforcer-plugin
- 3.5.0
-
org.apache.maven.plugins
maven-clean-plugin
@@ -108,12 +103,12 @@
org.apache.maven.plugins
maven-javadoc-plugin
- 3.7.0
+ 3.8.0
org.apache.maven.plugins
maven-plugin-plugin
- 3.13.1
+ 4.0.0-beta-1
org.apache.maven.plugins
@@ -123,7 +118,7 @@
org.apache.maven.plugins
maven-surefire-plugin
- 3.3.0
+ 3.3.1
**/*.java
@@ -145,7 +140,7 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.12.1
+ 3.13.0
org.apache.maven.plugins
@@ -160,6 +155,16 @@
true
+
+ org.apache.maven.plugins
+ maven-enforcer-plugin
+ 3.5.0
+
+
+ org.apache.maven.plugins
+ maven-gpg-plugin
+ 3.2.4
+
org.apache.maven.plugins
maven-source-plugin
@@ -173,16 +178,13 @@
org.owasp
dependency-check-maven
- 10.0.2
+ 10.0.3
true
4
true
true
false
-
- dependency-check-suppressions.xml
-
true
sonatype-oss-index
true
@@ -195,14 +197,122 @@
+
+ org.apache.maven.plugins
+ maven-release-plugin
+ 3.1.1
+
+ release-prepare
+ release-perform
+
+
org.apache.maven.plugins
maven-site-plugin
- 3.12.1
+ 4.0.0-M16
+
+
+ de.jutzig
+ github-release-plugin
+ 1.6.0
+
+
+ org.codehaus.mojo
+ versions-maven-plugin
+ 2.17.1
+
+
+ org.codehaus.mojo
+ templating-maven-plugin
+ 3.0.0
+
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+ 3.6.0
+
+
+ org.codehaus.mojo
+ buildnumber-maven-plugin
+ 3.2.0
+
+ org.codehaus.mojo
+ versions-maven-plugin
+
+
+ initialize
+
+ display-dependency-updates
+ display-plugin-updates
+
+
+
+
+
+ org.codehaus.mojo
+ buildnumber-maven-plugin
+
+
+ initialize
+
+ create
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-enforcer-plugin
+
+
+ enforce-maven
+
+ enforce
+
+
+
+
+ 3.6.3
+
+
+
+
+
+
+
+ org.codehaus.mojo
+ templating-maven-plugin
+
+
+ default
+
+ filter-sources
+
+
+
+
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+
+
+ add-source
+ generate-sources
+
+ add-source
+
+
+
+ ${project.build.directory}/generated-sources/java-templates
+
+
+
+
+
org.apache.maven.plugins
maven-jar-plugin
@@ -245,4 +355,69 @@
+
+
+
+ release-prepare
+
+
+
+ org.owasp
+ dependency-check-maven
+
+
+
+ aggregate
+
+
+
+
+
+
+
+
+ release-perform
+
+
+
+ org.apache.maven.plugins
+ maven-gpg-plugin
+
+
+ sign-artifacts
+ verify
+
+ sign
+
+
+
+
+
+ de.jutzig
+ github-release-plugin
+
+
+ deploy
+
+ release
+
+
+ ${project.artifactId}-${project.version}
+
+
+ ${project.build.directory}
+
+ ${project.artifactId}-${project.version}.jar
+ ${project.artifactId}-${project.version}.jar.asc
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java-templates/org/jurr/behringer/x32/osc/xremoteproxy/XRemoteProxy.java b/src/main/java-templates/org/jurr/behringer/x32/osc/xremoteproxy/XRemoteProxy.java
new file mode 100644
index 0000000..e224a6c
--- /dev/null
+++ b/src/main/java-templates/org/jurr/behringer/x32/osc/xremoteproxy/XRemoteProxy.java
@@ -0,0 +1,23 @@
+package org.jurr.behringer.x32.osc.xremoteproxy;
+
+/**
+ * Class file that holds build-time information.
+ *
+ * Please note that this class is generated from src/main/java-templates/!
+ */
+public final class XRemoteProxy
+{
+ private XRemoteProxy()
+ {
+ }
+
+ public static String getVersion()
+ {
+ return "${version}";
+ }
+
+ public static String getBuildNumber()
+ {
+ return "${buildNumber}";
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/org/jurr/behringer/x32/osc/xremoteproxy/Main.java b/src/main/java/org/jurr/behringer/x32/osc/xremoteproxy/Main.java
index 61c35dc..d885459 100644
--- a/src/main/java/org/jurr/behringer/x32/osc/xremoteproxy/Main.java
+++ b/src/main/java/org/jurr/behringer/x32/osc/xremoteproxy/Main.java
@@ -16,13 +16,21 @@
public class Main
{
+ static
+ {
+ // Silence SLF4J internal info logging. This is in a static block because it needs to be done before any SLF4J logger is created.
+ System.setProperty(org.slf4j.helpers.Reporter.SLF4J_INTERNAL_VERBOSITY_KEY, "WARN");
+ }
+
private static final Logger LOGGER = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final int EXIT_OK = 0;
private static final int EXIT_CMDLINE_INVALID = 1;
private static final int EXIT_EXCEPTION = 2;
- public static void main(final String[] args) throws InterruptedException, IOException
+ public static void main(final String... args) throws InterruptedException, IOException
{
+ LOGGER.info("xremote-proxy version {} ({})", XRemoteProxy.getVersion(), XRemoteProxy.getBuildNumber());
+
final JCommander jCommander = JCommander.newBuilder().addObject(Settings.INSTANCE).build();
try
{