Task 04 upgrade java by mbjones · Pull Request #5 · DataONEorg/d1_common_java

mbjones · 2026-03-17T02:29:44Z

PR introduces changes to compile under java 17, 21, and 25. Tested with Eclipse Temurin.

Upgraded java and closes issue support modern Java versions (LTS 17, 21, 25) #4
Removed stylesheet support and closes issue TypeMarshaller.marshalTypeToOutputStream(Object typeObject, OutputStream os, String styleSheet) doesn't work after Java 8 #3

All tests pass. Additional details follow in a summary by Copilot:

Summary

This PR modernizes d1_common_java for current Java LTS/runtime usage, updates CI/build tooling, and aligns dependency/deploy resolution with maven.dataone.org.

It also removes deprecated stylesheet-based XML marshalling behavior that no longer works on modern JDKs and simplifies related code/tests.

Closes #4
Closes #3

Why this change

Support current Java versions in active use (17/21/25 testing context, modern compiler/toolchain/plugins).
Remove legacy marshalling behavior that is no longer compatible after Java 8.
Reduce build/deploy fragility by removing Sonatype assumptions and using DataONE-hosted Maven artifacts.
Keep CI aligned with current GitHub Actions versions.

What changed

Build and toolchain modernization:
Updated Maven compiler/jar plugin setup and cleaned obsolete build config.
Refreshed dependency versions (including core logging/common libs).
Added/restored test-jar generation needed by downstream consumers.
Java/API compatibility cleanup:
Replaced deprecated/removed API usage for modern JDK compatibility.
Removed obsolete imports and redundant Serializable declarations.
Refactored/cleaned affected tests and formatting.
Type marshalling behavior:
Removed stylesheet injection support from TypeMarshaller marshalling path.
Updated tests accordingly.
CI and release/deploy updates:
Added/updated GitHub Actions Maven workflow.
Upgraded workflow actions to current major versions.
Switched CI build target to mvn verify.
Removed Sonatype deploy workflow/config and moved to maven.dataone.org.
Repository/dependency source alignment:
Removed Sonatype repository dependence.
Configured maven.dataone.org as the source for both release and snapshot artifact resolution.

Behavioral impact

Breaking/intentional behavior change:
TypeMarshaller stylesheet argument behavior is removed (legacy path no longer supported).
Deployment target/source-of-truth for Maven artifacts is now maven.dataone.org.

Validation

Project builds and tests pass after modernization changes.
CI workflow runs with updated GitHub Actions and Maven verify.
d1_test_resources snapshot availability confirmed from maven.dataone.org.

Notes for reviewers

This PR includes both modernization and cleanup commits; some diffs are mechanical (imports/formatting) to support compilation and reduce warning noise.
Main review focus should be:
Type marshalling behavior change.
Build/dependency/deploy configuration changes.
CI workflow behavior and scope.

The package now compiles under java 1.8 language target using modern mvn and jdk.

See issue #3.

taojing2002

Looks great! Thank you!

THe schema url pointed at redmine.dataone.org which no longer exists and now lives at https://github.com/DataONEorg/d1_schemas.

Copilot

Pull request overview

This PR modernizes the Java build and source compatibility for newer JDKs, updates JAXB/logging dependencies, and removes stylesheet injection support from TypeMarshaller.

Changes:

Updates Maven configuration/dependencies for modern Java and adds a GitHub Actions Maven build.
Migrates Log4j 1.x usages to Log4j 2 API imports.
Removes stylesheet marshalling behavior and modernizes tests/source for newer Java and library APIs.

Reviewed changes

Copilot reviewed 32 out of 32 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
`pom.xml`	Reworks Java/compiler settings, dependencies, plugins, and release metadata.
`.github/workflows/maven.yml`	Adds Maven CI on GitHub Actions.
`src/main/resources/buildInfo/buildInfo.properties`	Removes filtered build metadata resource.
`src/main/java/org/dataone/service/util/TypeMarshaller.java`	Moves marshalling logic to 2-arg overload and deprecates stylesheet overload.
`src/main/java/org/dataone/service/exceptions/BaseException.java`	Migrates logger to Log4j 2 API.
`src/main/java/org/dataone/mimemultipart/MultipartRequestResolver.java`	Migrates logger and makes it static final.
`src/main/java/org/dataone/service/types/v1/TypeFactory.java`	Migrates logger to Log4j 2 API.
`src/main/java/org/dataone/service/types/v1/util/AuthUtils.java`	Migrates logger and removes unused imports.
`src/main/java/org/dataone/service/types/v1/util/ServiceMethodRestrictionUtil.java`	Migrates logger to Log4j 2 API.
`src/main/java/org/dataone/service/types/v1/util/TypeCompareUtil.java`	Migrates logger to Log4j 2 API.
`src/main/java/org/dataone/service/types/v2/util/ServiceMethodRestrictionUtil.java`	Migrates logger to Log4j 2 API.
`src/main/java/org/dataone/service/types/v2/util/ObjectFormatServiceImpl.java`	Migrates logger to Log4j 2 API.
`src/main/java/org/dataone/service/types/v2/TypeFactory.java`	Replaces deprecated reflective construction and removes unused local variable.
`src/main/java/org/dataone/service/util/ExceptionalInputStream.java`	Replaces boxed Boolean constructors with constants.
`src/main/java/org/dataone/service/util/AccessRuleMarshallingAdapter.java`	Removes unused import.
`src/main/java/org/dataone/service/types/v1/ObjectFormatList.java`	Removes redundant `Serializable` declaration.
`src/main/java/org/dataone/service/types/v1/Permission.java`	Removes redundant enum `Serializable` declaration.
`src/main/java/org/dataone/service/types/v1/ReplicationStatus.java`	Removes redundant enum `Serializable` declaration.
`src/main/java/org/dataone/service/types/v1/ServiceMethodRestriction.java`	Removes redundant `Serializable` declaration.
`src/main/java/org/dataone/service/types/v1_1/QueryEngineList.java`	Removes unused import.
`src/main/java/org/dataone/service/types/v2/Node.java`	Removes redundant `Serializable` declaration.
`src/main/java/org/dataone/service/types/v2/SystemMetadata.java`	Removes redundant `Serializable` declaration.
`src/main/java/org/dataone/service/types/v2/OptionList.java`	Removes unused import.
`src/test/java/org/dataone/service/util/TypeMarshallerTestCase.java`	Updates logger imports and adjusts stylesheet-related tests.
`src/test/java/org/dataone/service/util/IdentifierEncodingTestCase.java`	Updates logger imports and simplifies exception assertions.
`src/test/java/org/dataone/service/util/ExceptionHandlerTestCase.java`	Adds explicit UTF-8 handling and modernizes integer boxing.
`src/test/java/org/dataone/service/util/D1Url1TestCase.java`	Updates logger imports and integer boxing.
`src/test/java/org/dataone/service/types/v2/util/NodelistUtilTestCase.java`	Adds explicit UTF-8 handling.
`src/test/java/org/dataone/service/types/v1/SystemMetadataTestCase.java`	Updates logger imports.
`src/test/java/org/dataone/service/types/v2/SystemMetadataTestCase.java`	Updates logger imports.
`src/test/java/org/dataone/service/types/v1/TypeSamplesTestCase.java`	Updates logger imports and schema URL loading.
`src/test/java/org/dataone/service/types/D1NamespaceContext.java`	Updates logger imports.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

