Support modern java version & bukkit 1.19+

NivixX · NivixX · commit 0b88bba9a4f1 · 2023-02-06T19:42:57.000+09:00
diff --git a/ndatabase-api/pom.xml b/ndatabase-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ndatabase</artifactId>
         <groupId>com.nivixx</groupId>
-        <version>0.1.4-SNAPSHOT</version>
+        <version>0.1.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ndatabase-core/pom.xml b/ndatabase-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ndatabase</artifactId>
         <groupId>com.nivixx</groupId>
-        <version>0.1.4-SNAPSHOT</version>
+        <version>0.1.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -20,12 +20,12 @@
         <dependency>
             <groupId>com.nivixx</groupId>
             <artifactId>ndatabase-api</artifactId>
-            <version>0.1.4-SNAPSHOT</version>
+            <version>0.1.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.nivixx</groupId>
             <artifactId>core-platform</artifactId>
-            <version>0.1.4-SNAPSHOT</version>
+            <version>0.1.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/ndatabase-packaging-jar/pom.xml b/ndatabase-packaging-jar/pom.xml
@@ -7,52 +7,61 @@
     <parent>
         <groupId>com.nivixx</groupId>
         <artifactId>ndatabase</artifactId>
-        <version>0.1.4-SNAPSHOT</version>
+        <version>0.1.5-SNAPSHOT</version>
     </parent>
     <packaging>jar</packaging>
     <artifactId>ndatabase-packaging-jar</artifactId>
-    <version>0.1.4-SNAPSHOT</version>
+    <version>0.1.5-SNAPSHOT</version>
 
 
     <build>
         <finalName>NDatabase</finalName>
         <plugins>
+
             <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.3.0</version>
-                <configuration>
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                    <appendAssemblyId>false</appendAssemblyId>
-                </configuration>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.4</version>
                 <executions>
                     <execution>
-                        <id>make-assembly</id>
                         <phase>package</phase>
                         <goals>
-                            <goal>single</goal>
+                            <goal>shade</goal>
                         </goals>
                     </execution>
                 </executions>
+                <configuration>
+                    <finalName>NDatabase</finalName>
+                    <relocations>
+                        <relocation>
+                            <pattern>com.google</pattern>
+                            <shadedPattern>com.nivixx.ndatabase.shaded.com.google</shadedPattern>
+                        </relocation>
+                    </relocations>
+                    <filters>
+                        <filter>
+                            <artifact>*:*</artifact>
+                        </filter>
+                    </filters>
+                </configuration>
             </plugin>
         </plugins>
     </build>
     <dependencies>
         <dependency>
             <groupId>com.nivixx</groupId>
             <artifactId>ndatabase-core</artifactId>
-            <version>0.1.4-SNAPSHOT</version>
+            <version>0.1.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.nivixx</groupId>
             <artifactId>app-platform</artifactId>
-            <version>0.1.4-SNAPSHOT</version>
+            <version>0.1.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.nivixx</groupId>
             <artifactId>bukkit-platform</artifactId>
-            <version>0.1.4-SNAPSHOT</version>
+            <version>0.1.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/ndatabase-packaging-jar/src/main/resources/plugin.yml b/ndatabase-packaging-jar/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: NDatabase
 main: com.nivixx.ndatabase.platforms.bukkitplatform.NDatabasePlugin
-version: 0.1.2
+version: 0.1.5
 description: A lightweight centralised Key-value style database
 api-version: 1.13
 authors: [NivixX]
diff --git a/ndatabase-platforms/app-platform/pom.xml b/ndatabase-platforms/app-platform/pom.xml
@@ -7,35 +7,24 @@
     <parent>
         <groupId>com.nivixx</groupId>
         <artifactId>ndatabase-platforms</artifactId>
-        <version>0.1.4-SNAPSHOT</version>
+        <version>0.1.5-SNAPSHOT</version>
     </parent>
 
     <groupId>com.nivixx</groupId>
     <artifactId>app-platform</artifactId>
