Release SNAPSHOT-151

* Switch to OpenJ9 for lower memory usage and faster startup time. * Updated Dorkbox SystemTray to latest. * Added splash screen.
bithatch · Apr 15, 2021 · a527b2b · a527b2b
1 parent 43fbd5e
commit a527b2b
Show file tree

Hide file tree

Showing 39 changed files with 246 additions and 110 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,10 @@
 # 1.0.0-SNAPSHOT-${buildNumber}
 
- * Under development ...
+ * Switch to OpenJ9 for lower memory usage and faster startup time. 
+
+ * Updated Dorkbox SystemTray to latest.
+
+ * Added splash screen.
 
 # 1.0.0-SNAPSHOT-148
 

diff --git a/buildNumber.properties b/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
-#Mon Feb 08 08:59:30 GMT 2021
-buildNumber=148
+#Thu Apr 15 18:29:54 BST 2021
+buildNumber=1
diff --git a/pom.xml b/pom.xml
@@ -74,34 +74,14 @@
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>buildnumber-maven-plugin</artifactId>
 					<version>1.4</version>
+					<configuration>
+					   <skip>true</skip>
+					</configuration>
 				</plugin>
 			</plugins>
 		</pluginManagement>
 
 		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>buildnumber-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>buildnumber</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>create</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<getRevisionOnlyOnce>true</getRevisionOnlyOnce>
-					<format>{0,number}</format>
-					<items>
-						<item>buildNumber</item>
-					</items>
-					<doCheck>false</doCheck>
-					<doUpdate>false</doUpdate>
-					<revisionOnScmFailure>unknownbuild</revisionOnScmFailure>
-				</configuration>
-			</plugin>
 			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
 				<version>3.2.0</version>

diff --git a/snake-app-linux/buildNumber.properties b/snake-app-linux/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
-#Mon Feb 08 08:59:36 GMT 2021
-buildNumber=134
+#Thu Apr 15 18:30:00 BST 2021
+buildNumber=1
diff --git a/snake-backend-openrazer/buildNumber.properties b/snake-backend-openrazer/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
-#Mon Feb 08 08:59:34 GMT 2021
-buildNumber=134
+#Thu Apr 15 18:29:58 BST 2021
+buildNumber=1
diff --git a/snake-backend-openrazer/pom.xml b/snake-backend-openrazer/pom.xml
@@ -12,7 +12,7 @@
 		<dependency>
 			<groupId>com.github.hypfvieh</groupId>
 			<artifactId>dbus-java</artifactId>
-			<version>3.3.0-SNAPSHOT</version>
+			<version>3.3.0</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>

diff --git a/snake-dist/buildNumber.properties b/snake-dist/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
-#Mon Feb 08 08:59:38 GMT 2021
-buildNumber=133
+#Thu Apr 15 18:45:04 BST 2021
+buildNumber=151
diff --git a/snake-dist/pom.xml b/snake-dist/pom.xml
@@ -71,6 +71,7 @@
 									<remoteBase>${snakeRemote}</remoteBase>
 									<mainClass>uk.co.bithatch.snake.app.linux/uk.co.bithatch.snake.app.linux.App</mainClass>
 									<remotesFromOriginalSource>false</remotesFromOriginalSource>
+                                    <splash>${basedir}/src/main/images/splash.png</splash>
 									<image>true</image>
 									<vmArgs>
 										<vmArg>-Xmx64m</vmArg>
@@ -82,6 +83,7 @@
 										<forkerArg>jvmarg -Djava.system.class.loader=uk.co.bithatch.snake.ui.DynamicClassLoader</forkerArg>
 										<forkerArg>restart-on 90</forkerArg>
 										<forkerArg>single-instance-per-user</forkerArg>
+                                        <forkerArg>run-on-install</forkerArg>
 										<forkerArg>install-location ${installer.home}/snake-razer</forkerArg>
 										<forkerArg>jvmarg --add-modules</forkerArg>
 										<forkerArg>jvmarg themes.awhitelight,themes.agreenfuture,themes.aredsky,themes.abluelife,themes.ayellowdwarf,themes.anorangetwist,themes.apinkburst,themes.apurplehaze</forkerArg>
@@ -114,12 +116,19 @@
 									<bootstrapArtifacts>
 										<bootstrapArtifact>snake-updater</bootstrapArtifact>
 									</bootstrapArtifacts>
-                                    <classpathArtifacts>
-                                        <classpathArtifact>asm</classpathArtifact>
-                                    </classpathArtifacts>
                                     <automaticArtifacts>
+                                        <automaticArtifact>asm</automaticArtifact>
                                         <automaticArtifact>java-utils</automaticArtifact>
                                         <automaticArtifact>svgSalamander</automaticArtifact>
