Skip to content

Commit 3509c8f

Browse files
Ghost-chuGhost-chu
authored
Merge pull request #1559 from Ghost-chu/hikari
6.2.0.0
2 parents 6bf9a3d + 3d3b8cf commit 3509c8f

File tree

153 files changed

+4230
-2157
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+4230
-2157
lines changed

‎.github/workflows/maven.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/checkout@v2
17-
- name: Set up JDK 17
17+
- name: Set up JDK 21
1818
uses: actions/setup-java@v2
1919
with:
20-
java-version: '17'
20+
java-version: '21'
2121
distribution: 'temurin'
2222
cache: 'maven'
2323
- name: Build with Maven

‎.github/workflows/mc-publish.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- uses: actions/checkout@v3
21-
- name: Set up JDK 17
21+
- name: Set up JDK 21
2222
uses: actions/setup-java@v3
2323
with:
24-
java-version: '17'
24+
java-version: '21'
2525
distribution: 'temurin'
2626
cache: maven
2727
- name: Build with Maven
@@ -43,10 +43,11 @@ jobs:
4343
paper
4444
purpur
4545
game-versions: |
46-
>=1.18.2 <=1.20.4
46+
>=1.18.2 <=1.20.6
4747
game-version-filter: releases
4848
java: |
4949
17
50+
21
5051
dependencies: |
5152
essentialsx(optional)
5253
nbtapi(optional)

‎.run/quickshop-hikari update version.run.xml‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎addon/bluemap/pom.xml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.ghostchu</groupId>
99
<artifactId>quickshop-hikari</artifactId>
10-
<version>6.1.0.2</version>
10+
<version>6.2.0.0</version>
1111
<relativePath>../../pom.xml</relativePath>
1212
</parent>
1313
<groupId>com.ghostchu.quickshop.addon</groupId>
@@ -58,7 +58,7 @@
5858
<dependency>
5959
<groupId>com.ghostchu</groupId>
6060
<artifactId>quickshop-bukkit</artifactId>
61-
<version>${parent.version}</version>
61+
<version>${project.parent.version}</version>
6262
<scope>provided</scope>
6363
</dependency>
6464
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
@@ -73,6 +73,12 @@
7373
<artifactId>BlueMapAPI</artifactId>
7474
<version>2.7.0</version>
7575
<scope>provided</scope>
76+
<exclusions>
77+
<exclusion>
78+
<artifactId>gson</artifactId>
79+
<groupId>com.google.code.gson</groupId>
80+
</exclusion>
81+
</exclusions>
7682
</dependency>
7783
</dependencies>
7884
</project>

‎addon/discordsrv/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.ghostchu</groupId>
99
<artifactId>quickshop-hikari</artifactId>
10-
<version>6.1.0.2</version>
10+
<version>6.2.0.0</version>
1111
<relativePath>../../pom.xml</relativePath>
1212
</parent>
1313
<groupId>com.ghostchu.quickshop.addon</groupId>
@@ -63,7 +63,7 @@
6363
<dependency>
6464
<groupId>com.ghostchu</groupId>
6565
<artifactId>quickshop-bukkit</artifactId>
66-
<version>${parent.version}</version>
66+
<version>${project.parent.version}</version>
6767
<scope>provided</scope>
6868
</dependency>
6969
<dependency>

‎addon/discount/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.ghostchu</groupId>
99
<artifactId>quickshop-hikari</artifactId>
10-
<version>6.1.0.2</version>
10+
<version>6.2.0.0</version>
1111
<relativePath>../../pom.xml</relativePath>
1212
</parent>
1313
<groupId>com.ghostchu.quickshop.addon</groupId>
@@ -63,7 +63,7 @@
6363
<dependency>
6464
<groupId>com.ghostchu</groupId>
6565
<artifactId>quickshop-bukkit</artifactId>
66-
<version>${parent.version}</version>
66+
<version>${project.parent.version}</version>
6767
<scope>provided</scope>
6868
</dependency>
6969
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->

‎addon/displaycontrol/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.ghostchu</groupId>
99
<artifactId>quickshop-hikari</artifactId>
10-
<version>6.1.0.2</version>
10+
<version>6.2.0.0</version>
1111
<relativePath>../../pom.xml</relativePath>
1212
</parent>
1313
<groupId>com.ghostchu.quickshop.addon</groupId>
@@ -63,7 +63,7 @@
6363
<dependency>
6464
<groupId>com.ghostchu</groupId>
6565
<artifactId>quickshop-bukkit</artifactId>
66-
<version>${parent.version}</version>
66+
<version>${project.parent.version}</version>
6767
<scope>provided</scope>
6868
</dependency>
6969
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->

‎addon/dynmap/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.ghostchu</groupId>
99
<artifactId>quickshop-hikari</artifactId>
10-
<version>6.1.0.2</version>
10+
<version>6.2.0.0</version>
1111
<relativePath>../../pom.xml</relativePath>
1212
</parent>
1313
<groupId>com.ghostchu.quickshop.addon</groupId>
@@ -58,7 +58,7 @@
5858
<dependency>
5959
<groupId>com.ghostchu</groupId>
6060
<artifactId>quickshop-bukkit</artifactId>
61-
<version>${parent.version}</version>
61+
<version>${project.parent.version}</version>
6262
<scope>provided</scope>
6363
</dependency>
6464
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->

‎addon/limited/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.ghostchu</groupId>
99
<artifactId>quickshop-hikari</artifactId>
10-
<version>6.1.0.2</version>
10+
<version>6.2.0.0</version>
1111
<relativePath>../../pom.xml</relativePath>
1212
</parent>
1313
<groupId>com.ghostchu.quickshop.addon</groupId>
@@ -63,7 +63,7 @@
6363
<dependency>
6464
<groupId>com.ghostchu</groupId>
6565
<artifactId>quickshop-bukkit</artifactId>
66-
<version>${parent.version}</version>
66+
<version>${project.parent.version}</version>
6767
<scope>provided</scope>
6868
</dependency>
6969
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->

‎addon/list/pom.xml‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.ghostchu</groupId>
99
<artifactId>quickshop-hikari</artifactId>
10-
<version>6.1.0.2</version>
10+
<version>6.2.0.0</version>
1111
<relativePath>../../pom.xml</relativePath>
1212
</parent>
1313
<groupId>com.ghostchu.quickshop.addon</groupId>
@@ -63,21 +63,8 @@
6363
<dependency>
6464
<groupId>com.ghostchu</groupId>
6565
<artifactId>quickshop-bukkit</artifactId>
66-
<version>${parent.version}</version>
66+
<version>${project.parent.version}</version>
6767
<scope>provided</scope>
6868
</dependency>
69-
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
70-
<dependency>
71-
<groupId>org.apache.commons</groupId>
72-
<artifactId>commons-lang3</artifactId>
73-
<version>3.14.0</version>
74-
<scope>provided</scope>
75-
</dependency>
76-
<!-- <dependency>-->
77-
<!-- <groupId>net.kyori</groupId>-->
78-
<!-- <artifactId>adventure-text-serializer-plain</artifactId>-->
79-
<!-- <version>4.12.0</version>-->
80-
<!-- <scope>provided</scope>-->
81-
<!-- </dependency>-->
8269
</dependencies>
8370
</project>

0 commit comments

Comments
 (0)