Skip to content

Commit

Permalink
Merge branch 'master' of github.com:lszeremeta/yarspg
Browse files Browse the repository at this point in the history
  • Loading branch information
lszeremeta committed Jun 16, 2021
2 parents e0c42d2 + 16712ef commit 184c12e
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 15 deletions.
21 changes: 14 additions & 7 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,17 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: 11
- name: Build with Maven
run: mvn -B package --file pom.xml
- uses: actions/checkout@v2
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: 11
- name: Cache local Maven repository
uses: actions/cache@v2
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- name: Build with Maven
run: mvn -B package --file pom.xml
8 changes: 4 additions & 4 deletions _grammar-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@
<dependency>
<groupId>com.github.julianthome</groupId>
<artifactId>inmemantlr-api</artifactId>
<version>1.3.8</version>
<version>1.7.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.6</version>
<version>1.7.30</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.6</version>
<version>1.7.30</version>
</dependency>
</dependencies>

Expand All @@ -46,7 +46,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<version>2.22.2</version>
<configuration>
<!-- Travis build workaround -->
<argLine>-Xms1024m -Xmx2048m</argLine>
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>1.7</maven.compiler.target>
<maven.compiler.source>1.7</maven.compiler.source>
<antlr.version>4.9.1</antlr.version>
<antlr4test-maven-plugin.version>1.17</antlr4test-maven-plugin.version>
<antlr.version>4.9.2</antlr.version>
<antlr4test-maven-plugin.version>1.18</antlr4test-maven-plugin.version>
<junit.version>4.13.2</junit.version>
</properties>
<prerequisites>
Expand Down Expand Up @@ -114,7 +114,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand All @@ -130,7 +130,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<version>3.0.1</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down

0 comments on commit 184c12e

Please sign in to comment.