- Bump joda-time to 2.14.2, httpmime to 4.5.14, and javax.servlet-api to 4.0.1 - Update MultipartRequest for Servlet 3.1+/4.x compatibility by enabling changeSessionId/getContentLengthLong/upgrade - Add missing HttpUpgradeHandler import and initialize wrapped request in constructor to ensure safe delegation - Verified with clean build and tests (mvn clean test)

…ownstream.

…t actions.

…and snapshots.

mbjones · 2026-06-19T01:45:12Z

@taojing2002 can you take another look at this please? Mostly the same, but I did some additional cleanup, and there is a much more detailed overview in the PR description above.

mbjones added 8 commits February 20, 2026 16:19

Migrate to jdk 1.8, remove maven build plugins, add jaxb dependencies.

3b9b0e6

The package now compiles under java 1.8 language target using modern mvn and jdk.

Upgraded to java 25 language target (also worked with 17 and 21)

73db0a3

Remove maven gpg signing plugin

c211cb0

Remove extraneous buildInfo props file

06de8b7

Drop support for XSLT stylesheets in embedded XML.

6b2a665

See issue #3.

Reformatted TypeMarshalling class and test files

613544d

Remove unused imports from test class.

4a435de

Deleted dead code in pom.xml

071980a

mbjones requested a review from taojing2002 March 17, 2026 02:29

mbjones added 4 commits March 16, 2026 19:09

Add new java maven build GHA.

0109ba6

Only run mvn GHA build on main, develop, and PRs.

7e0612a

Remove dependency upload from workflow.

c66936d

Switch back to java 25

c32e8fa

taojing2002 approved these changes Mar 23, 2026

View reviewed changes

mbjones added 6 commits May 11, 2026 17:49

Upgrade log4j, common-lang, and commons-io, and fix schema url.

4881777

THe schema url pointed at redmine.dataone.org which no longer exists and now lives at https://github.com/DataONEorg/d1_schemas.

Remove unused imports.

5262f85

Remove redundant implements Serializable when parent already does.

cdfbf82

Replace deprecated methods from before JDK 17.

1033f6e

Reformat pom to use standaard indent and spacing.

0725c8e

Update to formats 1.28

c1109cc

Copilot AI review requested due to automatic review settings May 30, 2026 02:00

Copilot started reviewing on behalf of mbjones May 30, 2026 02:00 View session

Copilot AI reviewed May 30, 2026

View reviewed changes

Comment thread pom.xml

Comment thread .github/workflows/maven.yml Outdated

mbjones added 7 commits May 29, 2026 18:16

Upgraded maven compiler plugin and jar plugin

5837e68

Switch mvn deploy to use maven.dataone.org

3ac4276

Restore build and deploy of test-jar artifacts that libclient needs d…

7b69d52

…ownstream.

Remove GHA to deploy to sonatype, and upgrade GHA maven test to recen…

61bb090

…t actions.

Fully remove sonatype repo, depend on maven.dataone.org for releases …

d508a7e

…and snapshots.

Switch to mvn verify for GHA CI tests.

6c1ab6f

mbjones requested a review from taojing2002 June 19, 2026 01:45

mbjones self-assigned this Jun 19, 2026

mbjones linked an issue Jun 19, 2026 that may be closed by this pull request

support modern Java versions (LTS 17, 21, 25) #4

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Task 04 upgrade java#5

Task 04 upgrade java#5
mbjones wants to merge 25 commits into
developfrom
task-04-upgrade-java

mbjones commented Mar 17, 2026 •

edited

Loading

Uh oh!

taojing2002 left a comment

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

mbjones commented Jun 19, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

mbjones commented Mar 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Why this change

What changed

Behavioral impact

Validation

Notes for reviewers

Uh oh!

taojing2002 left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

mbjones commented Jun 19, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

mbjones commented Mar 17, 2026 •

edited

Loading