From b2fd0b31fbe4c23f3a0a5ff996fc92b3888f2115 Mon Sep 17 00:00:00 2001 From: Simon Brown Date: Tue, 19 Sep 2023 12:24:39 +0100 Subject: [PATCH] Remove Java 11 support. --- .github/workflows/gradle.yml | 2 +- build.gradle | 8 ++++---- .../cli/StructurizrCliApplication.java | 19 ------------------- 3 files changed, 5 insertions(+), 24 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 971f0d6..51f05f2 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [ '11', '17' ] + java: [ '17' ] steps: - uses: actions/checkout@v3 diff --git a/build.gradle b/build.gradle index 3ed61a4..5755810 100644 --- a/build.gradle +++ b/build.gradle @@ -6,10 +6,10 @@ defaultTasks 'clean', 'build', 'getDeps', 'buildZip' description = 'Structurizr CLI' group = 'com.structurizr' -version = '1.33.1' +version = '1.34.0' -sourceCompatibility = '11' -targetCompatibility = '11' +sourceCompatibility = 17 +targetCompatibility = 17 repositories { mavenCentral() @@ -33,7 +33,7 @@ dependencies { implementation 'org.apache.logging.log4j:log4j-jcl:2.20.0' implementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.20.0' - testImplementation 'org.junit.jupiter:junit-jupiter:5.9.0' + testImplementation 'org.junit.jupiter:junit-jupiter:5.9.2' } diff --git a/src/main/java/com/structurizr/cli/StructurizrCliApplication.java b/src/main/java/com/structurizr/cli/StructurizrCliApplication.java index 0496203..3fb5d11 100644 --- a/src/main/java/com/structurizr/cli/StructurizrCliApplication.java +++ b/src/main/java/com/structurizr/cli/StructurizrCliApplication.java @@ -69,8 +69,6 @@ public class StructurizrCliApplication { public void run(String... args) { try { - checkJavaVersion(); - if (args == null || args.length == 0) { printUsageMessageAndExit(null); } @@ -98,23 +96,6 @@ private void printUsageMessageAndExit(String commandName) { System.exit(1); } - private void checkJavaVersion() { - Set versions = new HashSet<>(); - versions.add("11"); - versions.add("11.0.0"); - versions.add("11.0.1"); - versions.add("11.0.2"); - versions.add("11.0.3"); - - String version = System.getProperty("java.version"); - - if (versions.contains(version)) { - log.error("The Structurizr CLI does not work with Java versions 11.0.0-11.0.3 - please upgrade your Java installation"); - System.exit(1); - } - - } - public static void main(String[] args) { new StructurizrCliApplication().run(args); }