-    <version>0.1.4-SNAPSHOT</version>
+    <version>0.1.5-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
             <groupId>com.nivixx</groupId>
             <artifactId>ndatabase-core</artifactId>
-            <version>0.1.4-SNAPSHOT</version>
+            <version>0.1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>com.nivixx</groupId>
             <artifactId>ndatabase-core</artifactId>
-            <version>0.1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
-            <version>2.13.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-            <version>2.13.0</version>
+            <version>0.1.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
diff --git a/ndatabase-platforms/app-platform/src/main/java/com/nivixx/ndatabase/platforms/appplatform/AppDBLogger.java b/ndatabase-platforms/app-platform/src/main/java/com/nivixx/ndatabase/platforms/appplatform/AppDBLogger.java
@@ -1,8 +1,6 @@
 package com.nivixx.ndatabase.platforms.appplatform;
 
 import com.nivixx.ndatabase.platforms.coreplatform.logging.DBLogger;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
@@ -14,25 +12,27 @@ public AppDBLogger(boolean isDebugMode) {
         super(isDebugMode);
     }
 
-    private static final Logger LOGGER = LogManager.getLogger(AppDBLogger.class);
 
     @Override
     public Consumer<Supplier<String>> consumeDebugMessage() {
-        return (msg) -> LOGGER.debug(msg.get());
+        return (msg) -> System.out.println(msg.get());
     }
 
     @Override
     public Consumer<Supplier<String>> consumeInfoMessage() {
-        return (msg) -> LOGGER.info(msg.get());
+        return (msg) -> System.out.println(msg.get());
     }
 
     @Override
     public BiConsumer<Throwable, String> consumeErrorMessage() {
-        return (throwable, msg) -> LOGGER.error(msg, throwable);
+        return (throwable, msg) -> {
+            System.out.println(msg);
+            throwable.printStackTrace();
+        };
     }
 
     @Override
     public Consumer<Supplier<String>> consumeWarnMessage() {
-        return (msg) -> LOGGER.warn(msg.get());
+        return (msg) -> System.out.println(msg.get());
     }
 }
diff --git a/ndatabase-platforms/bukkit-platform/pom.xml b/ndatabase-platforms/bukkit-platform/pom.xml
@@ -7,23 +7,23 @@
     <parent>
         <groupId>com.nivixx</groupId>
         <artifactId>ndatabase-platforms</artifactId>
-        <version>0.1.4-SNAPSHOT</version>
+        <version>0.1.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>bukkit-platform</artifactId>
-    <version>0.1.4-SNAPSHOT</version>
+    <version>0.1.5-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.19.2-R0.1-SNAPSHOT</version>
+            <version>1.13-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.nivixx</groupId>
             <artifactId>ndatabase-core</artifactId>
-            <version>0.1.4-SNAPSHOT</version>
+            <version>0.1.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
diff --git a/ndatabase-platforms/core-platform/pom.xml b/ndatabase-platforms/core-platform/pom.xml
@@ -7,17 +7,17 @@
     <parent>
         <groupId>com.nivixx</groupId>
         <artifactId>ndatabase-platforms</artifactId>
-        <version>0.1.4-SNAPSHOT</version>
+        <version>0.1.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>core-platform</artifactId>
-    <version>0.1.4-SNAPSHOT</version>
+    <version>0.1.5-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
             <groupId>com.nivixx</groupId>
             <artifactId>ndatabase-api</artifactId>
-            <version>0.1.4-SNAPSHOT</version>
+            <version>0.1.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/ndatabase-platforms/pom.xml b/ndatabase-platforms/pom.xml
@@ -5,9 +5,9 @@
     <parent>
         <artifactId>ndatabase</artifactId>
         <groupId>com.nivixx</groupId>
-        <version>0.1.4-SNAPSHOT</version>
+        <version>0.1.5-SNAPSHOT</version>
     </parent>
