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

Updated dependencies and fixed test #35

Merged
merged 2 commits into from
Jan 17, 2023
Merged

Updated dependencies and fixed test #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d15999d
Updated dependencies and fixed test
joroelev Jan 17, 2023
420e066
Updating Github checkout action version to v3
joroelev Jan 17, 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: 1 addition & 1 deletion .github/workflows/AutomatedBuild_PR.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Run all java testcases
run: mvn test --file toolchain-fitnesse-plugin/pom.xml
50 changes: 25 additions & 25 deletions toolchain-fitnesse-plugin-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,36 +7,36 @@

<groupId>nl.praegus</groupId>
<artifactId>toolchain-fitnesse-plugin-test</artifactId>
<version>2.0.5-SNAPSHOT</version>
<version>2.0.15-SNAPSHOT</version>

<properties>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<fitnesse.version>20200501</fitnesse.version>
<hsac.fixtures.version>4.15.3</hsac.fixtures.version>
<toolchain.fixtures.version>1.21</toolchain.fixtures.version>
<!-- toolchain-plugin.version>${project.version}</toolchain-plugin.version-->
<fitnesse.version>20221219</fitnesse.version>
<hsac.fixtures.version>5.2.25</hsac.fixtures.version>
<toolchain.fixtures.version>1.31</toolchain.fixtures.version>
<toolchain-plugin.version>${project.version}</toolchain-plugin.version>
<!-- classpath that Fitnesse uses when not starting from IDE/maven -->
<standalone.classpath>wiki/fixtures</standalone.classpath>
<fitnesse.port>9090</fitnesse.port>
</properties>
<dependencies>
<dependency>
<groupId>org.fitnesse</groupId>
<artifactId>fitnesse</artifactId>
<version>${fitnesse.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>nl.hsac</groupId>
<artifactId>hsac-fitnesse-fixtures</artifactId>
<version>${hsac.fixtures.version}</version>
</dependency>
<dependency>
<groupId>nl.praegus</groupId>
<artifactId>toolchain-fixtures</artifactId>
<version>${toolchain.fixtures.version}</version>
</dependency>
</dependencies>
<dependencies>
<dependency>
<groupId>org.fitnesse</groupId>
<artifactId>fitnesse</artifactId>
<version>${fitnesse.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>nl.hsac</groupId>
<artifactId>hsac-fitnesse-fixtures</artifactId>
<version>${hsac.fixtures.version}</version>
</dependency>
<dependency>
<groupId>nl.praegus</groupId>
<artifactId>toolchain-fixtures</artifactId>
<version>${toolchain.fixtures.version}</version>
</dependency>
</dependencies>
<build>
<outputDirectory>${standalone.classpath}</outputDirectory>
<plugins>
Expand Down Expand Up @@ -127,8 +127,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>8</source>
<target>8</target>
<source>11</source>
<target>11</target>
<encoding>${project.build.sourceEncoding}</encoding>
<showDeprecation>true</showDeprecation>
</configuration>
Expand Down
22 changes: 11 additions & 11 deletions toolchain-fitnesse-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<dependency>
<groupId>org.fitnesse</groupId>
<artifactId>fitnesse</artifactId>
<version>20210606</version>
<version>20221219</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -30,11 +30,11 @@
<groupId>nl.praegus</groupId>
<artifactId>fitnesse-autocomplete-responder</artifactId>
<version>1.0.19</version>
</dependency>
</dependency >
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>3.6.3</version>
<version>3.8.3</version>
</dependency>
<dependency>
<groupId>com.github.javafaker</groupId>
Expand All @@ -44,14 +44,14 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<!-- use 2.9.1 for Java 7 projects -->
<version>3.11.1</version>
<version>3.23.1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -83,7 +83,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.0.0</version>
<version>3.2.0</version>
<configuration>
<!-- get all project dependencies -->
<descriptorRefs>
Expand Down Expand Up @@ -186,7 +186,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.0.0</version>
<version>3.2.0</version>
<configuration>
<!-- get all project dependencies -->
<descriptorRefs>
Expand All @@ -207,7 +207,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.4</version>
<version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -221,7 +221,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.0</version>
<configuration>
<source>8</source>
</configuration>
Expand All @@ -239,7 +239,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<version>3.0.1</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand All @@ -253,7 +253,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.0.0</version>
<version>1.1.0</version>
<executions>
<execution>
<goals>
Expand Down
2 changes: 1 addition & 1 deletion ...java/nl/praegus/fitnesse/symbols/MavenProjectVersions/MavenProjectVersionsSymbolTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public void check_If_Html_Contains_FitNesse_Information() throws FileNotFoundExc

String expectedValue = "<tr><td>fitnesse</td>" + System.lineSeparator() +
"<td>20200404</td>" + System.lineSeparator() +
"<td>20211030</td>" + System.lineSeparator() +
"<td>20221219</td>" + System.lineSeparator() +
"<td class=\"Outdated\">Outdated</td>";

String expectedValue2 = "<a href=\"http://fitnesse.org/FitNesse.ReleaseNotes\" target=\"_blank\">fitnesse</a>";
Expand Down