diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 676fff5..91c7fb2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: os: [ ubuntu-latest ] - java: [ 11, 17, 21, 25, 27 ] + java: [ 21, 25, 27 ] include: - os: windows-latest java: 21 diff --git a/.gitignore b/.gitignore index 4d781b4..0bf25c0 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,4 @@ /flexdock-view/target/ /flexdock-drag/target/ /flexdock-perspective/target/ -/flexdock-dockbar/target/ flexdock-demo/dependency-reduced-pom.xml diff --git a/README-BUILD.md b/README-BUILD.md index 7e4e94b..7de4d7c 100644 --- a/README-BUILD.md +++ b/README-BUILD.md @@ -1,10 +1,8 @@ Building Flexdock -------------------------- -To build this project, obtain a copy of Apache's Maven from -https://maven.apache.org. We recommend to use version 3.0 or later. -Building requires JDK 21 or later (needed by the Checkstyle version used in the -build). The compiled classes still target Java 8. +To build this project you need JDK 21+ and Maven 3.6.3+. +The resulting jars target Java 8. From this directory you should be able to build everything by running the command diff --git a/flexdock-demo/pom.xml b/flexdock-demo/pom.xml index 4edaf87..100404f 100644 --- a/flexdock-demo/pom.xml +++ b/flexdock-demo/pom.xml @@ -60,7 +60,7 @@ org.apache.maven.plugins maven-shade-plugin - 2.4.3 + 3.6.2 package @@ -68,6 +68,15 @@ shade + + + *:* + + + META-INF/MANIFEST.MF + + + org.flexdock.demos.AllDemos diff --git a/flexdock-perspective/pom.xml b/flexdock-perspective/pom.xml index 8157b89..c0f0dfe 100644 --- a/flexdock-perspective/pom.xml +++ b/flexdock-perspective/pom.xml @@ -23,7 +23,7 @@ org.junit.jupiter junit-jupiter - 5.14.4 + 6.1.3 test diff --git a/flexdock-view/pom.xml b/flexdock-view/pom.xml index 1da727e..2e224af 100644 --- a/flexdock-view/pom.xml +++ b/flexdock-view/pom.xml @@ -26,5 +26,10 @@ 1.3 jar + + net.sf.squirrel-sql.thirdparty-non-maven + skinlf + 6.7 + diff --git a/pom.xml b/pom.xml index ab9b996..fc39bb2 100644 --- a/pom.xml +++ b/pom.xml @@ -3,12 +3,6 @@ 4.0.0 - - org.sonatype.oss - oss-parent - 9 - - org.flexdock flexdock 1.3 @@ -57,62 +51,54 @@ - 1.8 + 8 UTF-8 warning - - - net.sf.squirrel-sql.thirdparty-non-maven - skinlf - 6.7 - - - org.apache.maven.plugins - maven-site-plugin - 2.2 + maven-compiler-plugin + 3.16.0 org.apache.maven.plugins - maven-scm-plugin - 1.5 + maven-enforcer-plugin + 3.7.0 org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 + maven-resources-plugin + 3.5.0 org.apache.maven.plugins - maven-resources-plugin - 2.5 + maven-surefire-plugin + 3.6.1 org.apache.maven.plugins - maven-release-plugin - 2.1 + maven-clean-plugin + 3.5.0 - org.codehaus.mojo - wagon-maven-plugin - 1.0-beta-3 + org.apache.maven.plugins + maven-install-plugin + 3.2.0 - org.apache.maven.scm - maven-scm-provider-svnexe - 1.4 + org.apache.maven.plugins + maven-deploy-plugin + 3.2.0 org.apache.maven.plugins maven-jar-plugin - 2.3.1 + 3.5.1 org.apache.maven.plugins @@ -122,20 +108,47 @@ com.puppycrawl.tools checkstyle - 14.3.0 + 14.4.0 + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-build-environment + + enforce + + + + + [3.6.3,) + + + + [21,) + + + + + + org.apache.maven.plugins maven-compiler-plugin - ${javaVersion} - ${javaVersion} + ${javaVersion} + + + -Xlint:-options + @@ -155,8 +168,15 @@ org.apache.felix maven-bundle-plugin - 2.3.7 + 6.2.0 true + + + + <_noimportjava>true + <_noee>true + + bundle-manifest @@ -170,7 +190,7 @@ org.apache.maven.plugins maven-source-plugin - 3.0.1 + 3.4.0 attach-sources @@ -204,65 +224,4 @@ - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.2 - - - - index - summary - dependencies - project-team - license - issue-tracking - mailing-list - scm - - - - - false - - - - org.apache.maven.plugins - maven-jxr-plugin - 2.2 - - true - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.7 - - true - false - - https://docs.oracle.com/javase/8/docs/api/ - public - - - - - - javadoc - - - - - - org.codehaus.mojo - findbugs-maven-plugin - 2.3.1 - - - -