diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index f0fab25a1..cd21ad407 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -32,4 +32,4 @@ jobs: - name: Build with Maven env: FTP_URL: ${{ secrets.LIVE_SERVER_FTP_URL }} - run: mvn -B -Dmaven.source.skip=true -Dmaven.test.skip=${{ github.event.inputs.skip-tests }} -pl :commons,:${{ github.event.inputs.server }} package -Dftp.url=$FTP_URL \ No newline at end of file + run: mvn -B -Dmaven.source.skip=true -Dmaven.test.skip=${{ github.event.inputs.skip-tests }} -pl :${{ github.event.inputs.server }} -am package -Dftp.url=$FTP_URL diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 5674a6c1d..6fe5a3785 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -15,4 +15,4 @@ jobs: distribution: 'temurin' cache: maven - name: Build and test with Maven - run: mvn -B -T 4 -Dmaven.source.skip=true -Dmaven.test.skip=false test \ No newline at end of file + run: mvn -B -T 4 -Dmaven.source.skip=true -Dmaven.test.skip=false test diff --git a/chat-server/pom.xml b/chat-server/pom.xml index 51438ba35..1568f81db 100644 --- a/chat-server/pom.xml +++ b/chat-server/pom.xml @@ -2,34 +2,28 @@ 4.0.0 - com.aionemu + + + com.aionemu + aion-server + 4.8-SNAPSHOT + ../pom.xml + + chat-server - 4.8-SNAPSHOT Aion Chat Server jar + - UTF-8 - true + true + src org.apache.maven.plugins - maven-compiler-plugin - 3.13.0 - - 21 - - -Xlint:all,-preview,-this-escape - - true - true - - - maven-assembly-plugin - 3.7.1 assembly.xml @@ -46,58 +40,6 @@ - - io.github.git-commit-id - git-commit-id-maven-plugin - 8.0.2 - - - ^git.branch$ - ^git.commit.id.abbrev$ - ^git.dirty$ - - - - git.dirty - true - -DIRTY - - - git.dirty - false - - - - false - - - - initialize - - revision - - - - - - maven-jar-plugin - 3.4.1 - - - - ${project.version} - ${git.commit.id.abbrev}${git.dirty} - ${git.branch} - ${maven.build.timestamp} - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.2.5 - @@ -114,7 +56,6 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 package @@ -148,7 +89,6 @@ com.aionemu commons - 2.0-SNAPSHOT io.netty diff --git a/commons/pom.xml b/commons/pom.xml index d280b8032..aa1f1f9b3 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -2,32 +2,22 @@ 4.0.0 - com.aionemu + + + com.aionemu + aion-server + 4.8-SNAPSHOT + ../pom.xml + + commons - 2.0-SNAPSHOT Aion Commons jar - - UTF-8 - true - + src test - - org.apache.maven.plugins - maven-compiler-plugin - 3.13.0 - - 21 - - -Xlint:all,-preview,-this-escape - - true - true - - org.apache.maven.plugins maven-source-plugin @@ -43,105 +33,39 @@ - - io.github.git-commit-id - git-commit-id-maven-plugin - 8.0.2 - - - ^git.branch$ - ^git.commit.id.abbrev$ - ^git.dirty$ - - - - git.dirty - true - -DIRTY - - - git.dirty - false - - - - false - - - - initialize - - revision - - - - - - maven-jar-plugin - 3.4.1 - - - - ${project.version} - ${git.commit.id.abbrev}${git.dirty} - ${git.branch} - ${maven.build.timestamp} - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.2.5 - ch.qos.logback logback-classic - 1.5.6 + 1.5.16 com.alibaba.fastjson2 fastjson2 - 2.0.49 + 2.0.54 com.zaxxer HikariCP - 5.1.0 + 6.2.1 com.mysql mysql-connector-j - 8.3.0 + 9.2.0 org.quartz-scheduler quartz - 2.3.2 - - - com.mchange - c3p0 - - - com.mchange - mchange-commons-java - - - com.zaxxer - HikariCP-java7 - - + 2.5.0 org.junit.jupiter junit-jupiter-api - 5.10.2 + 5.11.4 test diff --git a/game-server/pom.xml b/game-server/pom.xml index ef37ce935..c78c44a40 100644 --- a/game-server/pom.xml +++ b/game-server/pom.xml @@ -2,35 +2,29 @@ 4.0.0 - com.aionemu + + + com.aionemu + aion-server + 4.8-SNAPSHOT + ../pom.xml + + game-server - 4.8-SNAPSHOT Aion Game Server jar + - UTF-8 - true + true + src test org.apache.maven.plugins - maven-compiler-plugin - 3.13.0 - - 21 - - -Xlint:all,-preview,-this-escape - - true - true - - - maven-assembly-plugin - 3.7.1 assembly.xml @@ -47,58 +41,6 @@ - - io.github.git-commit-id - git-commit-id-maven-plugin - 8.0.2 - - - ^git.branch$ - ^git.commit.id.abbrev$ - ^git.dirty$ - - - - git.dirty - true - -DIRTY - - - git.dirty - false - - - - false - - - - initialize - - revision - - - - - - maven-jar-plugin - 3.4.1 - - - - ${project.version} - ${git.commit.id.abbrev}${git.dirty} - ${git.branch} - ${maven.build.timestamp} - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.2.5 - @@ -115,7 +57,6 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 package @@ -149,7 +90,6 @@ com.aionemu commons - 2.0-SNAPSHOT com.sun.xml.bind @@ -159,7 +99,7 @@ org.apache.commons commons-lang3 - 3.14.0 + 3.17.0 \ No newline at end of file diff --git a/login-server/pom.xml b/login-server/pom.xml index 04095b3cb..1095ee0d0 100644 --- a/login-server/pom.xml +++ b/login-server/pom.xml @@ -2,35 +2,29 @@ 4.0.0 - com.aionemu + + + com.aionemu + aion-server + 4.8-SNAPSHOT + ../pom.xml + + login-server - 4.8-SNAPSHOT Aion Login Server jar + - UTF-8 - true + true + src test org.apache.maven.plugins - maven-compiler-plugin - 3.13.0 - - 21 - - -Xlint:all,-preview,-this-escape - - true - true - - - maven-assembly-plugin - 3.7.1 assembly.xml @@ -47,58 +41,6 @@ - - io.github.git-commit-id - git-commit-id-maven-plugin - 8.0.2 - - - ^git.branch$ - ^git.commit.id.abbrev$ - ^git.dirty$ - - - - git.dirty - true - -DIRTY - - - git.dirty - false - - - - false - - - - initialize - - revision - - - - - - maven-jar-plugin - 3.4.1 - - - - ${project.version} - ${git.commit.id.abbrev}${git.dirty} - ${git.branch} - ${maven.build.timestamp} - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.2.5 - @@ -115,7 +57,6 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 package @@ -149,12 +90,11 @@ com.aionemu commons - 2.0-SNAPSHOT org.junit.jupiter junit-jupiter-api - 5.10.2 + 5.11.4 test diff --git a/pom.xml b/pom.xml index 871d8c7e4..bccf75dc4 100644 --- a/pom.xml +++ b/pom.xml @@ -2,9 +2,10 @@ 4.0.0 + com.aionemu aion-server - 1.0-SNAPSHOT + 4.8-SNAPSHOT pom @@ -13,4 +14,104 @@ game-server login-server - \ No newline at end of file + + + 21 + true + + UTF-8 + + + + + + com.aionemu + commons + ${project.version} + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + + + -Xlint:all,-preview,-this-escape + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.4.2 + + + + ${project.version} + ${git.commit.id.abbrev}${git.dirty} + ${git.branch} + ${maven.build.timestamp} + + + + + + org.apache.maven.plugins + maven-assembly-plugin + 3.7.1 + + + org.apache.maven.plugins + maven-antrun-plugin + 3.1.0 + + + org.apache.maven.plugins + maven-surefire-plugin + 3.2.5 + + + + + + + io.github.git-commit-id + git-commit-id-maven-plugin + 9.0.1 + + + ^git.branch$ + ^git.commit.id.abbrev$ + ^git.dirty$ + + + + git.dirty + true + -DIRTY + + + git.dirty + false + + + + false + + + + initialize + + revision + + + + + + +