-    <version>0.1.4-SNAPSHOT</version>
+    <version>0.1.5-SNAPSHOT</version>
     <packaging>pom</packaging>
     <modelVersion>4.0.0</modelVersion>
 
@@ -21,7 +21,6 @@
     <modules>
         <module>core-platform</module>
         <module>bukkit-platform</module>
-        <module>sponge-platform</module>
         <module>app-platform</module>
     </modules>
 
diff --git a/ndatabase-platforms/sponge-platform/pom.xml b/ndatabase-platforms/sponge-platform/pom.xml
@@ -7,11 +7,11 @@
     <parent>
         <groupId>com.nivixx</groupId>
         <artifactId>ndatabase-platforms</artifactId>
-        <version>0.1.4-SNAPSHOT</version>
+        <version>0.1.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>sponge-platform</artifactId>
-    <version>0.1.4-SNAPSHOT</version>
+    <version>0.1.5-SNAPSHOT</version>
 
 
     <dependencies>
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>com.nivixx</groupId>
             <artifactId>ndatabase-core</artifactId>
-            <version>0.1.4-SNAPSHOT</version>
+            <version>0.1.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/ndatabase-tests/pom.xml b/ndatabase-tests/pom.xml
@@ -7,17 +7,17 @@
     <parent>
         <groupId>com.nivixx</groupId>
         <artifactId>ndatabase</artifactId>
-        <version>0.1.4-SNAPSHOT</version>
+        <version>0.1.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>ndatabase-tests</artifactId>
-    <version>0.1.4-SNAPSHOT</version>
+    <version>0.1.5-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
             <groupId>com.nivixx</groupId>
             <artifactId>app-platform</artifactId>
-            <version>0.1.4-SNAPSHOT</version>
+            <version>0.1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/pom.xml b/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`package com.nivixx.ndatabase.platforms.appplatform;`
`2`	`2`
`3`	`3`	`import com.nivixx.ndatabase.platforms.coreplatform.logging.DBLogger;`
`4`		`-import org.apache.logging.log4j.LogManager;`
`5`		`-import org.apache.logging.log4j.Logger;`
`6`	`4`
`7`	`5`	`import java.util.function.BiConsumer;`
`8`	`6`	`import java.util.function.Consumer;`
`@@ -14,25 +12,27 @@ public AppDBLogger(boolean isDebugMode) {`
`14`	`12`	`super(isDebugMode);`
`15`	`13`	`}`
`16`	`14`
`17`		`- private static final Logger LOGGER = LogManager.getLogger(AppDBLogger.class);`
`18`	`15`
`19`	`16`	`@Override`
`20`	`17`	`public Consumer<Supplier<String>> consumeDebugMessage() {`
`21`		`- return (msg) -> LOGGER.debug(msg.get());`
	`18`	`+ return (msg) -> System.out.println(msg.get());`
`22`	`19`	`}`
`23`	`20`
`24`	`21`	`@Override`
`25`	`22`	`public Consumer<Supplier<String>> consumeInfoMessage() {`
`26`		`- return (msg) -> LOGGER.info(msg.get());`
	`23`	`+ return (msg) -> System.out.println(msg.get());`
`27`	`24`	`}`
`28`	`25`
`29`	`26`	`@Override`
`30`	`27`	`public BiConsumer<Throwable, String> consumeErrorMessage() {`
`31`		`- return (throwable, msg) -> LOGGER.error(msg, throwable);`
	`28`	`+ return (throwable, msg) -> {`
	`29`	`+ System.out.println(msg);`
	`30`	`+ throwable.printStackTrace();`
	`31`	`+ };`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`@Override`
`35`	`35`	`public Consumer<Supplier<String>> consumeWarnMessage() {`
`36`		`- return (msg) -> LOGGER.warn(msg.get());`
	`36`	`+ return (msg) -> System.out.println(msg.get());`
`37`	`37`	`}`
`38`	`38`	`}`