From cf5eb40ad6d12ab6434237f775bc3bf75cc5c25a Mon Sep 17 00:00:00 2001 From: tcnh Date: Sun, 3 Dec 2023 21:02:17 +0100 Subject: [PATCH] Dependency updates; use Datafker instead of JavaFaker for !Fake symbol --- .../.github/workflows/master.yml | 76 +++++++++++++++++++ toolchain-fitnesse-plugin/pom.xml | 41 ++++------ .../nl/praegus/fitnesse/symbols/Fake.java | 7 +- .../MavenProjectVersionsSymbolTest.java | 2 +- 4 files changed, 97 insertions(+), 29 deletions(-) create mode 100644 toolchain-fitnesse-plugin/.github/workflows/master.yml diff --git a/toolchain-fitnesse-plugin/.github/workflows/master.yml b/toolchain-fitnesse-plugin/.github/workflows/master.yml new file mode 100644 index 00000000..05b27627 --- /dev/null +++ b/toolchain-fitnesse-plugin/.github/workflows/master.yml @@ -0,0 +1,76 @@ +name: release + +on: + push: + branches: + - 'master' + +jobs: + maven-release: + runs-on: ubuntu-20.04 + steps: + - name: Check out Git repository + uses: actions/checkout@v3 + - name: Install Java and Maven + uses: actions/setup-java@v3 + with: + distribution: temurin + java-version: 11 + - name: Unsnapshot version + run: mvn versions:set -DremoveSnapshot + - name: Release Maven package + uses: samuelmeuli/action-maven-publish@v1 + with: + server_id: staging + maven_profiles: release + gpg_private_key: ${{ secrets.gpg_private_key }} + gpg_passphrase: ${{ secrets.gpg_passphrase }} + nexus_username: ${{ secrets.MAVEN_USERNAME }} + nexus_password: ${{ secrets.MAVEN_PASSWORD }} + github-release: + needs: [ maven-release ] + runs-on: ubuntu-20.04 + steps: + - name: Check out Git repository + uses: actions/checkout@v3 + - name: Install Java and Maven + uses: actions/setup-java@v3 + with: + distribution: temurin + java-version: 8 + - name: Unsnapshot version + run: mvn versions:set -DremoveSnapshot + - id: get-version + uses: JActions/maven-version@v1.0.0 + - name: Create Release + id: createRelease + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ steps.get-version.outputs.version }} + release_name: "Toolchain FitNesse Fixtures ${{ steps.get-version.outputs.version }}" + body: + draft: false + prerelease: false + update-version: + needs: [maven-release, github-release] + runs-on: ubuntu-20.04 + steps: + - name: Checkout repository + uses: actions/checkout@v3 + - name: Install Java and Maven + uses: actions/setup-java@v3 + with: + distribution: temurin + java-version: 11 + - name: Configure git + run: | + git config --global user.email "tom.heintzberger@praegus.nl" + git config --global user.name "Praegus" + - name: Update version + run: | + mvn -B release:update-versions -DautoVersionSubmodules=true + git add pom.xml + git commit -m "Update version" + git push origin master \ No newline at end of file diff --git a/toolchain-fitnesse-plugin/pom.xml b/toolchain-fitnesse-plugin/pom.xml index 49f2d9d9..e37f12bc 100644 --- a/toolchain-fitnesse-plugin/pom.xml +++ b/toolchain-fitnesse-plugin/pom.xml @@ -13,32 +13,28 @@ ${project.version} + - com.github.javafaker - javafaker - 1.0.2 - - - org.yaml - snakeyaml - - + org.yaml + snakeyaml + 2.2 + org.fitnesse fitnesse - 20221219 + 20231203 provided nl.praegus fitnesse-bootstrap-plus-theme - 2.0.15 + 2.0.16 nl.praegus @@ -48,17 +44,12 @@ org.apache.maven maven-model - 3.8.3 - - - com.github.javafaker - javafaker - 1.0.2 + 3.9.5 - org.yaml - snakeyaml - 2.2 + net.datafaker + datafaker + 1.9.0 @@ -94,10 +85,10 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.11.0 - 8 - 8 + 11 + 11 @@ -159,7 +150,7 @@ Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt + https://www.apache.org/licenses/LICENSE-2.0.txt repo A business-friendly OSS license @@ -273,7 +264,7 @@ org.codehaus.mojo properties-maven-plugin - 1.1.0 + 1.2.1 diff --git a/toolchain-fitnesse-plugin/src/main/java/nl/praegus/fitnesse/symbols/Fake.java b/toolchain-fitnesse-plugin/src/main/java/nl/praegus/fitnesse/symbols/Fake.java index 5a2771f2..d3a91867 100644 --- a/toolchain-fitnesse-plugin/src/main/java/nl/praegus/fitnesse/symbols/Fake.java +++ b/toolchain-fitnesse-plugin/src/main/java/nl/praegus/fitnesse/symbols/Fake.java @@ -1,6 +1,5 @@ package nl.praegus.fitnesse.symbols; -import com.github.javafaker.Faker; import fitnesse.wikitext.parser.Matcher; import fitnesse.wikitext.parser.Maybe; import fitnesse.wikitext.parser.Parser; @@ -9,6 +8,7 @@ import fitnesse.wikitext.parser.SymbolType; import fitnesse.wikitext.parser.Translation; import fitnesse.wikitext.parser.Translator; +import net.datafaker.Faker; import java.util.List; import java.util.Locale; @@ -44,10 +44,11 @@ public String toTarget(Translator translator, Symbol symbol) { Faker faker = new Faker(new Locale(symbol.findProperty(LOCALE, "en"))); String result; try { - Object category = Faker.class.getDeclaredMethod(symbol.findProperty(CATEGORY, "")).invoke(faker); + Object category = Faker.class.getMethod(symbol.findProperty(CATEGORY, "")).invoke(faker); result = category.getClass().getDeclaredMethod(symbol.findProperty(ITEM, "")).invoke(category).toString(); } catch (Exception e) { result = "ERROR_FAKING_DATA"; + e.printStackTrace(); } return result; } @@ -55,7 +56,7 @@ public String toTarget(Translator translator, Symbol symbol) { protected Maybe storeParenthesisContent(Symbol current, Parser parser, String key) { Maybe result = new Maybe<>(current); List lookAhead = parser.peek(new SymbolType[]{SymbolType.Whitespace, SymbolType.OpenParenthesis}); - if (lookAhead.size() != 0) { + if (!lookAhead.isEmpty()) { parser.moveNext(2); Maybe format = parser.parseToAsString(SymbolType.CloseParenthesis); if (format.isNothing()) { diff --git a/toolchain-fitnesse-plugin/src/test/java/nl/praegus/fitnesse/symbols/MavenProjectVersions/MavenProjectVersionsSymbolTest.java b/toolchain-fitnesse-plugin/src/test/java/nl/praegus/fitnesse/symbols/MavenProjectVersions/MavenProjectVersionsSymbolTest.java index cb797e5f..34094ad2 100644 --- a/toolchain-fitnesse-plugin/src/test/java/nl/praegus/fitnesse/symbols/MavenProjectVersions/MavenProjectVersionsSymbolTest.java +++ b/toolchain-fitnesse-plugin/src/test/java/nl/praegus/fitnesse/symbols/MavenProjectVersions/MavenProjectVersionsSymbolTest.java @@ -21,7 +21,7 @@ public void check_If_Html_Contains_FitNesse_Information() throws FileNotFoundExc String expectedValue = "fitnesse" + System.lineSeparator() + "20200404" + System.lineSeparator() + - "20230503" + System.lineSeparator() + + "20231203" + System.lineSeparator() + "Outdated"; String expectedValue2 = "fitnesse";