From 0b5c034d9ec04759668d50a6df01f190509135d2 Mon Sep 17 00:00:00 2001 From: torakiki Date: Tue, 3 Oct 2023 09:42:56 +0200 Subject: [PATCH] fixed tests, Maven configuration --- pdfsam-gui/pom.xml | 20 ------------- pdfsam-service/pom.xml | 16 ---------- .../main/java/org/pdfsam/test/NoWindows.java | 27 ----------------- pdfsam-tools/pdfsam-alternate-mix/pom.xml | 12 -------- pdfsam-tools/pdfsam-backpages/pom.xml | 12 -------- pdfsam-tools/pdfsam-extract/pom.xml | 12 -------- pdfsam-tools/pdfsam-merge/pom.xml | 12 -------- pdfsam-tools/pdfsam-rotate/pom.xml | 12 -------- pdfsam-tools/pdfsam-simple-split/pom.xml | 12 -------- .../pdfsam-split-by-bookmarks/pom.xml | 12 -------- pdfsam-tools/pdfsam-split-by-size/pom.xml | 12 -------- pdfsam-ui-components/pom.xml | 14 --------- pom.xml | 30 ++++--------------- 13 files changed, 6 insertions(+), 197 deletions(-) delete mode 100644 pdfsam-test/src/main/java/org/pdfsam/test/NoWindows.java diff --git a/pdfsam-gui/pom.xml b/pdfsam-gui/pom.xml index 7598cdae..98453e57 100644 --- a/pdfsam-gui/pom.xml +++ b/pdfsam-gui/pom.xml @@ -26,20 +26,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - - --add-exports javafx.base/com.sun.javafx.logging=ALL-UNNAMED - --add-exports javafx.base/com.sun.javafx.beans=ALL-UNNAMED - --add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED - --add-exports javafx.graphics/com.sun.javafx.embed=ALL-UNNAMED - --add-exports javafx.graphics/com.sun.glass.ui.delegate=ALL-UNNAMED - --add-opens javafx.graphics/com.sun.glass.ui=ALL-UNNAMED - - - @@ -196,11 +182,5 @@ ${project.version} test - - org.awaitility - awaitility - test - - diff --git a/pdfsam-service/pom.xml b/pdfsam-service/pom.xml index 1f5d2d5f..781f7620 100644 --- a/pdfsam-service/pom.xml +++ b/pdfsam-service/pom.xml @@ -26,17 +26,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - - --add-exports javafx.base/com.sun.javafx.logging=ALL-UNNAMED - --add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED - --add-exports javafx.graphics/com.sun.javafx.embed=ALL-UNNAMED - - - @@ -107,10 +96,5 @@ ${project.version} test - - org.awaitility - awaitility - test - diff --git a/pdfsam-test/src/main/java/org/pdfsam/test/NoWindows.java b/pdfsam-test/src/main/java/org/pdfsam/test/NoWindows.java deleted file mode 100644 index 89e1ffdb..00000000 --- a/pdfsam-test/src/main/java/org/pdfsam/test/NoWindows.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the PDF Split And Merge source code - * Created on 10 dic 2018 - * Copyright 2017 by Sober Lemur S.r.l. (info@soberlemur.com). - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package org.pdfsam.test; - -/** - * @author Andrea Vacondio - * - */ -public class NoWindows { - -} diff --git a/pdfsam-tools/pdfsam-alternate-mix/pom.xml b/pdfsam-tools/pdfsam-alternate-mix/pom.xml index c636fecb..5115674b 100644 --- a/pdfsam-tools/pdfsam-alternate-mix/pom.xml +++ b/pdfsam-tools/pdfsam-alternate-mix/pom.xml @@ -26,18 +26,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - - --add-exports javafx.base/com.sun.javafx.logging=ALL-UNNAMED - --add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED - --add-exports javafx.graphics/com.sun.javafx.embed=ALL-UNNAMED - --add-opens javafx.graphics/com.sun.glass.ui=ALL-UNNAMED - - - diff --git a/pdfsam-tools/pdfsam-backpages/pom.xml b/pdfsam-tools/pdfsam-backpages/pom.xml index 4a6f0006..e04e4588 100644 --- a/pdfsam-tools/pdfsam-backpages/pom.xml +++ b/pdfsam-tools/pdfsam-backpages/pom.xml @@ -27,18 +27,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - - --add-exports javafx.base/com.sun.javafx.logging=ALL-UNNAMED - --add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED - --add-exports javafx.graphics/com.sun.javafx.embed=ALL-UNNAMED - --add-opens javafx.graphics/com.sun.glass.ui=ALL-UNNAMED - - - diff --git a/pdfsam-tools/pdfsam-extract/pom.xml b/pdfsam-tools/pdfsam-extract/pom.xml index c98cc46a..ccf0745b 100644 --- a/pdfsam-tools/pdfsam-extract/pom.xml +++ b/pdfsam-tools/pdfsam-extract/pom.xml @@ -27,18 +27,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - - --add-exports javafx.base/com.sun.javafx.logging=ALL-UNNAMED - --add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED - --add-exports javafx.graphics/com.sun.javafx.embed=ALL-UNNAMED - --add-opens javafx.graphics/com.sun.glass.ui=ALL-UNNAMED - - - diff --git a/pdfsam-tools/pdfsam-merge/pom.xml b/pdfsam-tools/pdfsam-merge/pom.xml index 383cbb61..acc3e34f 100644 --- a/pdfsam-tools/pdfsam-merge/pom.xml +++ b/pdfsam-tools/pdfsam-merge/pom.xml @@ -27,18 +27,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - - --add-exports javafx.base/com.sun.javafx.logging=ALL-UNNAMED - --add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED - --add-exports javafx.graphics/com.sun.javafx.embed=ALL-UNNAMED - --add-opens javafx.graphics/com.sun.glass.ui=ALL-UNNAMED - - - diff --git a/pdfsam-tools/pdfsam-rotate/pom.xml b/pdfsam-tools/pdfsam-rotate/pom.xml index 96889e96..a4723a1b 100644 --- a/pdfsam-tools/pdfsam-rotate/pom.xml +++ b/pdfsam-tools/pdfsam-rotate/pom.xml @@ -27,18 +27,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - - --add-exports javafx.base/com.sun.javafx.logging=ALL-UNNAMED - --add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED - --add-exports javafx.graphics/com.sun.javafx.embed=ALL-UNNAMED - --add-opens javafx.graphics/com.sun.glass.ui=ALL-UNNAMED - - - diff --git a/pdfsam-tools/pdfsam-simple-split/pom.xml b/pdfsam-tools/pdfsam-simple-split/pom.xml index 87de694b..3b8f42fb 100644 --- a/pdfsam-tools/pdfsam-simple-split/pom.xml +++ b/pdfsam-tools/pdfsam-simple-split/pom.xml @@ -27,18 +27,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - - --add-exports javafx.base/com.sun.javafx.logging=ALL-UNNAMED - --add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED - --add-exports javafx.graphics/com.sun.javafx.embed=ALL-UNNAMED - --add-opens javafx.graphics/com.sun.glass.ui=ALL-UNNAMED - - - diff --git a/pdfsam-tools/pdfsam-split-by-bookmarks/pom.xml b/pdfsam-tools/pdfsam-split-by-bookmarks/pom.xml index 4ded1ae1..c0c7ff81 100644 --- a/pdfsam-tools/pdfsam-split-by-bookmarks/pom.xml +++ b/pdfsam-tools/pdfsam-split-by-bookmarks/pom.xml @@ -27,18 +27,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - - --add-exports javafx.base/com.sun.javafx.logging=ALL-UNNAMED - --add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED - --add-exports javafx.graphics/com.sun.javafx.embed=ALL-UNNAMED - --add-opens javafx.graphics/com.sun.glass.ui=ALL-UNNAMED - - - diff --git a/pdfsam-tools/pdfsam-split-by-size/pom.xml b/pdfsam-tools/pdfsam-split-by-size/pom.xml index 0bbc65f3..d41bacdc 100644 --- a/pdfsam-tools/pdfsam-split-by-size/pom.xml +++ b/pdfsam-tools/pdfsam-split-by-size/pom.xml @@ -27,18 +27,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - - --add-exports javafx.base/com.sun.javafx.logging=ALL-UNNAMED - --add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED - --add-exports javafx.graphics/com.sun.javafx.embed=ALL-UNNAMED - --add-opens javafx.graphics/com.sun.glass.ui=ALL-UNNAMED - - - diff --git a/pdfsam-ui-components/pom.xml b/pdfsam-ui-components/pom.xml index 5ceed6c9..d195a259 100644 --- a/pdfsam-ui-components/pom.xml +++ b/pdfsam-ui-components/pom.xml @@ -26,20 +26,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - - --add-exports javafx.base/com.sun.javafx.logging=ALL-UNNAMED - --add-exports javafx.base/com.sun.javafx.beans=ALL-UNNAMED - --add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED - --add-exports javafx.graphics/com.sun.javafx.embed=ALL-UNNAMED - --add-exports javafx.graphics/com.sun.glass.ui.delegate=ALL-UNNAMED - --add-opens javafx.graphics/com.sun.glass.ui=ALL-UNNAMED - - - diff --git a/pom.xml b/pom.xml index ebd67ac9..4b5090b0 100644 --- a/pom.xml +++ b/pom.xml @@ -47,24 +47,6 @@ - - - - Windows - - - no-windows-failing-tests - - - - maven-surefire-plugin - - org.pdfsam.NoWindows - - - - - toolchain @@ -452,12 +434,6 @@ ${javafx.version} test - - org.awaitility - awaitility - ${awaitility.version} - test - org.junit junit-bom @@ -539,5 +515,11 @@ + + org.awaitility + awaitility + ${awaitility.version} + test +