Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #50 from P0nk/java-16-fixes

Browse Source 
Java 16 and Actions fixes
This commit is contained in:
Ponk
2021-09-06 22:15:34 +02:00
committed by GitHub
parent 18dda5aa06 82f2c84034
commit abb0a55ac9
4 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/pr-pipeline.yml vendored
View File

@@ -14,10 +14,10 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Set up JDK 8 - name: Set up JDK 16
uses: actions/setup-java@v2 uses: actions/setup-java@v2
with: with:
java-version: '8' java-version: '16'
distribution: 'adopt' distribution: 'temurin'
- name: Build with Maven (compile -> test -> package) - name: Build with Maven (compile -> test -> package)
run: mvn -B package --file pom.xml run: mvn -B package --file pom.xml

2
README.md
View File

@@ -189,7 +189,7 @@ To launch the server, you may either:
* If you already have Maven installed, simply run the command "mvn clean install" to create the jar file. * If you already have Maven installed, simply run the command "mvn clean install" to create the jar file.
* IntelliJ also comes with built-in Maven support. Open a new terminal window inside IntelliJ, type "mvn clean install" (your command should now be marked green), then Ctrl+Enter to build the jar file. * IntelliJ also comes with built-in Maven support. Open a new terminal window inside IntelliJ, type "mvn clean install" (your command should now be marked green), then Ctrl+Enter to build the jar file.
2. Launch the jar file 2. Launch the jar file
* Double click on "launch.bat" * Double click on "launch.bat" (need to have Java 16 installed)
#### Launch with Docker #### Launch with Docker
1. Start Docker 1. Start Docker

3
launch.bat
View File

@@ -1,5 +1,4 @@
@echo off @echo off
@title Cosmic @title Cosmic
set PATH="C:\Program Files\Java\jdk1.8.0_241\bin";%PATH% java -Xmx2048m -jar target\Cosmic.jar
java -Xmx2048m -Dwzpath=wz\ -jar target\Cosmic.jar
pause pause

17
pom.xml
View File

@@ -19,7 +19,7 @@
<log4j.version>2.14.1</log4j.version> <log4j.version>2.14.1</log4j.version>
<graalvm.version>21.1.0</graalvm.version> <graalvm.version>21.1.0</graalvm.version>
<netty.version>4.1.65.Final</netty.version> <netty.version>4.1.67.Final</netty.version>
<junit.version>5.7.2</junit.version> <junit.version>5.7.2</junit.version>
</properties> </properties>
@@ -37,19 +37,19 @@
<dependency> <!-- only used for some tools --> <dependency> <!-- only used for some tools -->
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<version>2.10.0</version> <version>2.11.0</version>
</dependency> </dependency>
<!-- Database --> <!-- Database -->
<dependency> <dependency>
<groupId>com.zaxxer</groupId> <groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId> <artifactId>HikariCP</artifactId>
<version>4.0.3</version> <version>5.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>8.0.23</version> <version>8.0.26</version>
</dependency> </dependency>
<!-- Networking --> <!-- Networking -->
@@ -78,7 +78,7 @@
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<version>1.7.30</version> <version>1.7.32</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
@@ -129,7 +129,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>2.4</version> <version>3.2.0</version>
<executions> <executions>
<execution> <execution>
<id>default-jar</id> <id>default-jar</id>
@@ -138,6 +138,11 @@
</executions> </executions>
</plugin> </plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
</plugin>
<!-- Enable assembling jar that includes all dependencies --> <!-- Enable assembling jar that includes all dependencies -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>