Skip to content

Update Maven plugins #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sylvestre merged 15 commits into from
Nov 4, 2026
Merged

Update Maven plugins #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b385981
Compile with --release 8 and update compiler plugin
danilovesky Oct 29, 2026
d6d81ab
Update jar, resources, source and shade plugins
danilovesky Oct 29, 2026
9b6b2e2
Declare skinlf only in modules that use it
danilovesky Oct 29, 2026
eb4db72
Enforce minimum JDK and Maven versions
danilovesky Oct 29, 2026
b6963ad
Run CI on JDK 21 and newer
danilovesky Nov 2, 2026
a37e9ef
Drop oss-parent and update enforcer plugin
danilovesky Nov 3, 2026
44f761c
Pin surefire, clean, install and deploy plugins
danilovesky Nov 3, 2026
6d1f3e3
Update compiler plugin to 3.16.0
danilovesky Nov 3, 2026
86b7f55
Update bundle plugin to 6.2.0
danilovesky Nov 3, 2026
02baec4
Remove unused plugin versions from pluginManagement
danilovesky Nov 3, 2026
e61db38
Remove reporting section
danilovesky Nov 3, 2026
9d0a853
Update install and deploy plugins to 3.2.0
danilovesky Nov 3, 2026
05406c1
Update checkstyle to 14.4.0
danilovesky Nov 3, 2026
4079ba4
Update JUnit to 6.1.3
danilovesky Nov 3, 2026
1071c16
Remove stale dockbar entry from .gitignore
danilovesky Nov 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@
/flexdock-view/target/
/flexdock-drag/target/
/flexdock-perspective/target/
/flexdock-dockbar/target/
flexdock-demo/dependency-reduced-pom.xml
6 changes: 2 additions & 4 deletions README-BUILD.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
11 changes: 10 additions & 1 deletion flexdock-demo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,23 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.4.3</version>
<version>3.6.2</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<!-- generated by ManifestResourceTransformer below -->
<exclude>META-INF/MANIFEST.MF</exclude>
</excludes>
</filter>
</filters>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.flexdock.demos.AllDemos</mainClass>
Expand Down
2 changes: 1 addition & 1 deletion flexdock-perspective/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.14.4</version>
<version>6.1.3</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
5 changes: 5 additions & 0 deletions flexdock-view/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,10 @@
<version>1.3</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>
<artifactId>skinlf</artifactId>
<version>6.7</version>
</dependency>
</dependencies>
</project>
155 changes: 57 additions & 98 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,6 @@

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>9</version>
</parent>

<groupId>org.flexdock</groupId>
<artifactId>flexdock</artifactId>
<version>1.3</version>
Expand Down Expand Up @@ -57,62 +51,54 @@
</pluginRepositories>

<properties>
<javaVersion>1.8</javaVersion>
<javaVersion>8</javaVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- severity of checkstyle Javadoc checks (overridden in modules that do not need Javadoc) -->
<checkstyle.javadoc.severity>warning</checkstyle.javadoc.severity>
</properties>

<dependencies>
<dependency>
<groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>
<artifactId>skinlf</artifactId>
<version>6.7</version>
</dependency>
</dependencies>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>2.2</version>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.16.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-plugin</artifactId>
<version>1.5</version>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.7.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<artifactId>maven-resources-plugin</artifactId>
<version>3.5.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.5</version>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.6.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.1</version>
<artifactId>maven-clean-plugin</artifactId>
<version>3.5.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>wagon-maven-plugin</artifactId>
<version>1.0-beta-3</version>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-svnexe</artifactId>
<version>1.4</version>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.1</version>
<version>3.5.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -122,20 +108,47 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>14.3.0</version>
<version>14.4.0</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<!-- require JDK and Maven versions needed by the build -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>

@sylvestre sylvestre Nov 1, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no version here, maven will warn about it
could you please pin it in pluginManagement like the others? thanks

@danilovesky danilovesky Nov 2, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added the version tag for maven-enforce-plugin.

<executions>
<execution>
<id>enforce-build-environment</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>[3.6.3,)</version>
</requireMavenVersion>
<requireJavaVersion>
<!-- the checkstyle engine requires JDK 21 -->
<version>[21,)</version>
</requireJavaVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<!-- enforce java version -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${javaVersion}</source>
<target>${javaVersion}</target>
<release>${javaVersion}</release>

@sylvestre sylvestre Oct 29, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

--release needs JDK 9+ to build, and compiler 3.14.1 needs maven 3.6.3+
README-BUILD.md still says "maven 3.0 or later", could you please update it? thanks

@danilovesky danilovesky Oct 29, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will try to implement it in a more robust way using maven-enforcer-plugin.

<compilerArgs>
<!-- Java 8 is obsolete for newer JDKs, but still the supported target -->
<arg>-Xlint:-options</arg>
</compilerArgs>
</configuration>
</plugin>
<plugin>
Expand All @@ -155,8 +168,15 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.3.7</version>
<version>6.2.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
<!-- keep the manifests free of java.* imports and execution environment requirements -->
<_noimportjava>true</_noimportjava>
<_noee>true</_noee>
</instructions>
</configuration>
<executions>
<execution>
<id>bundle-manifest</id>
Expand All @@ -170,7 +190,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
<version>3.4.0</version>
<executions>
<execution>
<id>attach-sources</id>
Expand Down Expand Up @@ -204,65 +224,4 @@
</plugins>
</build>

<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.2</version>
<reportSets>
<reportSet>
<reports>
<report>index</report>
<report>summary</report>
<report>dependencies</report>
<report>project-team</report>
<report>license</report>
<report>issue-tracking</report>
<report>mailing-list</report>
<report>scm</report>
</reports>
</reportSet>
</reportSets>
<configuration>
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>2.2</version>
<configuration>
<linkJavadoc>true</linkJavadoc>
<!-- <javadocDir>/path/to/javadocs</javadocDir> -->
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.7</version>
<configuration>
<quiet>true</quiet>
<verbose>false</verbose>
<links>
<link>https://docs.oracle.com/javase/8/docs/api/</link>
<show>public</show>
</links>
</configuration>
<reportSets>
<reportSet>
<reports>
<report>javadoc</report>
</reports>
</reportSet>
</reportSets>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>2.3.1</version>
</plugin>
</plugins>
</reporting>

</project>
Loading