Merge pull request #75 from nickebbutt/master

Fix vulnerabilities
Chorus-bdd · Dec 29, 2024 · ce7a58f · ce7a58f
2 parents 15372a9 + e2a9547
commit ce7a58f
Show file tree

Hide file tree

Showing 655 changed files with 658 additions and 658 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -31,7 +31,7 @@ jobs:
         arguments: build
     - name: Upload Test Results
       if: always()
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: Upload Integration Test Reports
         path: integrationtest/build/reports
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Chorus BDD Organisation.
+Copyright (c) 2025 Chorus BDD Organisation.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/extensions/chorus-selenium/LICENSE b/extensions/chorus-selenium/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Chorus BDD Organisation.
+Copyright (c) 2025 Chorus BDD Organisation.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/extensions/chorus-selenium/src/main/java/org/chorusbdd/chorus/selenium/SeleniumHandler.java b/extensions/chorus-selenium/src/main/java/org/chorusbdd/chorus/selenium/SeleniumHandler.java
@@ -1,7 +1,7 @@
 /**
  * MIT License
  *
- * Copyright (c) 2023 Chorus BDD Organisation.
+ * Copyright (c) 2025 Chorus BDD Organisation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...orus-selenium/src/main/java/org/chorusbdd/chorus/selenium/SeleniumLoggingSuppression.java b/...orus-selenium/src/main/java/org/chorusbdd/chorus/selenium/SeleniumLoggingSuppression.java
@@ -1,7 +1,7 @@
 /**
  * MIT License
  *
- * Copyright (c) 2023 Chorus BDD Organisation.
+ * Copyright (c) 2025 Chorus BDD Organisation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...ns/chorus-selenium/src/main/java/org/chorusbdd/chorus/selenium/config/DriverLogLevel.java b/...ns/chorus-selenium/src/main/java/org/chorusbdd/chorus/selenium/config/DriverLogLevel.java
@@ -1,7 +1,7 @@
 /**
  * MIT License
  *
- * Copyright (c) 2023 Chorus BDD Organisation.
+ * Copyright (c) 2025 Chorus BDD Organisation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...ns/chorus-selenium/src/main/java/org/chorusbdd/chorus/selenium/config/SeleniumConfig.java b/...ns/chorus-selenium/src/main/java/org/chorusbdd/chorus/selenium/config/SeleniumConfig.java
@@ -1,7 +1,7 @@
 /**
  * MIT License
  *
- * Copyright (c) 2023 Chorus BDD Organisation.
+ * Copyright (c) 2025 Chorus BDD Organisation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...horus-selenium/src/main/java/org/chorusbdd/chorus/selenium/config/SeleniumConfigBean.java b/...horus-selenium/src/main/java/org/chorusbdd/chorus/selenium/config/SeleniumConfigBean.java
@@ -1,7 +1,7 @@
 /**
  * MIT License
  *
- * Copyright (c) 2023 Chorus BDD Organisation.
+ * Copyright (c) 2025 Chorus BDD Organisation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...horus-selenium/src/main/java/org/chorusbdd/chorus/selenium/config/SeleniumDriverType.java b/...horus-selenium/src/main/java/org/chorusbdd/chorus/selenium/config/SeleniumDriverType.java
@@ -1,7 +1,7 @@
 /**
  * MIT License
  *
- * Copyright (c) 2023 Chorus BDD Organisation.
+ * Copyright (c) 2025 Chorus BDD Organisation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...selenium/src/main/java/org/chorusbdd/chorus/selenium/manager/DefaultWebDriverFactory.java b/...selenium/src/main/java/org/chorusbdd/chorus/selenium/manager/DefaultWebDriverFactory.java
@@ -1,7 +1,7 @@
 /**
  * MIT License
  *
- * Copyright (c) 2023 Chorus BDD Organisation.
+ * Copyright (c) 2025 Chorus BDD Organisation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...s/chorus-selenium/src/main/java/org/chorusbdd/chorus/selenium/manager/NamedWebDriver.java b/...s/chorus-selenium/src/main/java/org/chorusbdd/chorus/selenium/manager/NamedWebDriver.java
@@ -1,7 +1,7 @@
 /**
  * MIT License
  *
- * Copyright (c) 2023 Chorus BDD Organisation.
+ * Copyright (c) 2025 Chorus BDD Organisation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/.../chorus-selenium/src/main/java/org/chorusbdd/chorus/selenium/manager/SeleniumManager.java b/.../chorus-selenium/src/main/java/org/chorusbdd/chorus/selenium/manager/SeleniumManager.java
@@ -1,7 +1,7 @@
 /**
  * MIT License
  *
- * Copyright (c) 2023 Chorus BDD Organisation.
+ * Copyright (c) 2025 Chorus BDD Organisation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...rus-selenium/src/main/java/org/chorusbdd/chorus/selenium/manager/SeleniumManagerImpl.java b/...rus-selenium/src/main/java/org/chorusbdd/chorus/selenium/manager/SeleniumManagerImpl.java
@@ -1,7 +1,7 @@
 /**
  * MIT License
  *
- * Copyright (c) 2023 Chorus BDD Organisation.
+ * Copyright (c) 2025 Chorus BDD Organisation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...chorus-selenium/src/main/java/org/chorusbdd/chorus/selenium/manager/WebDriverFactory.java b/...chorus-selenium/src/main/java/org/chorusbdd/chorus/selenium/manager/WebDriverFactory.java
@@ -1,7 +1,7 @@
 /**
  * MIT License
  *
- * Copyright (c) 2023 Chorus BDD Organisation.
+ * Copyright (c) 2025 Chorus BDD Organisation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/extensions/chorus-spring/LICENSE b/extensions/chorus-spring/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Chorus BDD Organisation.
+Copyright (c) 2025 Chorus BDD Organisation.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/extensions/chorus-spring/build.gradle b/extensions/chorus-spring/build.gradle
@@ -11,8 +11,8 @@ sourceSets {
 
 dependencies {
     implementation group: 'javax.annotation', name: 'jsr250-api', version: '1.0'
-    implementation group: 'org.springframework', name: 'spring-beans', version: '5.3.9'
-    implementation group: 'org.springframework', name: 'spring-context', version: '5.3.9'
-    implementation group: 'org.springframework', name: 'spring-test', version: '5.3.9'
+    implementation group: 'org.springframework', name: 'spring-beans', version: '5.3.39'
+    implementation group: 'org.springframework', name: 'spring-context', version: '5.3.39'
+    implementation group: 'org.springframework', name: 'spring-test', version: '5.3.39'
     testImplementation group: 'junit', name: 'junit', version: '4.13.2'
 }
diff --git a/...nsions/chorus-spring/src/main/java/org/chorusbdd/chorus/spring/SpringContextInjector.java b/...nsions/chorus-spring/src/main/java/org/chorusbdd/chorus/spring/SpringContextInjector.java
@@ -1,7 +1,7 @@
 /**
  * MIT License
  *
- * Copyright (c) 2023 Chorus BDD Organisation.
+ * Copyright (c) 2025 Chorus BDD Organisation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...sions/chorus-spring/src/test/java/org/chorusbdd/chorus/spring/selftest/TestSelfTests.java b/...sions/chorus-spring/src/test/java/org/chorusbdd/chorus/spring/selftest/TestSelfTests.java
@@ -1,7 +1,7 @@
 /**
  * MIT License
  *
- * Copyright (c) 2023 Chorus BDD Organisation.
+ * Copyright (c) 2025 Chorus BDD Organisation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...orus-spring/src/test/java/org/chorusbdd/chorus/spring/selftest/calculator/Calculator.java b/...orus-spring/src/test/java/org/chorusbdd/chorus/spring/selftest/calculator/Calculator.java
@@ -1,7 +1,7 @@
 /**
  * MIT License
  *
- * Copyright (c) 2023 Chorus BDD Organisation.
+ * Copyright (c) 2025 Chorus BDD Organisation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...ring/src/test/java/org/chorusbdd/chorus/spring/selftest/calculator/CalculatorHandler.java b/...ring/src/test/java/org/chorusbdd/chorus/spring/selftest/calculator/CalculatorHandler.java
@@ -1,7 +1,7 @@
 /**
  * MIT License
  *
- * Copyright (c) 2023 Chorus BDD Organisation.
+ * Copyright (c) 2025 Chorus BDD Organisation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...est/java/org/chorusbdd/chorus/spring/selftest/calculator/ExportCalculatorHandlerMain.java b/...est/java/org/chorusbdd/chorus/spring/selftest/calculator/ExportCalculatorHandlerMain.java
@@ -1,7 +1,7 @@
 /**
  * MIT License
  *
- * Copyright (c) 2023 Chorus BDD Organisation.
+ * Copyright (c) 2025 Chorus BDD Organisation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/.../org/chorusbdd/chorus/spring/selftest/calculator/ExportCalculatorWithTwoHandlersMain.java b/.../org/chorusbdd/chorus/spring/selftest/calculator/ExportCalculatorWithTwoHandlersMain.java
@@ -1,7 +1,7 @@
 /**
  * MIT License
  *
- * Copyright (c) 2023 Chorus BDD Organisation.
+ * Copyright (c) 2025 Chorus BDD Organisation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...s/spring/selftest/configurations_with_spring/ConfigurationsWithSpringFixturesHandler.java b/...s/spring/selftest/configurations_with_spring/ConfigurationsWithSpringFixturesHandler.java
@@ -1,7 +1,7 @@
 /**
  * MIT License
  *
- * Copyright (c) 2023 Chorus BDD Organisation.
+ * Copyright (c) 2025 Chorus BDD Organisation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/extensions/chorus-sql/LICENSE b/extensions/chorus-sql/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Chorus BDD Organisation.
+Copyright (c) 2025 Chorus BDD Organisation.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/extensions/chorus-sql/src/main/java/org/chorusbdd/chorus/sql/SqlHandler.java b/extensions/chorus-sql/src/main/java/org/chorusbdd/chorus/sql/SqlHandler.java
@@ -1,7 +1,7 @@
 /**
  * MIT License
  *
- * Copyright (c) 2023 Chorus BDD Organisation.
+ * Copyright (c) 2025 Chorus BDD Organisation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/extensions/chorus-sql/src/main/java/org/chorusbdd/chorus/sql/config/SqlConfig.java b/extensions/chorus-sql/src/main/java/org/chorusbdd/chorus/sql/config/SqlConfig.java
@@ -1,7 +1,7 @@
 /**
  * MIT License
  *
- * Copyright (c) 2023 Chorus BDD Organisation.
+ * Copyright (c) 2025 Chorus BDD Organisation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/extensions/chorus-sql/src/main/java/org/chorusbdd/chorus/sql/config/SqlConfigBean.java b/extensions/chorus-sql/src/main/java/org/chorusbdd/chorus/sql/config/SqlConfigBean.java
@@ -1,7 +1,7 @@
 /**
  * MIT License
  *
- * Copyright (c) 2023 Chorus BDD Organisation.
+ * Copyright (c) 2025 Chorus BDD Organisation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/extensions/chorus-sql/src/main/java/org/chorusbdd/chorus/sql/manager/DefaultSqlManager.java b/extensions/chorus-sql/src/main/java/org/chorusbdd/chorus/sql/manager/DefaultSqlManager.java
@@ -1,7 +1,7 @@
 /**
  * MIT License
  *
- * Copyright (c) 2023 Chorus BDD Organisation.
+ * Copyright (c) 2025 Chorus BDD Organisation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/extensions/chorus-sql/src/main/java/org/chorusbdd/chorus/sql/manager/SqlManager.java b/extensions/chorus-sql/src/main/java/org/chorusbdd/chorus/sql/manager/SqlManager.java
@@ -1,7 +1,7 @@
 /**
  * MIT License
  *
- * Copyright (c) 2023 Chorus BDD Organisation.
+ * Copyright (c) 2025 Chorus BDD Organisation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/extensions/chorus-websockets/LICENSE b/extensions/chorus-websockets/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Chorus BDD Organisation.
+Copyright (c) 2025 Chorus BDD Organisation.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/extensions/chorus-websockets/build.gradle b/extensions/chorus-websockets/build.gradle
@@ -3,7 +3,7 @@ description = "chorus-websockets"
 
 dependencies {
     implementation group: 'org.java-websocket', name: 'Java-WebSocket', version: '1.5.2'
-    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.12.4'
+    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.13.4.2'
     runtimeOnly group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.17.1'
     runtimeOnly group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.17.1'
 

diff --git a/...horus-websockets/src/main/java/org/chorusbdd/chorus/websockets/ChorusWebSocketServer.java b/...horus-websockets/src/main/java/org/chorusbdd/chorus/websockets/ChorusWebSocketServer.java
@@ -1,7 +1,7 @@
 /**
  * MIT License
  *
- * Copyright (c) 2023 Chorus BDD Organisation.
+ * Copyright (c) 2025 Chorus BDD Organisation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...s-websockets/src/main/java/org/chorusbdd/chorus/websockets/ClientConnectionException.java b/...s-websockets/src/main/java/org/chorusbdd/chorus/websockets/ClientConnectionException.java
@@ -1,7 +1,7 @@
 /**
  * MIT License
  *
- * Copyright (c) 2023 Chorus BDD Organisation.
+ * Copyright (c) 2025 Chorus BDD Organisation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...chorus-websockets/src/main/java/org/chorusbdd/chorus/websockets/InvalidStepException.java b/...chorus-websockets/src/main/java/org/chorusbdd/chorus/websockets/InvalidStepException.java
@@ -1,7 +1,7 @@
 /**
  * MIT License
  *
- * Copyright (c) 2023 Chorus BDD Organisation.
+ * Copyright (c) 2025 Chorus BDD Organisation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/.../chorus-websockets/src/main/java/org/chorusbdd/chorus/websockets/StepFailedException.java b/.../chorus-websockets/src/main/java/org/chorusbdd/chorus/websockets/StepFailedException.java
@@ -1,7 +1,7 @@
 /**
  * MIT License
  *
- * Copyright (c) 2023 Chorus BDD Organisation.
+ * Copyright (c) 2025 Chorus BDD Organisation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...-websockets/src/main/java/org/chorusbdd/chorus/websockets/WebSocketClientStepInvoker.java b/...-websockets/src/main/java/org/chorusbdd/chorus/websockets/WebSocketClientStepInvoker.java
@@ -1,7 +1,7 @@
 /**
  * MIT License
  *
- * Copyright (c) 2023 Chorus BDD Organisation.
+ * Copyright (c) 2025 Chorus BDD Organisation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...s-websockets/src/main/java/org/chorusbdd/chorus/websockets/WebSocketMessageProcessor.java b/...s-websockets/src/main/java/org/chorusbdd/chorus/websockets/WebSocketMessageProcessor.java
@@ -1,7 +1,7 @@
 /**
  * MIT License
  *
- * Copyright (c) 2023 Chorus BDD Organisation.
+ * Copyright (c) 2025 Chorus BDD Organisation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...orus-websockets/src/main/java/org/chorusbdd/chorus/websockets/WebSocketMessageRouter.java b/...orus-websockets/src/main/java/org/chorusbdd/chorus/websockets/WebSocketMessageRouter.java
@@ -1,7 +1,7 @@
 /**
  * MIT License
  *
- * Copyright (c) 2023 Chorus BDD Organisation.
+ * Copyright (c) 2025 Chorus BDD Organisation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...ns/chorus-websockets/src/main/java/org/chorusbdd/chorus/websockets/WebSocketsManager.java b/...ns/chorus-websockets/src/main/java/org/chorusbdd/chorus/websockets/WebSocketsManager.java
@@ -1,7 +1,7 @@
 /**
  * MIT License
  *
- * Copyright (c) 2023 Chorus BDD Organisation.
+ * Copyright (c) 2025 Chorus BDD Organisation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...horus-websockets/src/main/java/org/chorusbdd/chorus/websockets/WebSocketsManagerImpl.java b/...horus-websockets/src/main/java/org/chorusbdd/chorus/websockets/WebSocketsManagerImpl.java
@@ -1,7 +1,7 @@
 /**
  * MIT License
  *
- * Copyright (c) 2023 Chorus BDD Organisation.
+ * Copyright (c) 2025 Chorus BDD Organisation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...ebsockets/src/main/java/org/chorusbdd/chorus/websockets/client/ChorusWebSocketClient.java b/...ebsockets/src/main/java/org/chorusbdd/chorus/websockets/client/ChorusWebSocketClient.java
@@ -1,7 +1,7 @@
 /**
  * MIT License
  *
- * Copyright (c) 2023 Chorus BDD Organisation.
+ * Copyright (c) 2025 Chorus BDD Organisation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...kets/src/main/java/org/chorusbdd/chorus/websockets/client/StepClientMessageProcessor.java b/...kets/src/main/java/org/chorusbdd/chorus/websockets/client/StepClientMessageProcessor.java
@@ -1,7 +1,7 @@
 /**
  * MIT License
  *
- * Copyright (c) 2023 Chorus BDD Organisation.
+ * Copyright (c) 2025 Chorus BDD Organisation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...sockets/src/main/java/org/chorusbdd/chorus/websockets/client/StepClientMessageRouter.java b/...sockets/src/main/java/org/chorusbdd/chorus/websockets/client/StepClientMessageRouter.java
@@ -1,7 +1,7 @@
 /**
  * MIT License
  *
- * Copyright (c) 2023 Chorus BDD Organisation.
+ * Copyright (c) 2025 Chorus BDD Organisation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...bsockets/src/main/java/org/chorusbdd/chorus/websockets/client/StepPublisherException.java b/...bsockets/src/main/java/org/chorusbdd/chorus/websockets/client/StepPublisherException.java
@@ -1,7 +1,7 @@
 /**
  * MIT License
  *
- * Copyright (c) 2023 Chorus BDD Organisation.
+ * Copyright (c) 2025 Chorus BDD Organisation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal