From d84bf9fa41c89c364be4d2a0471196352e98557c Mon Sep 17 00:00:00 2001
From: tobias <tobias@thecodedev.de>
Date: Sun, 29 Sep 2019 22:26:54 +0200
Subject: [PATCH] Fix version and maven resource management
---
PlayWall/pom.xml | 17 ++++++++++++++++-
.../src/main/resources/config/application.yml | 6 +++---
PlayWallPlugins/PlayWallPluginAwake/pom.xml | 2 +-
PlayWallPlugins/PlayWallPluginEqualizer/pom.xml | 2 +-
PlayWallPlugins/PlayWallPluginLaunchpad/pom.xml | 2 +-
PlayWallPlugins/PlayWallPluginMedia/pom.xml | 2 +-
.../PlayWallPluginNativeAudio/pom.xml | 2 +-
.../PlayWallPluginPlayoutLog/pom.xml | 2 +-
PlayWallPlugins/PlayWallPluginWebAPI/pom.xml | 2 +-
pom.xml | 13 +++++++++++++
10 files changed, 39 insertions(+), 11 deletions(-)
diff --git a/PlayWall/pom.xml b/PlayWall/pom.xml
index 24cc1a15..128b269d 100644
--- a/PlayWall/pom.xml
+++ b/PlayWall/pom.xml
@@ -73,11 +73,26 @@
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>false</filtering>
+ <excludes>
+ <exclude>config/</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>src/main/resources/config</directory>
+ <filtering>true</filtering>
+ <targetPath>${project.build.outputDirectory}/config</targetPath>
+ </resource>
+ </resources>
+
<plugins>
<plugin>
<groupId>de.thecodelabs</groupId>
<artifactId>versionizer-maven-plugin</artifactId>
- <version>1.0.1</version>
+ <version>${versionizer-maven-plugin.version}</version>
<configuration>
<resourceFile>build-app.json</resourceFile>
</configuration>
diff --git a/PlayWall/src/main/resources/config/application.yml b/PlayWall/src/main/resources/config/application.yml
index 9155ec9b..aec14131 100644
--- a/PlayWall/src/main/resources/config/application.yml
+++ b/PlayWall/src/main/resources/config/application.yml
@@ -1,8 +1,8 @@
name: "PlayWall"
-version: "7.0.0"
-build: 40
+version: "${project.version}"
+build: ${project.build.code}
identifier: "de.tobias.playpad.v7"
-date: "2019-02-04"
+date: "${project.versionDate}"
main: "de.tobias.playpad.PlayPadMain"
author: "Tobias Ullerich"
diff --git a/PlayWallPlugins/PlayWallPluginAwake/pom.xml b/PlayWallPlugins/PlayWallPluginAwake/pom.xml
index cb3dbbeb..5877decd 100644
--- a/PlayWallPlugins/PlayWallPluginAwake/pom.xml
+++ b/PlayWallPlugins/PlayWallPluginAwake/pom.xml
@@ -31,7 +31,7 @@
<plugin>
<groupId>de.thecodelabs</groupId>
<artifactId>versionizer-maven-plugin</artifactId>
- <version>1.0.1</version>
+ <version>${versionizer-maven-plugin.version}</version>
<configuration>
<resourceFile>plugin.yml</resourceFile>
</configuration>
diff --git a/PlayWallPlugins/PlayWallPluginEqualizer/pom.xml b/PlayWallPlugins/PlayWallPluginEqualizer/pom.xml
index cebe9054..4f67fc18 100644
--- a/PlayWallPlugins/PlayWallPluginEqualizer/pom.xml
+++ b/PlayWallPlugins/PlayWallPluginEqualizer/pom.xml
@@ -31,7 +31,7 @@
<plugin>
<groupId>de.thecodelabs</groupId>
<artifactId>versionizer-maven-plugin</artifactId>
- <version>1.0.1</version>
+ <version>${versionizer-maven-plugin.version}</version>
<configuration>
<resourceFile>plugin.yml</resourceFile>
</configuration>
diff --git a/PlayWallPlugins/PlayWallPluginLaunchpad/pom.xml b/PlayWallPlugins/PlayWallPluginLaunchpad/pom.xml
index 462ebbb0..e8d24dc2 100644
--- a/PlayWallPlugins/PlayWallPluginLaunchpad/pom.xml
+++ b/PlayWallPlugins/PlayWallPluginLaunchpad/pom.xml
@@ -31,7 +31,7 @@
<plugin>
<groupId>de.thecodelabs</groupId>
<artifactId>versionizer-maven-plugin</artifactId>
- <version>1.0.1</version>
+ <version>${versionizer-maven-plugin.version}</version>
<configuration>
<resourceFile>plugin.yml</resourceFile>
</configuration>
diff --git a/PlayWallPlugins/PlayWallPluginMedia/pom.xml b/PlayWallPlugins/PlayWallPluginMedia/pom.xml
index 1f075729..5db71d01 100644
--- a/PlayWallPlugins/PlayWallPluginMedia/pom.xml
+++ b/PlayWallPlugins/PlayWallPluginMedia/pom.xml
@@ -31,7 +31,7 @@
<plugin>
<groupId>de.thecodelabs</groupId>
<artifactId>versionizer-maven-plugin</artifactId>
- <version>1.0.1</version>
+ <version>${versionizer-maven-plugin.version}</version>
<configuration>
<resourceFile>plugin.yml</resourceFile>
</configuration>
diff --git a/PlayWallPlugins/PlayWallPluginNativeAudio/pom.xml b/PlayWallPlugins/PlayWallPluginNativeAudio/pom.xml
index e9317158..78d54cac 100644
--- a/PlayWallPlugins/PlayWallPluginNativeAudio/pom.xml
+++ b/PlayWallPlugins/PlayWallPluginNativeAudio/pom.xml
@@ -46,7 +46,7 @@
<plugin>
<groupId>de.thecodelabs</groupId>
<artifactId>versionizer-maven-plugin</artifactId>
- <version>1.0.1</version>
+ <version>${versionizer-maven-plugin.version}</version>
<configuration>
<resourceFile>plugin.yml</resourceFile>
</configuration>
diff --git a/PlayWallPlugins/PlayWallPluginPlayoutLog/pom.xml b/PlayWallPlugins/PlayWallPluginPlayoutLog/pom.xml
index 2c8220a8..ae398bce 100644
--- a/PlayWallPlugins/PlayWallPluginPlayoutLog/pom.xml
+++ b/PlayWallPlugins/PlayWallPluginPlayoutLog/pom.xml
@@ -48,7 +48,7 @@
<plugin>
<groupId>de.thecodelabs</groupId>
<artifactId>versionizer-maven-plugin</artifactId>
- <version>1.0.1</version>
+ <version>${versionizer-maven-plugin.version}</version>
<configuration>
<resourceFile>plugin.yml</resourceFile>
</configuration>
diff --git a/PlayWallPlugins/PlayWallPluginWebAPI/pom.xml b/PlayWallPlugins/PlayWallPluginWebAPI/pom.xml
index 954d89a3..ace41d61 100644
--- a/PlayWallPlugins/PlayWallPluginWebAPI/pom.xml
+++ b/PlayWallPlugins/PlayWallPluginWebAPI/pom.xml
@@ -36,7 +36,7 @@
<plugin>
<groupId>de.thecodelabs</groupId>
<artifactId>versionizer-maven-plugin</artifactId>
- <version>1.0.1</version>
+ <version>${versionizer-maven-plugin.version}</version>
<configuration>
<resourceFile>plugin.yml</resourceFile>
</configuration>
diff --git a/pom.xml b/pom.xml
index 9305af30..843306ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,6 +10,10 @@
<packaging>pom</packaging>
<properties>
+ <project.build.code>41</project.build.code>
+ <project.versionDate>${maven.build.timestamp}</project.versionDate>
+ <maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
@@ -43,6 +47,7 @@
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
<scala-maven-plugin.version>3.4.4</scala-maven-plugin.version>
<maven-jar-plugin.version>2.3.1</maven-jar-plugin.version>
+ <versionizer-maven-plugin.version>1.0.3</versionizer-maven-plugin.version>
</properties>
<modules>
@@ -82,6 +87,14 @@
<target>${java.version}</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.1.0</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
<plugin>
<groupId>net.alchim31.maven</groupId>
--
GitLab