funkemunky/BungeeCord
1
0
Fork 0
mirror of https://github.com/SpigotMC/BungeeCord.git synced 2026-05-31 05:41:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Require Java 17

Browse Source
This commit is contained in:
md_5
2026-03-21 14:38:38 +11:00
parent feeaf07352
commit 1ecf942ced
4 changed files with 18 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/maven.yml
+1 -1
View File
@@ -9,7 +9,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
java: [8, 11, 17, 21, 25] java: [17, 21, 25]
name: Java ${{ matrix.java }} name: Java ${{ matrix.java }}
bootstrap/pom.xml
+1 -32
View File
@@ -22,8 +22,7 @@
<skipPublishing>true</skipPublishing> <skipPublishing>true</skipPublishing>
<maven.deploy.skip>true</maven.deploy.skip> <maven.deploy.skip>true</maven.deploy.skip>
<maven.javadoc.skip>true</maven.javadoc.skip> <maven.javadoc.skip>true</maven.javadoc.skip>
<maven.compiler.source>1.6</maven.compiler.source> <maven.compiler.release>11</maven.compiler.release>
<maven.compiler.target>1.6</maven.compiler.target>
<maven.build.timestamp.format>yyyyMMdd</maven.build.timestamp.format> <maven.build.timestamp.format>yyyyMMdd</maven.build.timestamp.format>
</properties> </properties>
@@ -81,34 +80,4 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>jdk-9-release</id>
<activation>
<jdk>[9,)</jdk>
</activation>
<properties>
<maven.compiler.release>6</maven.compiler.release>
</properties>
</profile>
<profile>
<id>jdk-12-release</id>
<activation>
<jdk>[12,)</jdk>
</activation>
<properties>
<maven.compiler.release>7</maven.compiler.release>
</properties>
</profile>
<profile>
<id>jdk-20-release</id>
<activation>
<jdk>[20,)</jdk>
</activation>
<properties>
<maven.compiler.release>8</maven.compiler.release>
</properties>
</profile>
</profiles>
</project> </project>
bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java
+2 -2
View File
@@ -5,9 +5,9 @@ public class Bootstrap
public static void main(String[] args) throws Exception public static void main(String[] args) throws Exception
{ {
if ( Float.parseFloat( System.getProperty( "java.class.version" ) ) < 52.0 ) if ( Float.parseFloat( System.getProperty( "java.class.version" ) ) < 61.0 )
{ {
System.err.println( "*** ERROR *** BungeeCord requires Java 8 or above to function! Please download and install it!" ); System.err.println( "*** ERROR *** BungeeCord requires Java 17 or above to function! Please download and install it!" );
System.out.println( "You can check your Java version with the command: java -version" ); System.out.println( "You can check your Java version with the command: java -version" );
return; return;
} }
pom.xml
+14 -78
View File
@@ -77,8 +77,7 @@
<properties> <properties>
<build.number>unknown</build.number> <build.number>unknown</build.number>
<lombok.version>1.18.44</lombok.version> <lombok.version>1.18.44</lombok.version>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.release>17</maven.compiler.release>
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
@@ -151,6 +150,15 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.15.0</version> <version>3.15.0</version>
<configuration>
<annotationProcessorPaths>
<annotationProcessorPath>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</annotationProcessorPath>
</annotationProcessorPaths>
</configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@@ -177,26 +185,6 @@
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<version>1.27</version>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
<artifactId>java18</artifactId>
<version>1.0</version>
</signature>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId> <artifactId>maven-enforcer-plugin</artifactId>
@@ -226,62 +214,6 @@
</build> </build>
<profiles> <profiles>
<profile>
<id>jdk-9-release</id>
<activation>
<jdk>[9,)</jdk>
</activation>
<properties>
<maven.compiler.release>8</maven.compiler.release>
</properties>
</profile>
<profile>
<id>jdk-9-javadoc</id>
<activation>
<jdk>[9,)</jdk>
</activation>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<additionalOptions>-html5</additionalOptions>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>
<profile>
<id>jdk-15-javadoc</id>
<activation>
<jdk>[15,)</jdk>
</activation>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<doclint>none</doclint>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>
<profile>
<id>jdk-21-proc</id>
<activation>
<jdk>[21,)</jdk>
</activation>
<properties>
<maven.compiler.proc>full</maven.compiler.proc>
</properties>
</profile>
<profile> <profile>
<id>dist</id> <id>dist</id>
<build> <build>
@@ -334,6 +266,10 @@
<goals> <goals>
<goal>jar</goal> <goal>jar</goal>
</goals> </goals>
<configuration>
<attach>false</attach>
<doclint>-missing</doclint>
</configuration>
</execution> </execution>
<!-- Then execute it again to generate properly with delombok --> <!-- Then execute it again to generate properly with delombok -->
<execution> <execution>