+                                        <automaticArtifact>kotlin-stdlib</automaticArtifact>
+                                        <automaticArtifact>kotlin-stdlib-common</automaticArtifact>
+                                        <automaticArtifact>jffi</automaticArtifact>
+                                        <automaticArtifact>jnr-a64asm</automaticArtifact>
+                                        <automaticArtifact>jnr-x86asm</automaticArtifact>
+                                        <automaticArtifact>annotations</automaticArtifact>
+                                        <automaticArtifact>kotlinx-coroutines-core-jvm</automaticArtifact>
+                                        <automaticArtifact>kotlin-logging-jvm</automaticArtifact>
+                                        <automaticArtifact>javassist</automaticArtifact>
                                     </automaticArtifacts>
 									<systemModules>
 										<systemModule>java.prefs</systemModule>
@@ -129,20 +138,16 @@
 										<systemModule>jdk.zipfs</systemModule>
 
 										<systemModule>java.instrument</systemModule>
-										<systemModule>java.management</systemModule>
-										<systemModule>jdk.attach</systemModule>
-										<systemModule>jdk.management.agent</systemModule>
 										<systemModule>jdk.xml.dom</systemModule>
 										<systemModule>jdk.jsobject</systemModule>
 										<systemModule>java.net.http</systemModule>
                                         <systemModule>java.scripting</systemModule>
+                                        <systemModule>jdk.management.agent</systemModule>
+                                        <systemModule>java.management</systemModule>
 
 										<!-- TODO separate this in forker? -->
 										<systemModule>java.desktop</systemModule>
 
-										<!-- TODO separate this in forker? -->
-										<systemModule>java.management</systemModule>
-
 										<!-- TODO Because of Gson, consider finding a library that doesnt 
 											link to SQL -->
 										<systemModule>java.sql</systemModule>
@@ -164,6 +169,7 @@
 									<mainClass>uk.co.bithatch.snake.app.linux/uk.co.bithatch.snake.app.linux.App</mainClass>
 									<remotesFromOriginalSource>false</remotesFromOriginalSource>
 									<imageDirectory>${project.build.directory}/image-noruntime</imageDirectory>
+                                    <splash>${basedir}/src/main/images/splash.png</splash>
 									<image>true</image>
 									<link>false</link>
 									<vmArgs>
@@ -175,6 +181,7 @@
 										<forkerArg>jvmarg -Dforker.betaChannel=${snakeRemoteNoRuntimeSnapshot}</forkerArg>
 										<forkerArg>jvmarg -Djava.system.class.loader=uk.co.bithatch.snake.ui.DynamicClassLoader</forkerArg>
 										<forkerArg>restart-on 90</forkerArg>
+                                        <forkerArg>run-on-install</forkerArg>
 										<forkerArg>single-instance-per-user</forkerArg>
 										<forkerArg>install-location ${installer.home}/snake-razer</forkerArg>
 										<forkerArg>jvmarg --add-modules</forkerArg>
@@ -208,12 +215,19 @@
 									<bootstrapArtifacts>
 										<bootstrapArtifact>snake-updater</bootstrapArtifact>
 									</bootstrapArtifacts>
-                                    <classpathArtifacts>
-                                        <classpathArtifact>asm</classpathArtifact>
-                                    </classpathArtifacts>
                                     <automaticArtifacts>
+                                        <automaticArtifact>asm</automaticArtifact>
                                         <automaticArtifact>java-utils</automaticArtifact>
                                         <automaticArtifact>svgSalamander</automaticArtifact>
+                                        <automaticArtifact>kotlin-stdlib</automaticArtifact>
+                                        <automaticArtifact>kotlin-stdlib-common</automaticArtifact>
+                                        <automaticArtifact>jffi</automaticArtifact>
+                                        <automaticArtifact>jnr-a64asm</automaticArtifact>
+                                        <automaticArtifact>jnr-x86asm</automaticArtifact>
+                                        <automaticArtifact>annotations</automaticArtifact>
+                                        <automaticArtifact>kotlinx-coroutines-core-jvm</automaticArtifact>
+                                        <automaticArtifact>kotlin-logging-jvm</automaticArtifact>
+                                        <automaticArtifact>javassist</automaticArtifact>
                                     </automaticArtifacts>
 									<systemModules>
 										<systemModule>java.prefs</systemModule>
@@ -223,19 +237,15 @@
 
 										<systemModule>java.instrument</systemModule>
 										<systemModule>java.management</systemModule>
-										<systemModule>jdk.attach</systemModule>
-										<systemModule>jdk.management.agent</systemModule>
 										<systemModule>jdk.xml.dom</systemModule>
 										<systemModule>jdk.jsobject</systemModule>
 										<systemModule>java.net.http</systemModule>
                                         <systemModule>java.scripting</systemModule>
