Merge pull request #50 from P0nk/java-16-fixes
Java 16 and Actions fixes
This commit is contained in:
6
.github/workflows/pr-pipeline.yml
vendored
6
.github/workflows/pr-pipeline.yml
vendored
@@ -14,10 +14,10 @@ jobs:
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Set up JDK 8
|
||||
- name: Set up JDK 16
|
||||
uses: actions/setup-java@v2
|
||||
with:
|
||||
java-version: '8'
|
||||
distribution: 'adopt'
|
||||
java-version: '16'
|
||||
distribution: 'temurin'
|
||||
- name: Build with Maven (compile -> test -> package)
|
||||
run: mvn -B package --file pom.xml
|
||||
|
||||
@@ -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.
|
||||
* 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
|
||||
* Double click on "launch.bat"
|
||||
* Double click on "launch.bat" (need to have Java 16 installed)
|
||||
|
||||
#### Launch with Docker
|
||||
1. Start Docker
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
@echo off
|
||||
@title Cosmic
|
||||
set PATH="C:\Program Files\Java\jdk1.8.0_241\bin";%PATH%
|
||||
java -Xmx2048m -Dwzpath=wz\ -jar target\Cosmic.jar
|
||||
java -Xmx2048m -jar target\Cosmic.jar
|
||||
pause
|
||||
17
pom.xml
17
pom.xml
@@ -19,7 +19,7 @@
|
||||
|
||||
<log4j.version>2.14.1</log4j.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>
|
||||
</properties>
|
||||
|
||||
@@ -37,19 +37,19 @@
|
||||
<dependency> <!-- only used for some tools -->
|
||||
<groupId>commons-io</groupId>
|
||||
<artifactId>commons-io</artifactId>
|
||||
<version>2.10.0</version>
|
||||
<version>2.11.0</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Database -->
|
||||
<dependency>
|
||||
<groupId>com.zaxxer</groupId>
|
||||
<artifactId>HikariCP</artifactId>
|
||||
<version>4.0.3</version>
|
||||
<version>5.0.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>mysql</groupId>
|
||||
<artifactId>mysql-connector-java</artifactId>
|
||||
<version>8.0.23</version>
|
||||
<version>8.0.26</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Networking -->
|
||||
@@ -78,7 +78,7 @@
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
<version>1.7.30</version>
|
||||
<version>1.7.32</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.logging.log4j</groupId>
|
||||
@@ -129,7 +129,7 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<version>2.4</version>
|
||||
<version>3.2.0</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>default-jar</id>
|
||||
@@ -138,6 +138,11 @@
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<version>3.0.0-M5</version>
|
||||
</plugin>
|
||||
|
||||
<!-- Enable assembling jar that includes all dependencies -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
|
||||
Reference in New Issue
Block a user