Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade pljava to v1.6.6 #65

Merged
merged 4 commits into from
Nov 20, 2023
Merged

Upgrade pljava to v1.6.6 #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
02ed9d3
#54 upgrade to pljava v1.6.6
tfr42 Nov 17, 2023
0fd0c10
#54 replace github repo by github packages and remove all latlon repos
tfr42 Nov 17, 2023
c0ed50e
#54 add GITHUB_TOKEN to maven build action
tfr42 Nov 17, 2023
d9a175a
updated README about downloading from GitHub repositories
tfr42 Nov 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ jobs:
cache: maven
- name: Build with Maven
run: mvn -B verify --file pom.xml
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Publish artifacts
uses: actions/upload-artifact@v3
with:
Expand Down
5 changes: 3 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,13 @@ sep3=# select "Typ", "Langtext" as "Typbezeichnung", "Kuerzel", "Klartext" from

### Building

To build SEP3-Tools you need to install a [JDK 11](https://adoptium.net/?variant=openjdk11&jvmVariant=hotspot) and [Apache Maven 3.8.x](https://maven.apache.org/).
To build SEP3-Tools you need to install a [JDK 11](https://adoptium.net/?variant=openjdk11&jvmVariant=hotspot) and [Apache Maven 3.9.x](https://maven.apache.org/).
Then run the following command to build the parser:

```shell
mvn clean install
```
_**NOTE:**_ Downloading dependencies from GitHub Repositories require a `GITHUB_TOKEN` set in your local Maven `settings.xml` file, see [Working with the Apache Maven registry](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-apache-maven-registry) for more information.

To execute the parser you have to download ANTLR and all other dependencies first with:

Expand All @@ -89,7 +90,7 @@ for example:
```shell
$> java -jar ./target/sep3-parser-0.0.1-SNAPSHOT.jar "^u(t,lw)"
2021-09-14 12:00:00 WARN org.sep3tools.PetroVisitor:20 - Dictionary is not available, fallback to internal dictionary if possible.
Schluff (tonig, lagenweise)
Schluffstein (tonig, lagenweise)
```
or using the Woerterbuch data with the options `sep3-parser [jdbc-url] [username] [password] [dictionary] [keytypes] <soil_codes>`:

Expand Down
32 changes: 4 additions & 28 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>11</java.version>
<pljava.version>1.6.4</pljava.version>
<pljava.version>1.6.6</pljava.version>
<antlr.version>4.13.1</antlr.version>
</properties>

Expand All @@ -36,9 +36,9 @@

<repositories>
<repository>
<id>github-repo</id>
<name>Github local repo for API build from https://github.com/tada/pljava/</name>
<url>https://raw.github.com/lat-lon/sep3-tools/repository</url>
<id>github</id>
<name>Github repo for pljava build forked from https://github.com/tada/pljava/</name>
<url>https://maven.pkg.github.com/lat-lon/pljava</url>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
Expand All @@ -47,37 +47,13 @@
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>latlon</id>
<url>https://repo.lat-lon.de/repository/maven-public/</url>
<releases>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>sep3tools-releases</id>
<url>https://repo.lat-lon.de/repository/sep3tools-releases/</url>
<releases>
<updatePolicy>never</updatePolicy>
</releases>
</repository>
</repositories>

<issueManagement>
<system>github</system>
<url>https://github.com/lat-lon/sep3-tools/issues</url>
</issueManagement>

<pluginRepositories>
<pluginRepository>
<id>latlon</id>
<url>https://repo.lat-lon.de/repository/maven-public/</url>
</pluginRepository>
</pluginRepositories>

<distributionManagement>
<repository>
<id>latlon-deploy</id>
Expand Down