Skip to content

Commit de6af78

Browse files
authored
Merge pull request #228 from sladkoff/ci/fix-pipelines
Ci/fix pipelines
2 parents d6c6262 + 1df543c commit de6af78

File tree

4 files changed

+15
-16
lines changed

4 files changed

+15
-16
lines changed

.github/workflows/release.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ jobs:
1111

1212
steps:
1313
- uses: actions/checkout@v4
14-
- name: Set up JDK 11
14+
- name: Set up JDK 17
1515
uses: actions/setup-java@v4
1616
with:
1717
distribution: 'adopt'
18-
java-version: '11'
18+
java-version: '17'
1919
- name: Set RELEASE_VERSION from tag
2020
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
2121
- name: Print version
@@ -25,7 +25,7 @@ jobs:
2525
run: mvn -B package --file pom.xml
2626
- name: Upload artifact
2727
uses: actions/upload-artifact@v4
28-
with:
28+
with:
2929
name: target
3030
path: ${{ github.workspace }}/target/**/*
3131
- name: Extract changelog content

.github/workflows/test.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ jobs:
1313

1414
steps:
1515
- uses: actions/checkout@v4
16-
- name: Set up JDK 11
16+
- name: Set up JDK 17
1717
uses: actions/setup-java@v4
1818
with:
1919
distribution: 'adopt'
20-
java-version: '11'
20+
java-version: '17'
2121
- name: Build with Maven
2222
run: mvn -B package --file pom.xml
2323
- name: Upload artifact
2424
uses: actions/upload-artifact@v4
25-
with:
25+
with:
2626
name: target
2727
path: ${{ github.workspace }}/target/**/*

docker-compose.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ services:
88
TYPE: "PAPER"
99
VERSION: "1.20.4"
1010
PLUGINS: |
11-
https://github.com/sladkoff/minecraft-prometheus-exporter/releases/download/v2.5.0/minecraft-prometheus-exporter-2.5.0.jar
11+
https://github.com/sladkoff/minecraft-prometheus-exporter/releases/download/v2.6.0/minecraft-prometheus-exporter-2.6.0.jar
1212
1313
ports:
1414
- "25565:25565"
15-
- "9225:9225"
15+
- "9940:9940"
1616
volumes:
1717
- ./docker/data:/data
1818
stdin_open: true

pom.xml

+7-8
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<packaging>jar</packaging>
1111

1212
<properties>
13-
<spigot-api.version>1.20.4-R0.1-SNAPSHOT</spigot-api.version>
13+
<paper-api.version>1.20.4-R0.1-SNAPSHOT</paper-api.version>
1414
<jetty.version>11.0.20</jetty.version>
1515
<prometheus-client.version>0.16.0</prometheus-client.version>
1616
<json-path.version>2.9.0</json-path.version>
@@ -28,16 +28,16 @@
2828

2929
<repositories>
3030
<repository>
31-
<id>spigot-repo</id>
32-
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
31+
<id>papermc</id>
32+
<url>https://repo.papermc.io/repository/maven-public/</url>
3333
</repository>
3434
</repositories>
3535

3636
<dependencies>
3737
<dependency>
38-
<groupId>org.spigotmc</groupId>
39-
<artifactId>spigot-api</artifactId>
40-
<version>${spigot-api.version}</version>
38+
<groupId>io.papermc.paper</groupId>
39+
<artifactId>paper-api</artifactId>
40+
<version>${paper-api.version}</version>
4141
<scope>provided</scope>
4242
</dependency>
4343
<dependency>
@@ -101,8 +101,7 @@
101101
<artifactId>maven-compiler-plugin</artifactId>
102102
<version>${maven-compiler-plugin.version}</version>
103103
<configuration>
104-
<source>1.8</source>
105-
<target>1.8</target>
104+
<release>17</release>
106105
</configuration>
107106
</plugin>
108107
<plugin>

0 commit comments

Comments
 (0)