diff --git a/PlayWall/pom.xml b/PlayWall/pom.xml index 24cc1a15f8759ec2b78741d0c2732800b0dce091..128b269d4f0733b14704cd956f10572c1a3c1e80 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 9155ec9b59b29fb84a5d0a114fe5bee2775b64b3..aec1413106035b4c01e639a05b268434d95573d0 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 cb3dbbeb28f61c8ac707469d868668a619cacac8..5877decd3dc885cfc77e87be3ad9ae596ce63eb7 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 cebe9054491c6ba5099becc2fe22746b20c9cf10..4f67fc182ae2893f979afffcc19296166283c121 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 462ebbb0940db9795b7b37df8fa82ef406deefa6..e8d24dc204fab80c17cde8df8f82ae22b2080036 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 1f07572948fe8bb067aa93d88652775b5e6fa5a8..5db71d0179fb6d433f7bb42627bef71a365a7391 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 e93171580e491aa2caf95879ca88ae83a957c363..78d54caccfbcec2d00e6bc409090b65fa972e0b5 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 2c8220a869b9f36c7bf3a01d99bcdbb8e25e16d8..ae398bce873e6a7a6837c752a9cd698c24b6a061 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 954d89a3daf11281c1d875cf92e7ee4d3fe99ef8..ace41d618cabf45acf968da60772917c9da58002 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 9305af30f032cd380407e7b938e0a1e867b34539..843306aedff8ce1b6b3845b4a5ca5f51e3d7e1b1 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>