Skip to content

Commit

Permalink
[#152] Upgrade dependency versions
Browse files Browse the repository at this point in the history
  • Loading branch information
@susanw1
susanw1 committed Jul 2, 2024
1 parent a65d2e1 commit 906b94a
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 55 deletions.
4 changes: 2 additions & 2 deletions demo/demo-01/client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<version>18.0.2</version>
<version>${version.javafx}</version>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-fxml</artifactId>
<version>18.0.2</version>
<version>${version.javafx}</version>
</dependency>
</dependencies>

Expand Down
31 changes: 2 additions & 29 deletions demo/demo-morse/client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
<version>4.7.5</version>
<version>${version.picocli}</version>
</dependency>
<dependency>
<groupId>net.zscript</groupId>
Expand All @@ -35,32 +35,5 @@
<artifactId>logback-classic</artifactId>
<version>${version.logback}</version>
</dependency>

<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<version>18.0.2</version>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-fxml</artifactId>
<version>18.0.2</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<!-- To run, use: mvn -pl net.zscript.demo:demo-01-client install javafx:run -->
<groupId>org.openjfx</groupId>
<artifactId>javafx-maven-plugin</artifactId>
<version>0.0.8</version>
<configuration>
<mainClass>net.zscript.demo01.client.ui.UiMain</mainClass>
<!-- <jlinkImageName>zscript_demo_01</jlinkImageName>-->
<!-- <launcher>launcher</launcher>-->
</configuration>
</plugin>
</plugins>
</build>
</project>
</project>
2 changes: 1 addition & 1 deletion model/schema/src/main/resources/zscript-datamodel/intrinsics.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ intrinsics:
statusCategories:
- &statusCategory_success
name: success
description: command completed successfully wither failure or error
description: command completed successfully, not failure or error
baseId: 0x00

- &statusCategory_failure
Expand Down
48 changes: 25 additions & 23 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,37 +19,39 @@
<java.source.version>11</java.source.version>
<java.target.version>11</java.target.version>

<version.slf4j>2.0.7</version.slf4j>
<version.logback>1.4.6</version.logback>
<version.jackson>2.15.2</version.jackson>
<version.antlr>4.13.0</version.antlr>
<version.slf4j>2.0.13</version.slf4j>
<version.logback>1.5.6</version.logback>
<version.jackson>2.15.4</version.jackson>
<version.antlr>4.13.1</version.antlr>
<version.picocli>4.7.6</version.picocli>
<version.javafx>18.0.2</version.javafx>

<!-- test dependency versions -->
<version.junit>5.10.0-M1</version.junit>
<version.cucumber>7.11.2</version.cucumber>
<version.assertj>3.24.2</version.assertj>
<version.mockito>5.3.1</version.mockito>
<version.awaitility>4.2.0</version.awaitility>
<version.junit>5.10.3</version.junit>
<version.cucumber>7.18.0</version.cucumber>
<version.assertj>3.26.0</version.assertj>
<version.mockito>5.12.0</version.mockito>
<version.awaitility>4.2.1</version.awaitility>
<version.jimfs>1.3.0</version.jimfs>
<version.equalsverifier>3.15.1</version.equalsverifier>
<version.apachecommons>2.13.0</version.apachecommons>
<version.equalsverifier>3.16.1</version.equalsverifier>
<version.apachecommons>2.16.1</version.apachecommons>

<!-- plugin dependency versions -->
<version.nar-maven-plugin>3.10.2-alpha</version.nar-maven-plugin>
<version.jacoco-maven-plugin>0.8.10</version.jacoco-maven-plugin>
<version.exec-maven-plugin>3.0.0</version.exec-maven-plugin>
<version.maven-compiler-plugin>3.10.1</version.maven-compiler-plugin>
<version.maven-surefire-plugin>3.0.0-M5</version.maven-surefire-plugin>
<version.maven-failsafe-plugin>3.0.0-M5</version.maven-failsafe-plugin>
<version.maven-assembly-plugin>3.4.2</version.maven-assembly-plugin>
<version.maven-enforcer-plugin>3.4.2</version.maven-enforcer-plugin>
<version.jacoco-maven-plugin>0.8.12</version.jacoco-maven-plugin>
<version.exec-maven-plugin>3.3.0</version.exec-maven-plugin>
<version.maven-compiler-plugin>3.13.0</version.maven-compiler-plugin>
<version.maven-surefire-plugin>3.3.0</version.maven-surefire-plugin>
<version.maven-failsafe-plugin>3.3.0</version.maven-failsafe-plugin>
<version.maven-assembly-plugin>3.7.1</version.maven-assembly-plugin>
<version.maven-enforcer-plugin>3.5.0</version.maven-enforcer-plugin>
<version.mustache-templating-maven-plugin>0.0.1</version.mustache-templating-maven-plugin>

<version.maven-javadoc-plugin>3.6.0</version.maven-javadoc-plugin>
<version.maven-source-plugin>2.2.1</version.maven-source-plugin>
<version.maven-gpg-plugin>1.5</version.maven-gpg-plugin>
<version.maven-release-plugin>3.0.1</version.maven-release-plugin>
<version.maven-nexus-staging-plugin>1.6.13</version.maven-nexus-staging-plugin>
<version.maven-javadoc-plugin>3.7.0</version.maven-javadoc-plugin>
<version.maven-source-plugin>3.3.1</version.maven-source-plugin>
<version.maven-gpg-plugin>3.2.4</version.maven-gpg-plugin>
<version.maven-release-plugin>3.1.0</version.maven-release-plugin>
<version.maven-nexus-staging-plugin>1.7.0</version.maven-nexus-staging-plugin>
</properties>

<modules>
Expand Down

0 comments on commit 906b94a

Please sign in to comment.