diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9e9af3491..752452721 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,14 +13,13 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - jdk: [8, 11, 17] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 - name: Set up JDK uses: actions/setup-java@v2 with: - java-version: ${{ matrix.jdk }} + java-version: 21 distribution: temurin - name: Cache Maven packages uses: actions/cache@v2 @@ -29,6 +28,6 @@ jobs: key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - name: Maven Build - run: mvn -V -B -DskipTests=true install + run: mvn -V -B -DskipTests=true install -DnvdApiKey=${{ secrets.NVD_API_KEY }} - name: Maven Test - run: mvn -B verify \ No newline at end of file + run: mvn -B verify -DnvdApiKey=${{ secrets.NVD_API_KEY }} \ No newline at end of file diff --git a/droid-binary/dependency-check/suppressions.xml b/droid-binary/dependency-check/suppressions.xml index 4228988f8..fbf9371b9 100644 --- a/droid-binary/dependency-check/suppressions.xml +++ b/droid-binary/dependency-check/suppressions.xml @@ -1,11 +1,3 @@ - - - ^pkg:maven/org\.apache\.derby/derby@.*$ - CVE-2022-46337 - - diff --git a/droid-binary/pom.xml b/droid-binary/pom.xml index 23d870fd3..29231f70c 100644 --- a/droid-binary/pom.xml +++ b/droid-binary/pom.xml @@ -34,7 +34,7 @@ - https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_x64_windows_hotspot_17.0.11_9.zip + https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_x64_windows_hotspot_21.0.5_11.zip false ${project.build.directory} @@ -55,9 +55,9 @@ - + - + diff --git a/droid-command-line/dependency-check/suppressions.xml b/droid-command-line/dependency-check/suppressions.xml index 4228988f8..fbf9371b9 100644 --- a/droid-command-line/dependency-check/suppressions.xml +++ b/droid-command-line/dependency-check/suppressions.xml @@ -1,11 +1,3 @@ - - - ^pkg:maven/org\.apache\.derby/derby@.*$ - CVE-2022-46337 - - diff --git a/droid-command-line/src/test/java/uk/gov/nationalarchives/droid/command/DroidCommandLineTest.java b/droid-command-line/src/test/java/uk/gov/nationalarchives/droid/command/DroidCommandLineTest.java index 2901bf3e5..47a529396 100644 --- a/droid-command-line/src/test/java/uk/gov/nationalarchives/droid/command/DroidCommandLineTest.java +++ b/droid-command-line/src/test/java/uk/gov/nationalarchives/droid/command/DroidCommandLineTest.java @@ -32,7 +32,6 @@ package uk.gov.nationalarchives.droid.command; import junit.framework.Assert; -import net.bytebuddy.asm.Advice; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; diff --git a/droid-export/dependency-check/suppressions.xml b/droid-export/dependency-check/suppressions.xml index 4228988f8..fbf9371b9 100644 --- a/droid-export/dependency-check/suppressions.xml +++ b/droid-export/dependency-check/suppressions.xml @@ -1,11 +1,3 @@ - - - ^pkg:maven/org\.apache\.derby/derby@.*$ - CVE-2022-46337 - - diff --git a/droid-export/src/test/resources/jpa-test.properties b/droid-export/src/test/resources/jpa-test.properties index 208db5ba5..fce6bdd91 100644 --- a/droid-export/src/test/resources/jpa-test.properties +++ b/droid-export/src/test/resources/jpa-test.properties @@ -30,7 +30,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -datasource.driverClassName=org.apache.derby.jdbc.EmbeddedDriver +datasource.driverClassName=org.apache.derby.iapi.jdbc.AutoloadedDriver datasource.url=jdbc:derby:droid-test-db;create=true datasource.username=droid_user datasource.password=droid_user diff --git a/droid-parent/pom.xml b/droid-parent/pom.xml index 401118885..35b73d6ed 100644 --- a/droid-parent/pom.xml +++ b/droid-parent/pom.xml @@ -91,7 +91,7 @@ 5.3.27 5.4.1.Final - 10.13.1.1 + 10.17.1.0 3.5.9 2.1.0 2.3.1 @@ -764,7 +764,7 @@ Copyright © ${project.inceptionYear}-{currentYear} - - - ^pkg:maven/org\.apache\.derby/derby@.*$ - CVE-2022-46337 - diff --git a/droid-report/dependency-check/suppressions.xml b/droid-report/dependency-check/suppressions.xml index 4228988f8..fbf9371b9 100644 --- a/droid-report/dependency-check/suppressions.xml +++ b/droid-report/dependency-check/suppressions.xml @@ -1,11 +1,3 @@ - - - ^pkg:maven/org\.apache\.derby/derby@.*$ - CVE-2022-46337 - - diff --git a/droid-report/src/test/resources/jpa-test.properties b/droid-report/src/test/resources/jpa-test.properties index bfdefd9f4..c7b41fd19 100644 --- a/droid-report/src/test/resources/jpa-test.properties +++ b/droid-report/src/test/resources/jpa-test.properties @@ -30,7 +30,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -datasource.driverClassName=org.apache.derby.jdbc.EmbeddedDriver +datasource.driverClassName=org.apache.derby.iapi.jdbc.AutoloadedDriver datasource.url=jdbc:derby:droid-test-db;create=true datasource.username=droid_user datasource.password=droid_user diff --git a/droid-results/dependency-check/suppressions.xml b/droid-results/dependency-check/suppressions.xml index 4228988f8..fbf9371b9 100644 --- a/droid-results/dependency-check/suppressions.xml +++ b/droid-results/dependency-check/suppressions.xml @@ -1,11 +1,3 @@ - - - ^pkg:maven/org\.apache\.derby/derby@.*$ - CVE-2022-46337 - - diff --git a/droid-results/src/main/resources/jpa.properties b/droid-results/src/main/resources/jpa.properties index dae75ce9a..f12167b69 100644 --- a/droid-results/src/main/resources/jpa.properties +++ b/droid-results/src/main/resources/jpa.properties @@ -30,7 +30,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -datasource.driverClassName=org.apache.derby.jdbc.EmbeddedDriver +datasource.driverClassName=org.apache.derby.iapi.jdbc.AutoloadedDriver datasource.username=droid_user datasource.password=droid_user datasource.maxActive=100 diff --git a/droid-results/src/test/java/uk/gov/nationalarchives/droid/profile/ProfileManagerImplTest.java b/droid-results/src/test/java/uk/gov/nationalarchives/droid/profile/ProfileManagerImplTest.java index 6ae5d4d51..fcd86ef1f 100644 --- a/droid-results/src/test/java/uk/gov/nationalarchives/droid/profile/ProfileManagerImplTest.java +++ b/droid-results/src/test/java/uk/gov/nationalarchives/droid/profile/ProfileManagerImplTest.java @@ -72,7 +72,7 @@ */ public class ProfileManagerImplTest { - private static final String DERBY_DRIVER_CLASSNAME = "org.apache.derby.jdbc.EmbeddedDriver"; + private static final String DERBY_DRIVER_CLASSNAME = "org.apache.derby.iapi.jdbc.AutoloadedDriver"; private ProfileManagerImpl profileManager; private ProfileSpecDao profileSpecDao; diff --git a/droid-results/src/test/resources/jpa-test.properties b/droid-results/src/test/resources/jpa-test.properties index 7696338d6..30eeeddea 100644 --- a/droid-results/src/test/resources/jpa-test.properties +++ b/droid-results/src/test/resources/jpa-test.properties @@ -30,7 +30,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -datasource.driverClassName=org.apache.derby.jdbc.EmbeddedDriver +datasource.driverClassName=org.apache.derby.iapi.jdbc.AutoloadedDriver datasource.url=jdbc:derby:target/droid-test-db;create=true datasource.username=droid_user datasource.password=droid_user diff --git a/droid-swing-ui/dependency-check/suppressions.xml b/droid-swing-ui/dependency-check/suppressions.xml index 4228988f8..fbf9371b9 100644 --- a/droid-swing-ui/dependency-check/suppressions.xml +++ b/droid-swing-ui/dependency-check/suppressions.xml @@ -1,11 +1,3 @@ - - - ^pkg:maven/org\.apache\.derby/derby@.*$ - CVE-2022-46337 - - diff --git a/droid-swing-ui/src/main/java/uk/gov/nationalarchives/droid/gui/filechooser/ProfileFileChooser.java b/droid-swing-ui/src/main/java/uk/gov/nationalarchives/droid/gui/filechooser/ProfileFileChooser.java index 544c02483..8168faa6d 100644 --- a/droid-swing-ui/src/main/java/uk/gov/nationalarchives/droid/gui/filechooser/ProfileFileChooser.java +++ b/droid-swing-ui/src/main/java/uk/gov/nationalarchives/droid/gui/filechooser/ProfileFileChooser.java @@ -59,6 +59,7 @@ protected void setup(FileSystemView view) { FileNameExtensionFilter filter = new FileNameExtensionFilter("DROID 6 profile", "droid"); addChoosableFileFilter(filter); setFileFilter(filter); + setMultiSelectionEnabled(false); } /**