diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml index afc4cb4..89a68ea 100644 --- a/.github/workflows/build-main.yml +++ b/.github/workflows/build-main.yml @@ -26,11 +26,11 @@ jobs: ${{ runner.os }}-build- ${{ runner.os }}- - - name: Set up JDK 11 + - name: Set up JDK uses: actions/setup-java@v2 with: - java-version: '11' - distribution: 'adopt' + java-version: '21' + distribution: 'temurin' - name: Set up CI environment run: .github/setup.sh - name: Execute the build diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 9f76c2b..66269fd 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -24,11 +24,11 @@ jobs: ${{ runner.os }}-build- ${{ runner.os }}- - - name: Set up JDK 11 + - name: Set up JDK uses: actions/setup-java@v2 with: - java-version: '11' - distribution: 'adopt' + java-version: '21' + distribution: 'temurin' - name: Set up CI environment run: .github/setup.sh - name: Execute the build diff --git a/pom.xml b/pom.xml index b34bd8d..fc966db 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.janelia.saalfeldlab saalfx - 1.3.1-SNAPSHOT + 1.4.0-SNAPSHOT Saal FX Saalfeld lab JavaFX tools and extensions @@ -37,18 +37,19 @@ org.janelia.saalfeldlab.saalfx - 1.9.0 - 11 + 1.9.24 + 21 true + 3.13.0 - 11 - 11 + 21 - 18.0.1 + 22.0.1 4.0.16-alpha 1.4.30 + true @@ -56,7 +57,7 @@ hanslovsky Philipp Hanslovsky hanslovskyp@janelia.hhmi.org - + HHMI Janelia http://janelia.org/ @@ -71,7 +72,7 @@ cmhulbert Caleb Hulbert hulbertc@hhmi.org - + HHMI Janelia http://janelia.org/ @@ -83,9 +84,9 @@ - - none - + + none + @@ -110,7 +111,7 @@ scm:git:git://github.com/saalfeldlab/saalfx scm:git:git@github.com:saalfeldlab/saalfx.git - saalfx-1.2.0 + saalfx-1.3.0 https://github.com/saalfeldlab/saalfx @@ -235,7 +236,7 @@ org.testfx openjfx-monocle - jdk-12.0.1+2 + 21.0.2 test