+                                        <systemModule>jdk.management.agent</systemModule>
 
 										<!-- TODO separate this in forker? -->
 										<systemModule>java.desktop</systemModule>
 
-										<!-- TODO separate this in forker? -->
-										<systemModule>java.management</systemModule>
-
 										<!-- TODO Because of Gson, consider finding a library that doesnt 
 											link to SQL -->
 										<systemModule>java.sql</systemModule>
@@ -787,6 +797,30 @@
 	<build>
 		<finalName>snake</finalName>
 		<plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>buildnumber-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>buildnumber</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>create</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <skip>false</skip>
+                    <getRevisionOnlyOnce>true</getRevisionOnlyOnce>
+                    <format>{0,number}</format>
+                    <items>
+                        <item>buildNumber</item>
+                    </items>
+                    <doCheck>false</doCheck>
+                    <doUpdate>false</doUpdate>
+                    <revisionOnScmFailure>unknownbuild</revisionOnScmFailure>
+                </configuration>
+            </plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-deploy-plugin</artifactId>

diff --git a/snake-dist/src/main/images/splash.png b/snake-dist/src/main/images/splash.png
diff --git a/snake-lib/buildNumber.properties b/snake-lib/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
-#Mon Feb 08 08:59:32 GMT 2021
-buildNumber=147
+#Thu Apr 15 18:29:56 BST 2021
+buildNumber=1
diff --git a/snake-themes/buildNumber.properties b/snake-themes/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
-#Mon Feb 08 08:59:35 GMT 2021
-buildNumber=134
+#Thu Apr 15 18:29:58 BST 2021
+buildNumber=1
diff --git a/snake-themes/snake-theme-abluelife/buildNumber.properties b/snake-themes/snake-theme-abluelife/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
-#Mon Feb 08 08:59:35 GMT 2021
-buildNumber=134
+#Thu Apr 15 18:29:59 BST 2021
+buildNumber=1
diff --git a/snake-themes/snake-theme-agreenfuture/buildNumber.properties b/snake-themes/snake-theme-agreenfuture/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
-#Mon Feb 08 08:59:35 GMT 2021
-buildNumber=134
+#Thu Apr 15 18:29:58 BST 2021
+buildNumber=1
diff --git a/snake-themes/snake-theme-anorangetwist/buildNumber.properties b/snake-themes/snake-theme-anorangetwist/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
-#Mon Feb 08 08:59:35 GMT 2021
-buildNumber=134
+#Thu Apr 15 18:29:59 BST 2021
+buildNumber=1
diff --git a/snake-themes/snake-theme-apinkburst/buildNumber.properties b/snake-themes/snake-theme-apinkburst/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
-#Mon Feb 08 08:59:36 GMT 2021
-buildNumber=134
+#Thu Apr 15 18:29:59 BST 2021
+buildNumber=1
diff --git a/snake-themes/snake-theme-apurplehaze/buildNumber.properties b/snake-themes/snake-theme-apurplehaze/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
-#Mon Feb 08 08:59:36 GMT 2021
-buildNumber=134
+#Thu Apr 15 18:29:59 BST 2021
+buildNumber=1
diff --git a/snake-themes/snake-theme-aredsky/buildNumber.properties b/snake-themes/snake-theme-aredsky/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
-#Mon Feb 08 08:59:35 GMT 2021
-buildNumber=134
+#Thu Apr 15 18:29:59 BST 2021
+buildNumber=1
diff --git a/snake-themes/snake-theme-awhitelight/buildNumber.properties b/snake-themes/snake-theme-awhitelight/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
-#Mon Feb 08 08:59:35 GMT 2021
-buildNumber=134
+#Thu Apr 15 18:29:58 BST 2021
+buildNumber=1
diff --git a/snake-themes/snake-theme-ayellowdwarf/buildNumber.properties b/snake-themes/snake-theme-ayellowdwarf/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
-#Mon Feb 08 08:59:36 GMT 2021
-buildNumber=134
+#Thu Apr 15 18:29:59 BST 2021
+buildNumber=1
diff --git a/snake-ui-linux/buildNumber.properties b/snake-ui-linux/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
-#Mon Feb 08 08:59:35 GMT 2021
-buildNumber=134
+#Thu Apr 15 18:29:58 BST 2021
+buildNumber=1
diff --git a/snake-ui/buildNumber.properties b/snake-ui/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
-#Mon Feb 08 08:59:34 GMT 2021
-buildNumber=135
+#Thu Apr 15 18:29:58 BST 2021
+buildNumber=1