Merge branch 'release/7.0.0' into 'master'

Release/7.0.0 See merge request PlayWall/PlayWallDesktop!4
Tobisaninfo · Sep 26, 2019 · 75799d1 · 75799d1
2 parents d8f5749 + e673bfc
commit 75799d1
Show file tree

Hide file tree

Showing 485 changed files with 8,276 additions and 7,738 deletions.
diff --git a/.idea/ant.xml b/.idea/ant.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml
diff --git a/PlayWall/pom.xml b/PlayWall/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>de.tobias.playpad</groupId>
         <artifactId>PlayWallDesktop</artifactId>
-        <version>6.2.0-SNAPSHOT</version>
+        <version>7.0.0</version>
     </parent>
 
     <artifactId>PlayWall</artifactId>
@@ -16,8 +16,6 @@
         <project.main>de.tobias.playpad.PlayPadMain</project.main>
         <project.iconBase>src/main/resources/icon</project.iconBase>
 
-        <itextpdf.version>5.5.13</itextpdf.version>
-
         <launch4j-maven-plugin.version>1.7.25</launch4j-maven-plugin.version>
         <appbundle-maven-plugin.version>1.2.0</appbundle-maven-plugin.version>
 
@@ -40,13 +38,6 @@
             <version>${components.version}</version>
         </dependency>
 
-        <!-- PDF-->
-        <dependency>
-            <groupId>com.itextpdf</groupId>
-            <artifactId>itextpdf</artifactId>
-            <version>${itextpdf.version}</version>
-        </dependency>
-
         <!--Template parsing-->
         <dependency>
             <groupId>org.springframework</groupId>
@@ -101,6 +92,24 @@
                 </executions>
             </plugin>
 
+            <plugin>
+                <groupId>nl.geodienstencentrum.maven</groupId>
+                <artifactId>sass-maven-plugin</artifactId>
+                <version>3.7.2</version>
+                <executions>
+                    <execution>
+                        <id>translate-css</id>
+                        <goals>
+                            <goal>update-stylesheets</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <destination>target/classes/style</destination>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
             <!--Fat Jar-->
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
@@ -249,19 +258,19 @@
         <repository>
             <id>release</id>
             <name>TheCodeLabs-releases</name>
-            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-release</url>
+            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-release</url>
         </repository>
         <snapshotRepository>
             <id>snapshots</id>
             <name>TheCodeLabs-snapshots</name>
-            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-snapshots</url>
+            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-snapshots</url>
         </snapshotRepository>
     </distributionManagement>
 
     <repositories>
         <repository>
             <id>release</id>
-            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-release</url>
+            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-release</url>
             <releases>
                 <enabled>true</enabled>
             </releases>
@@ -271,7 +280,7 @@
         </repository>
         <repository>
             <id>snapshots</id>
-            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-snapshots</url>
+            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-snapshots</url>
             <releases>
                 <enabled>false</enabled>
             </releases>

diff --git a/PlayWall/src/main/java/de/tobias/playpad/AppUserInfoStrings.java b/PlayWall/src/main/java/de/tobias/playpad/AppUserInfoStrings.java
@@ -1,16 +1,16 @@
 package de.tobias.playpad;
 
-public class AppUserInfoStrings {
+import de.thecodelabs.utils.application.ApplicationInfo;
 
-	public static final String WEBSITE = "Website";
-	public static final String REPOSITORY = "Repository";
+public interface AppUserInfoStrings extends ApplicationInfo.CustomUserInfo {
 
-	public static final String PLUGINS_URL_STABLE = "PluginsURL.Stable";
-	public static final String PLUGINS_URL_BETA = "PluginsURL.Beta";
+	String website();
 
-	public static final String CHANGELOG_URL = "ChangelogURL";
-	public static final String UPDATER_PROGRAM = "UpdaterProgram";
+	String repository();
 
-	public static final String SERVER = "Server";
-	public static final String ACCOUNT_REGISTER = "AccountRegister";
+	String changelogURL();
+
+	String server();
+
+	String accountRegister();
 }