diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index ae9aff7db..6494c0cce 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -68,7 +68,7 @@ jobs: - name: Set version run : mvn versions:set -DnewVersion=${{ needs.get-version.outputs.semVerStr }} - name: Run maven - run: mvn -B clean package -Plinux -DskipTests + run: mvn -B clean package -Plinux -DskipTests -Djavafx.platform=linux - name: Patch target dir run: | cp LICENSE.txt target diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c38bb49e3..7e86b61ea 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,7 @@ jobs: - name: Build and Test run: > xvfb-run - mvn -B verify + mvn -B verify -Djavafx.platform=linux jacoco:report org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Pcoverage diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index 3f628c121..16b156e7d 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -53,7 +53,7 @@ jobs: check-latest: true cache: 'maven' - name: Run maven - run: mvn -B clean package -Plinux -DskipTests + run: mvn -B clean package -Plinux -Djavafx.platform=linux -DskipTests - name: Download OpenJFX jmods id: download-jmods run: | diff --git a/.github/workflows/dependency-check.yml b/.github/workflows/dependency-check.yml index 02633a334..40dfe97fa 100644 --- a/.github/workflows/dependency-check.yml +++ b/.github/workflows/dependency-check.yml @@ -12,6 +12,7 @@ jobs: runner-os: 'ubuntu-latest' java-distribution: 'temurin' java-version: 22 + check-command: 'mvn -B validate -Pdependency-check -Djavafx.platform=linux' secrets: nvd-api-key: ${{ secrets.NVD_API_KEY }} slack-webhook-url: ${{ secrets.SLACK_WEBHOOK_URL }} diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index fbc6def3d..ad7a5dee6 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -79,7 +79,7 @@ jobs: - name: Set version run : mvn versions:set -DnewVersion=${{ needs.get-version.outputs.semVerStr }} - name: Run maven - run: mvn -B clean package -Pmac -DskipTests + run: mvn -B -Djavafx.platform=mac clean package -Pmac -DskipTests - name: Patch target dir run: | cp LICENSE.txt target @@ -142,7 +142,7 @@ jobs: REVISION_NO: ${{ needs.get-version.outputs.revNum }} - name: Generate license for dmg run: > - mvn -B license:add-third-party + mvn -B -Djavafx.platform=mac license:add-third-party -Dlicense.thirdPartyFilename=license.rtf -Dlicense.outputDirectory=dist/mac/dmg/resources -Dlicense.fileTemplate=dist/mac/dmg/resources/licenseTemplate.ftl diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 4db444da5..e6512a52e 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -24,4 +24,4 @@ jobs: java-version: ${{ env.JAVA_VERSION }} cache: 'maven' - name: Build and Test - run: xvfb-run mvn -B clean install jacoco:report -Pcoverage \ No newline at end of file + run: xvfb-run mvn -B clean install jacoco:report -Pcoverage -Djavafx.platform=linux \ No newline at end of file diff --git a/.github/workflows/release-check.yml b/.github/workflows/release-check.yml index 160da33e9..0454dc08d 100644 --- a/.github/workflows/release-check.yml +++ b/.github/workflows/release-check.yml @@ -60,6 +60,6 @@ jobs: - name: Run org.owasp:dependency-check plugin id: dependency-check continue-on-error: true - run: mvn -B verify -Pdependency-check -DskipTests + run: mvn -B verify -Pdependency-check -DskipTests -Djavafx.platform=linux env: NVD_API_KEY: ${{ secrets.NVD_API_KEY }} \ No newline at end of file diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index e3d5d9d87..6dea7ea22 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -77,7 +77,7 @@ jobs: - name: Set version run : mvn versions:set -DnewVersion=${{ needs.get-version.outputs.semVerStr }} - name: Run maven - run: mvn -B clean package -Pwin -DskipTests + run: mvn -B clean package -Pwin -DskipTests -Djavafx.platform=win - name: Patch target dir run: | cp LICENSE.txt target @@ -199,7 +199,7 @@ jobs: } - name: Generate license for MSI run: > - mvn -B license:add-third-party + mvn -B license:add-third-party -Djavafx.platform=win "-Dlicense.thirdPartyFilename=license.rtf" "-Dlicense.outputDirectory=dist/win/resources" "-Dlicense.fileTemplate=dist/win/resources/licenseTemplate.ftl" @@ -279,7 +279,7 @@ jobs: cache: 'maven' - name: Generate license for exe run: > - mvn -B license:add-third-party + mvn -B license:add-third-party -Djavafx.platform=win "-Dlicense.thirdPartyFilename=license.rtf" "-Dlicense.fileTemplate=dist/win/bundle/resources/licenseTemplate.ftl" "-Dlicense.outputDirectory=dist/win/bundle/resources" diff --git a/dist/linux/appimage/build.sh b/dist/linux/appimage/build.sh index 6266c26bd..e0af3999a 100755 --- a/dist/linux/appimage/build.sh +++ b/dist/linux/appimage/build.sh @@ -19,7 +19,7 @@ if [[ ! "${CPU_ARCH}" =~ x86_64|aarch64 ]]; then echo "Platform ${CPU_ARCH} not mvn -f ../../../pom.xml versions:set -DnewVersion=${SEMVER_STR} # compile -mvn -B -f ../../../pom.xml clean package -Plinux -DskipTests +mvn -B -f ../../../pom.xml clean package -Plinux -DskipTests -Djavafx.platform=linux cp ../../../LICENSE.txt ../../../target cp ../../../target/cryptomator-*.jar ../../../target/mods diff --git a/dist/mac/dmg/build.sh b/dist/mac/dmg/build.sh index 56fc264b2..ae15557df 100755 --- a/dist/mac/dmg/build.sh +++ b/dist/mac/dmg/build.sh @@ -68,7 +68,7 @@ if [ "${POM_JFX_VERSION}" -ne "${JMOD_VERSION}" ]; then fi # compile -mvn -B -f../../../pom.xml clean package -DskipTests -Pmac +mvn -B -Djavafx.platform=mac -f../../../pom.xml clean package -DskipTests -Pmac cp ../../../LICENSE.txt ../../../target cp ../../../target/${MAIN_JAR_GLOB} ../../../target/mods @@ -123,7 +123,7 @@ sed -i '' "s|###BUNDLE_SHORT_VERSION_STRING###|${VERSION_NO}|g" ${APP_NAME}.app/ sed -i '' "s|###BUNDLE_VERSION###|${REVISION_NO}|g" ${APP_NAME}.app/Contents/Info.plist # generate license -mvn -B -f../../../pom.xml license:add-third-party \ +mvn -B -Djavafx.platform=mac -f../../../pom.xml license:add-third-party \ -Dlicense.thirdPartyFilename=license.rtf \ -Dlicense.outputDirectory=dist/mac/dmg/resources \ -Dlicense.fileTemplate=resources/licenseTemplate.ftl \ diff --git a/dist/win/build.ps1 b/dist/win/build.ps1 index e88c3c8e7..7c5e85d58 100644 --- a/dist/win/build.ps1 +++ b/dist/win/build.ps1 @@ -41,7 +41,7 @@ Write-Output "`$Env:JAVA_HOME=$Env:JAVA_HOME" $copyright = "(C) $CopyrightStartYear - $((Get-Date).Year) $Vendor" # compile -&mvn -B -f $buildDir/../../pom.xml clean package -DskipTests -Pwin +&mvn -B -f $buildDir/../../pom.xml clean package -DskipTests -Pwin -Djavafx.platform=win Copy-Item "$buildDir\..\..\target\$MainJarGlob.jar" -Destination "$buildDir\..\..\target\mods" # add runtime @@ -122,7 +122,7 @@ if ($clean -and (Test-Path -Path $appPath)) { --icon resources/$AppName.ico #Create RTF license for msi -&mvn -B -f $buildDir/../../pom.xml license:add-third-party ` +&mvn -B -f $buildDir/../../pom.xml license:add-third-party -Djavafx.platform=win ` "-Dlicense.thirdPartyFilename=license.rtf" ` "-Dlicense.fileTemplate=$buildDir\resources\licenseTemplate.ftl" ` "-Dlicense.outputDirectory=$buildDir\resources\" ` @@ -167,7 +167,7 @@ $Env:JP_WIXHELPER_DIR = "." --file-associations resources/FAvaultFile.properties #Create RTF license for bundle -&mvn -B -f $buildDir/../../pom.xml license:add-third-party ` +&mvn -B -f $buildDir/../../pom.xml license:add-third-party -Djavafx.platform=win ` "-Dlicense.thirdPartyFilename=license.rtf" ` "-Dlicense.fileTemplate=$buildDir\bundle\resources\licenseTemplate.ftl" ` "-Dlicense.outputDirectory=$buildDir\bundle\resources\" `