From 02ed9d3141b5adf2bb43af52c8d70ca6cca13492 Mon Sep 17 00:00:00 2001 From: Torsten Friebe Date: Fri, 17 Nov 2023 20:44:22 +0100 Subject: [PATCH 1/4] #54 upgrade to pljava v1.6.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 71f1597..6a7f9bb 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ UTF-8 11 - 1.6.4 + 1.6.6 4.13.1 From 0fd0c10dfc68f1df77f4453b362d3ac70e3c7add Mon Sep 17 00:00:00 2001 From: Torsten Friebe Date: Fri, 17 Nov 2023 20:45:39 +0100 Subject: [PATCH 2/4] #54 replace github repo by github packages and remove all latlon repos --- pom.xml | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/pom.xml b/pom.xml index 6a7f9bb..6daae22 100644 --- a/pom.xml +++ b/pom.xml @@ -36,9 +36,9 @@ - github-repo - Github local repo for API build from https://github.com/tada/pljava/ - https://raw.github.com/lat-lon/sep3-tools/repository + github + Github repo for pljava build forked from https://github.com/tada/pljava/ + https://maven.pkg.github.com/lat-lon/pljava true never @@ -47,23 +47,6 @@ false - - latlon - https://repo.lat-lon.de/repository/maven-public/ - - never - - - true - - - - sep3tools-releases - https://repo.lat-lon.de/repository/sep3tools-releases/ - - never - - @@ -71,13 +54,6 @@ https://github.com/lat-lon/sep3-tools/issues - - - latlon - https://repo.lat-lon.de/repository/maven-public/ - - - latlon-deploy From c0ed50e0b3e4e050e402bea6553aacb338b47676 Mon Sep 17 00:00:00 2001 From: Torsten Friebe Date: Fri, 17 Nov 2023 21:07:39 +0100 Subject: [PATCH 3/4] #54 add GITHUB_TOKEN to maven build action --- .github/workflows/maven.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 3fa26f4..0d4ed97 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -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: From d9a175ab8e7ba7c4c2557a64a4206774c22b8f79 Mon Sep 17 00:00:00 2001 From: Torsten Friebe Date: Sat, 18 Nov 2023 12:43:46 +0100 Subject: [PATCH 4/4] updated README about downloading from GitHub repositories --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 703cd27..e67eac3 100644 --- a/README.md +++ b/README.md @@ -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: @@ -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] `: