Skip to content

Commit

Permalink
Setting min java version to 11
Browse files Browse the repository at this point in the history 
Signed-off-by: Haroon Sheikh <haroon.sheikh@sky.uk>
  • Loading branch information
@haroon-sheikh
haroon-sheikh committed Jun 21, 2023
1 parent 2f185e9 commit 90829bf
Show file tree
Hide file tree
Showing 6 changed files with 59 additions and 161 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gauge-proto
Submodule gauge-proto updated 23 files
+2 −2 CONTRIBUTING.md
+0 −674 COPYING
+201 −0 LICENSE
+1 −2 README.md
+6 −19 api.proto
+1,227 −795 doc/gauge-proto-doc.md
+8 −0 gen_doc.sh
+2,532 −0 go/gauge_messages/api.pb.go
+9 −0 go/gauge_messages/go.mod
+82 −0 go/gauge_messages/go.sum
+175 −0 go/gauge_messages/lsp.pb.go
+451 −0 go/gauge_messages/lsp_grpc.pb.go
+4,919 −0 go/gauge_messages/messages.pb.go
+385 −0 go/gauge_messages/services.pb.go
+1,583 −0 go/gauge_messages/services_grpc.pb.go
+3,552 −0 go/gauge_messages/spec.pb.go
+9 −0 go/geneproto.sh
+2 −2 java/pom.xml
+6 −16 lsp.proto
+6 −17 messages.proto
+6 −0 release.sh
+7 −0 services.proto
+8 −15 spec.proto
2 changes: 1 addition & 1 deletion java.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "java",
"version": "0.9.2",
"version": "0.10.0",
"description": "Java support for gauge",
"install": {
"windows": [],
Expand Down
125 changes: 53 additions & 72 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,22 @@
<version>${projectVersion}</version>
<description>Java plugin for Gauge</description>
<url>http://github.com/getgauge/gauge-java</url>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-bom</artifactId>
<version>1.56.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.8.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.22.0</version>
<version>3.24.2</version>
</dependency>
<dependency>
<groupId>org.reflections</groupId>
Expand All @@ -28,36 +32,12 @@
<dependency>
<groupId>com.github.javaparser</groupId>
<artifactId>javaparser-core</artifactId>
<version>3.16.3</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>2.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>4.3.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>4.3.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.stefanbirkner</groupId>
<artifactId>system-rules</artifactId>
<version>1.19.0</version>
<scope>test</scope>
<version>3.25.3</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.11.0</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
Expand All @@ -67,42 +47,69 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20220320</version>
<version>20230618</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.19.4</version>
<version>3.23.3</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>31.0.1-jre</version>
<version>32.0.1-jre</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty-shaded</artifactId>
<version>1.41.2</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<version>1.41.2</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>1.41.2</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.9.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>2.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.4.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>5.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>uk.org.webcompere</groupId>
<artifactId>system-stubs-jupiter</artifactId>
<version>2.0.1</version>
<version>2.0.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -115,30 +122,6 @@
</extension>
</extensions>
<plugins>
<plugin>
<groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
<version>0.6.1</version>
<configuration>
<protocArtifact>
com.google.protobuf:protoc:3.6.1:exe:${os.detected.classifier}
</protocArtifact>
<pluginId>grpc-java</pluginId>
<pluginArtifact>
io.grpc:protoc-gen-grpc-java:1.13.1:exe:${os.detected.classifier}
</pluginArtifact>
<protoSourceRoot>gauge-proto</protoSourceRoot>
</configuration>
<executions>
<execution>
<phase>none</phase>
<goals>
<goal>compile</goal>
<goal>compile-custom</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
Expand Down Expand Up @@ -206,12 +189,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<encoding>UTF-8</encoding>
</configuration>
<version>3.11.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -303,9 +281,12 @@

<properties>
<maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
<projectVersion>0.9.2</projectVersion>
<projectVersion>0.10.0</projectVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>11</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
</properties>

</project>
83 changes: 0 additions & 83 deletions src/test/java/com/thoughtworks/gauge/FileHelperTest.java
View file

This file was deleted.

0 comments on commit 90829bf

Please sign in to comment.