From 90829bf57d5d8cf556d0d61f0f1fe3a9197b5fbf Mon Sep 17 00:00:00 2001 From: Haroon Sheikh Date: Wed, 21 Jun 2023 14:22:54 +0100 Subject: [PATCH] Setting min java version to 11 Signed-off-by: Haroon Sheikh --- .github/workflows/tests.yml | 2 +- README.md | 6 +- gauge-proto | 2 +- java.json | 2 +- pom.xml | 125 ++++++++---------- .../thoughtworks/gauge/FileHelperTest.java | 83 ------------ 6 files changed, 59 insertions(+), 161 deletions(-) delete mode 100644 src/test/java/com/thoughtworks/gauge/FileHelperTest.java diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4eebbde6..bd7166d2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - java_version: ['16', '17'] + java_version: ['11', '17'] steps: - uses: actions/checkout@v2 diff --git a/README.md b/README.md index c0f59614..9da93bdc 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ This project adds java [language plugin](https://gauge.org/plugins/) for [gauge] ### Pre-requisite - [Install Gauge](https://docs.gauge.org/getting_started/installing-gauge.html) -- [Java](https://www.java.com/en/download/) +- [Java](https://www.java.com/en/download/) (Minimum required version is 11) ### Installation @@ -36,13 +36,13 @@ gauge run specs #### Install specific version * Installing specific version ``` -gauge install java --version 0.9.2 +gauge install java --version 0.10.0 ``` #### Offline installation * Download the plugin from [Releases](https://github.com/getgauge/gauge-java/releases) ``` -gauge install java --file gauge-java-0.9.2-windows.x86_64.zip +gauge install java --file gauge-java-0.10.0-windows.x86_64.zip ``` #### Build from source diff --git a/gauge-proto b/gauge-proto index c616d559..73ca40cb 160000 --- a/gauge-proto +++ b/gauge-proto @@ -1 +1 @@ -Subproject commit c616d559fd5c5d7d8eb04ad0fc7df9f4c9c45282 +Subproject commit 73ca40cb5ac420aa5e5a09720ea13e4bc7ca195f diff --git a/java.json b/java.json index 00ad0588..44a1495b 100644 --- a/java.json +++ b/java.json @@ -1,6 +1,6 @@ { "id": "java", - "version": "0.9.2", + "version": "0.10.0", "description": "Java support for gauge", "install": { "windows": [], diff --git a/pom.xml b/pom.xml index 2076a8e8..eea256b2 100644 --- a/pom.xml +++ b/pom.xml @@ -7,18 +7,22 @@ ${projectVersion} Java plugin for Gauge http://github.com/getgauge/gauge-java - + + + + io.grpc + grpc-bom + 1.56.0 + pom + import + + + - - org.junit.jupiter - junit-jupiter-api - 5.8.2 - test - org.assertj assertj-core - 3.22.0 + 3.24.2 org.reflections @@ -28,36 +32,12 @@ com.github.javaparser javaparser-core - 3.16.3 - - - org.hamcrest - hamcrest-core - 2.2 - test - - - org.mockito - mockito-core - 4.3.1 - test - - - org.mockito - mockito-inline - 4.3.1 - test - - - com.github.stefanbirkner - system-rules - 1.19.0 - test + 3.25.3 commons-io commons-io - 2.11.0 + 2.13.0 commons-lang @@ -67,42 +47,69 @@ org.json json - 20220320 + 20230618 com.google.protobuf protobuf-java - 3.19.4 + 3.23.3 com.google.guava guava - 31.0.1-jre + 32.0.1-jre io.grpc grpc-netty-shaded - 1.41.2 io.grpc grpc-protobuf - 1.41.2 io.grpc grpc-stub - 1.41.2 javax.annotation javax.annotation-api 1.3.2 + + org.junit.jupiter + junit-jupiter-api + 5.9.3 + test + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-core + 2.2 + test + + + org.mockito + mockito-core + 5.4.0 + test + + + org.mockito + mockito-inline + 5.2.0 + test + uk.org.webcompere system-stubs-jupiter - 2.0.1 + 2.0.2 test @@ -115,30 +122,6 @@ - - org.xolstice.maven.plugins - protobuf-maven-plugin - 0.6.1 - - - com.google.protobuf:protoc:3.6.1:exe:${os.detected.classifier} - - grpc-java - - io.grpc:protoc-gen-grpc-java:1.13.1:exe:${os.detected.classifier} - - gauge-proto - - - - none - - compile - compile-custom - - - - org.apache.maven.plugins maven-source-plugin @@ -206,12 +189,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.10.1 - - 1.8 - 1.8 - UTF-8 - + 3.11.0 org.apache.maven.plugins @@ -303,9 +281,12 @@ yyyy-MM-dd - 0.9.2 + 0.10.0 UTF-8 UTF-8 + 11 + ${java.version} + ${java.version} diff --git a/src/test/java/com/thoughtworks/gauge/FileHelperTest.java b/src/test/java/com/thoughtworks/gauge/FileHelperTest.java deleted file mode 100644 index f29aea87..00000000 --- a/src/test/java/com/thoughtworks/gauge/FileHelperTest.java +++ /dev/null @@ -1,83 +0,0 @@ -/*---------------------------------------------------------------- - * Copyright (c) ThoughtWorks, Inc. - * Licensed under the Apache License, Version 2.0 - * See LICENSE.txt in the project root for license information. - *----------------------------------------------------------------*/ -package com.thoughtworks.gauge; - -import org.junit.Test; -import org.junit.jupiter.api.extension.ExtendWith; - -import static uk.org.webcompere.systemstubs.SystemStubs.*; -import uk.org.webcompere.systemstubs.jupiter.SystemStubsExtension; - -import java.io.File; -import java.util.Arrays; -import java.util.List; - -import static com.thoughtworks.gauge.GaugeConstant.GAUGE_CUSTOM_COMPILE_DIR; -import static com.thoughtworks.gauge.GaugeConstant.GAUGE_PROJECT_ROOT; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.jupiter.api.Assertions.assertIterableEquals; - -@ExtendWith(SystemStubsExtension.class) -public class FileHelperTest { - - String gaugeProjRoot = Util.workingDir().getAbsolutePath() + File.separator + String.format("src%stest%sresources%stest", File.separator, File.separator, File.separator); - - @Test - public void testGetAllImplementationFiles() throws Exception { - String gaugeProjRoot = Util.workingDir().getAbsolutePath() + File.separator + String.format("src%stest%sresources%stest", File.separator, File.separator, File.separator); - - List implFiles = withEnvironmentVariable(GAUGE_CUSTOM_COMPILE_DIR, String.format("files%sformatted, files%sunformatted", File.separator, File.separator)) - .and(GAUGE_PROJECT_ROOT, gaugeProjRoot) - .execute(() -> FileHelper.getAllImplementationFiles()); - assertEquals(3, implFiles.size()); - List expectedImplFiles = Arrays.asList(String.format("%s%sfiles%sformatted%sStepImpl.java", gaugeProjRoot, File.separator, File.separator, File.separator), - String.format("%s%sfiles%sformatted%sStepImplWithComments.java", gaugeProjRoot, File.separator, File.separator, File.separator), - String.format("%s%sfiles%sunformatted%sUnFormattedStepImpl.java", gaugeProjRoot, File.separator, File.separator, File.separator)); - assertTrue(expectedImplFiles.containsAll(implFiles)); - } - - - @Test - public void testGetStepImplDirsWhenCustomCompileDirEnvIsSet() throws Exception { - String gaugeProjRoot = Util.workingDir().getAbsolutePath(); - - List stepImplDirs = withEnvironmentVariable(GAUGE_CUSTOM_COMPILE_DIR, String.format("files%sformatted, files%sunformatted", File.separator, File.separator)) - .and(GAUGE_PROJECT_ROOT, gaugeProjRoot) - .execute(() -> FileHelper.getStepImplDirs()); - - assertEquals(2, stepImplDirs.size()); - List expectedImplDirs = Arrays.asList(String.format("%s%sfiles%sformatted", gaugeProjRoot, File.separator, File.separator), - String.format("%s%sfiles%sunformatted", gaugeProjRoot, File.separator, File.separator) - ); - assertTrue(expectedImplDirs.containsAll(stepImplDirs)); - } - - @Test - public void testGetStepImplDirsWhenDefaultImplDirsDoesNotExists() throws Exception { - String gaugeProjRoot = Util.workingDir().getAbsolutePath() + File.separator + String.format("src%stest%sresources%stest", File.separator, File.separator, File.separator); - - List stepImplDirs = withEnvironmentVariable(GAUGE_PROJECT_ROOT, gaugeProjRoot) - .execute(() -> FileHelper.getStepImplDirs()); - - assertEquals(0, stepImplDirs.size()); - } - - @Test - public void testGetStepImplDirs() throws Exception { - String gaugeProjRoot = Util.workingDir().getAbsolutePath(); - - List stepImplDirs = withEnvironmentVariable(GAUGE_PROJECT_ROOT, gaugeProjRoot) - .execute(() -> FileHelper.getStepImplDirs()); - - assertEquals(2, stepImplDirs.size()); - List expectedImplDirs = Arrays.asList( - String.format("%s%ssrc%smain%sjava", gaugeProjRoot, File.separator, File.separator, File.separator), - String.format("%s%ssrc%stest%sjava", gaugeProjRoot, File.separator, File.separator, File.separator) - ); - assertTrue(expectedImplDirs.containsAll(stepImplDirs)); - } -} \ No newline at end of file