From b28d8a0ac8fe8f128ce44ecf250f0f681a5527a7 Mon Sep 17 00:00:00 2001 From: jstaerk Date: Mon, 17 Oct 2022 18:23:03 +0200 Subject: [PATCH] closes #286 --- History.md | 6 ++++++ Mustang-CLI/pom.xml | 23 +++++++++++++++++++++++ doc/development_documentation.md | 30 ++++++++++++++++++++++++++++-- library/pom.xml | 20 ++++++++++++++++++++ validator/pom.xml | 30 +++++++++++++++++++++++++----- 5 files changed, 102 insertions(+), 7 deletions(-) diff --git a/History.md b/History.md index 5fa2c375..9ff0d386 100644 --- a/History.md +++ b/History.md @@ -1,3 +1,9 @@ +2.6.0 +======= + +- Import of ZF1 invoices (thanks to Stefan Schmaltz https://github.com/ZUGFeRD/mustangproject/pull/292) +- works again in Java 1.8 (#286) + 2.5.6 ======= 2022-09-22 diff --git a/Mustang-CLI/pom.xml b/Mustang-CLI/pom.xml index 48a4a421..6fdcf8c9 100644 --- a/Mustang-CLI/pom.xml +++ b/Mustang-CLI/pom.xml @@ -13,6 +13,9 @@ 2.5.7-SNAPSHOT UTF-8 + 1.8 + 1.8 + 1.8 @@ -84,6 +87,26 @@ + + org.apache.maven.plugins + maven-toolchains-plugin + 3.1.0 + + + + toolchain + + + + + + + 1.8 + sun + + + + org.apache.maven.plugins maven-compiler-plugin diff --git a/doc/development_documentation.md b/doc/development_documentation.md index 4ceda7ad..13c05e78 100644 --- a/doc/development_documentation.md +++ b/doc/development_documentation.md @@ -154,12 +154,38 @@ The whole settings.xml then looks e.g. like this The TOKEN is generated on github. Deployment to maven central is described e.g. on [dzone](https://dzone.com/articles/publish-your-artifacts-to-maven-central). See the following screenshot: - - Sign in in GitHub and click on the profile picture -> Settings. Now just generate a new token and set the checkboxes from the screenshot. ![screenshot](development_documentation_screenshot_github_settings.png "Screenshot Github Settings") The Token-ID is the password. +In .m2 also need a toolchains.xml which defines a Sun JDK 1.8 target like the following: +```xml + + + + + jdk + + 1.8 + sun + + + C:\Program Files\Java\jdk1.8.0_341 + + + + jdk + + 18 + zulu + + + C:\Program Files\Zulu\zulu-18\ + + + + +``` ## Integrate before release diff --git a/library/pom.xml b/library/pom.xml index c18ec025..8b7b1706 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -142,6 +142,26 @@ 1.8 + + org.apache.maven.plugins + maven-toolchains-plugin + 3.1.0 + + + + toolchain + + + + + + + 1.8 + sun + + + + org.apache.maven.plugins maven-shade-plugin diff --git a/validator/pom.xml b/validator/pom.xml index 6876f540..bab6f01f 100644 --- a/validator/pom.xml +++ b/validator/pom.xml @@ -29,6 +29,9 @@ UTF-8 false + 1.8 + 1.8 + 1.8 @@ -125,8 +128,6 @@ - - org.apache.maven.plugins @@ -141,7 +142,26 @@ - + + org.apache.maven.plugins + maven-toolchains-plugin + 3.1.0 + + + + toolchain + + + + + + + 1.8 + sun + + + + org.apache.maven.plugins maven-compiler-plugin @@ -153,8 +173,8 @@ - 11 - 11 + 1.8 + 1.8