Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

some improvements... optional 😉 #55

Merged
merged 4 commits into from
Feb 10, 2025
+155 −310
Merged

some improvements... optional 😉 #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7418c08
chore(deps): updated dependencies
bbortt Feb 6, 2025
e59e51c
ci: move to parent-with-modules maven project
bbortt Feb 9, 2025
c72e5e8
chore(deps): move plugin management to parent pom
bbortt Feb 9, 2025
44931bd
ci: skip server install
bbortt Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
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
bbortt marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion .github/workflows/run-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
run: mvn -B -T 4 -Dmaven.source.skip=true -Dmaven.test.skip=false test
82 changes: 11 additions & 71 deletions chat-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,28 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.aionemu</groupId>

<parent>
<groupId>com.aionemu</groupId>
<artifactId>aion-server</artifactId>
<version>4.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>chat-server</artifactId>
<version>4.8-SNAPSHOT</version>
<name>Aion Chat Server</name>
<packaging>jar</packaging>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.test.skip>true</maven.test.skip>
<maven.install.skip>true</maven.install.skip>
</properties>

<build>
<sourceDirectory>src</sourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<configuration>
<release>21</release>
<compilerArgs>
<arg>-Xlint:all,-preview,-this-escape</arg>
</compilerArgs>
<showWarnings>true</showWarnings>
<debug>true</debug>
bbortt marked this conversation as resolved.
Show resolved Hide resolved
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.7.1</version>
<configuration>
<descriptors>
<descriptor>assembly.xml</descriptor>
Expand All @@ -46,58 +40,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>io.github.git-commit-id</groupId>
<artifactId>git-commit-id-maven-plugin</artifactId>
<version>8.0.2</version>
<configuration>
<includeOnlyProperties>
<includeOnlyProperty>^git.branch$</includeOnlyProperty>
<includeOnlyProperty>^git.commit.id.abbrev$</includeOnlyProperty>
<includeOnlyProperty>^git.dirty$</includeOnlyProperty>
</includeOnlyProperties>
<replacementProperties>
<replacementProperty>
<property>git.dirty</property>
<token>true</token>
<value>-DIRTY</value>
</replacementProperty>
<replacementProperty>
<property>git.dirty</property>
<token>false</token>
<value />
</replacementProperty>
</replacementProperties>
<failOnNoGitDirectory>false</failOnNoGitDirectory>
</configuration>
<executions>
<execution>
<phase>initialize</phase>
<goals>
<goal>revision</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>3.4.1</version>
<configuration>
<archive>
<manifestEntries>
<POMVersion>${project.version}</POMVersion>
<Revision>${git.commit.id.abbrev}${git.dirty}</Revision>
<Branch>${git.branch}</Branch>
<Date>${maven.build.timestamp}</Date>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.5</version>
</plugin>
</plugins>
</build>
<profiles>
Expand All @@ -114,7 +56,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<phase>package</phase>
Expand Down Expand Up @@ -148,7 +89,6 @@
<dependency>
<groupId>com.aionemu</groupId>
<artifactId>commons</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
Expand Down
106 changes: 15 additions & 91 deletions commons/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,22 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.aionemu</groupId>

<parent>
<groupId>com.aionemu</groupId>
<artifactId>aion-server</artifactId>
<version>4.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>commons</artifactId>
<version>2.0-SNAPSHOT</version>
<name>Aion Commons</name>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.test.skip>true</maven.test.skip>
</properties>

<build>
<sourceDirectory>src</sourceDirectory>
<testSourceDirectory>test</testSourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<configuration>
<release>21</release>
<compilerArgs>
<arg>-Xlint:all,-preview,-this-escape</arg>
</compilerArgs>
<showWarnings>true</showWarnings>
<debug>true</debug>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
Expand All @@ -43,105 +33,39 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>io.github.git-commit-id</groupId>
<artifactId>git-commit-id-maven-plugin</artifactId>
<version>8.0.2</version>
<configuration>
<includeOnlyProperties>
<includeOnlyProperty>^git.branch$</includeOnlyProperty>
<includeOnlyProperty>^git.commit.id.abbrev$</includeOnlyProperty>
<includeOnlyProperty>^git.dirty$</includeOnlyProperty>
</includeOnlyProperties>
<replacementProperties>
<replacementProperty>
<property>git.dirty</property>
<token>true</token>
<value>-DIRTY</value>
</replacementProperty>
<replacementProperty>
<property>git.dirty</property>
<token>false</token>
<value />
</replacementProperty>
</replacementProperties>
<failOnNoGitDirectory>false</failOnNoGitDirectory>
</configuration>
<executions>
<execution>
<phase>initialize</phase>
<goals>
<goal>revision</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>3.4.1</version>
<configuration>
<archive>
<manifestEntries>
<POMVersion>${project.version}</POMVersion>
<Revision>${git.commit.id.abbrev}${git.dirty}</Revision>
<Branch>${git.branch}</Branch>
<Date>${maven.build.timestamp}</Date>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.5</version>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.5.6</version>
<version>1.5.16</version>
</dependency>
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
bbortt marked this conversation as resolved.
Show resolved Hide resolved
<artifactId>fastjson2</artifactId>
<version>2.0.49</version>
<version>2.0.54</version>
</dependency>
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>5.1.0</version>
<version>6.2.1</version>
</dependency>
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>8.3.0</version>
<version>9.2.0</version>
</dependency>

<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
<version>2.3.2</version>
<exclusions>
<exclusion>
<groupId>com.mchange</groupId>
<artifactId>c3p0</artifactId>
</exclusion>
<exclusion>
<groupId>com.mchange</groupId>
<artifactId>mchange-commons-java</artifactId>
</exclusion>
<exclusion>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP-java7</artifactId>
</exclusion>
</exclusions>
<version>2.5.0</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.10.2</version>
<version>5.11.4</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Loading