Skip to content

Commit

Permalink
Merge pull request #29 from evolvedbinary/fix/jkd17-comp
Browse files Browse the repository at this point in the history
[fix] bump parboiled version to work with Java17
  • Loading branch information
adamretter authored Nov 20, 2023
2 parents 76566bc + 0fa1b56 commit 1fe828c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 35 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
jdk: [8,11,17]
jdk: [11,17]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout code
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
XPath Parser
============
[![Build Status](https://github.com/exquery/xpath2-parser/actions/workflows/ci.yml/badge.svg)](https://github.com/exquery/xpath2-parser/actions/workflows/ci.yml)
[![Java 6+](https://img.shields.io/badge/java-6+-blue.svg)](http://java.oracle.com)
[![Java 11+](https://img.shields.io/badge/java-11+-blue.svg)](http://java.oracle.com)
[![License](https://img.shields.io/badge/license-GPL%202-blue.svg)](https://www.gnu.org/licenses/gpl-2.0.html)

This library implements a complete XPath 2 Parser in Java 1.6, using [Parboiled](https://github.com/sirthias/parboiled).
This library implements a complete XPath 2 Parser in Java 11, using [Parboiled](https://github.com/sirthias/parboiled).

The parser generates an AST (Abstract Syntax Tree) which you can then use in your own application for whatever you wish. The class [XPathUtil](https://github.com/exquery/xpath2-parser/blob/master/src/main/java/com/evolvedbinary/xpath/parser/XPathUtil.java) shows how the parser can be used. You can also execute `XPathUtil` as an application if you want to understand the node-tree produced by the parser.

Expand Down
35 changes: 3 additions & 32 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@
</scm>

<properties>
<project.build.source>1.6</project.build.source>
<project.build.target>1.6</project.build.target>
<project.build.source>11</project.build.source>
<project.build.target>11</project.build.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<parboiled.version>1.3.1</parboiled.version>
<parboiled.version>1.4.1</parboiled.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -230,35 +230,6 @@
</plugins>
</build>

<profiles>
<profile>
<id>java17-compile-compatibility</id>
<!--
By default, this sets the `-source 1.7` and `-target 1.7`
flags to javac on JDK 17+, as it does not support older source
and target versions.
You can disable at build time, by using the mvn
args: `-P !java17-compile-compatibility`
-->
<activation>
<jdk>[17,)</jdk>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.7</source>
<target>1.7</target>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<pluginRepositories>
<pluginRepository>
<id>sonatype-releases</id>
Expand Down

0 comments on commit 1fe828c

Please sign in to comment.