Skip to content

Task 04 upgrade java #5

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

Open
mbjones wants to merge 12 commits into
base: develop
Choose a base branch
from
Open

Task 04 upgrade java #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3b9b0e6
Migrate to jdk 1.8, remove maven build plugins, add jaxb dependencies.
mbjones Feb 21, 2026
73db0a3
Upgraded to java 25 language target (also worked with 17 and 21)
mbjones Feb 21, 2026
c211cb0
Remove maven gpg signing plugin
mbjones Feb 21, 2026
06de8b7
Remove extraneous buildInfo props file
mbjones Feb 21, 2026
6b2a665
Drop support for XSLT stylesheets in embedded XML.
mbjones Mar 17, 2026
613544d
Reformatted TypeMarshalling class and test files
mbjones Mar 17, 2026
4a435de
Remove unused imports from test class.
mbjones Mar 17, 2026
071980a
Deleted dead code in pom.xml
mbjones Mar 17, 2026
0109ba6
Add new java maven build GHA.
mbjones Mar 17, 2026
7e0612a
Only run mvn GHA build on `main`, `develop`, and PRs.
mbjones Mar 17, 2026
c66936d
Remove dependency upload from workflow.
mbjones Mar 17, 2026
c32e8fa
Switch back to java 25
mbjones Mar 17, 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
36 changes: 36 additions & 0 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven

# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

name: Java CI with Maven

on:
push:
branches: [ "main", "develop" ]
pull_request:
branches: [ "*" ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: '25'
distribution: 'temurin'
cache: maven
- name: Build with Maven
run: mvn -B package --file pom.xml

# Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
# - name: Update dependency graph
# uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6

236 changes: 14 additions & 222 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
<packaging>jar</packaging>
<version>2.4.3-SNAPSHOT</version>
<name>DataONE_Common_Java</name>
<url>http://dataone.org</url>
<url>https://dataone.org</url>
<description>DataONE Common Code with Service Interface Definitions</description>
<properties>
<d1_test_resources.version>2.3.1</d1_test_resources.version>
<d1_format_ids.revision>v1.23</d1_format_ids.revision>
<compiler.target.version>1.7</compiler.target.version>
<maven.compiler.release>25</maven.compiler.release>
</properties>
<developers>
<developer>
Expand Down Expand Up @@ -47,182 +47,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.7</source>
<target>${compiler.target.version}</target>
</configuration>
</plugin>
<plugin>
<!-- https://github.com/maven-download-plugin/maven-download-plugin -->
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
<version>1.6.0</version>
<executions>
<execution>
<id>install-format-ids</id>
<phase>validate</phase>
<goals>
<goal>wget</goal>
</goals>
<configuration>
<url>https://raw.githubusercontent.com/DataONEorg/object-formats/${d1_format_ids.revision}/objectFormatListV2.xml</url>
<unpack>false</unpack>
<outputDirectory>${project.basedir}/src/main/resources/org/dataone/service/resources/config/v2</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<!-- Move the downloaded object format list to the expected location -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<move file="${project.basedir}/src/main/resources/org/dataone/service/resources/config/v2/objectFormatListV2.xml"
tofile="${project.basedir}/src/main/resources/org/dataone/service/resources/config/v2/objectFormatList.xml"/>
</tasks>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>transform</goal>
</goals>
</execution>
</executions>
<configuration>
<transformationSets>
<transformationSet>
<dir>${project.basedir}/src/main/resources/org/dataone/service/resources/config/v2/</dir>
<includes>objectFormatList.xml</includes>
<outputDir>${project.basedir}/src/main/resources/org/dataone/service/resources/config/v1/</outputDir>
<stylesheet>${project.basedir}/objectFormatListv2-to-v1.xsl</stylesheet>
</transformationSet>
</transformationSets>
</configuration>
<dependencies>
<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>Saxon-HE</artifactId>
<version>10.3</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>create</goal>
</goals>
</execution>
</executions>
<configuration>
<doCheck>false</doCheck>
<doUpdate>false</doUpdate>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<D1-version>${project.version}</D1-version>
<D1-SCM-Revision>${buildNumber}</D1-SCM-Revision>
<D1-SCM-Branch>${scmBranch}</D1-SCM-Branch>
<D1-Build-TimeStamp>${timestamp}</D1-Build-TimeStamp>
</manifestEntries>
</archive>
</configuration>
<executions>
<!-- make a test resources jar -->
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<phase>package</phase>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<excludeDefaultDirectories>true</excludeDefaultDirectories>
<filesets>
<fileset>
<directory>${project.build.directory}</directory>
<excludes>
<exclude>**/*.jar</exclude>
<exclude>**/.*</exclude>
<exclude>**/.svn/*</exclude>
</excludes>
<followSymlinks>false</followSymlinks>
</fileset>
</filesets>
</configuration>
</plugin>
<plugin>
<groupId>com.mycila.maven-license-plugin</groupId>
<artifactId>maven-license-plugin</artifactId>
<configuration>
<header>src/license-header.txt</header>
</configuration>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9</version>
<executions>
<execution>
<id>resource-bundles</id>
<phase>package</phase>
<goals>
<!-- produce source artifact for main project sources -->
<goal>resource-bundle</goal>
</goals>
</execution>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<!-- TODO: fix docs. Disable checking -->
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</execution>
</executions>
<configuration>
<!-- <additionalparam>-noqualifier org.dataone.*:java.lang.*</additionalparam>-->
<detectOfflineLinks>false</detectOfflineLinks>
</configuration>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
Expand All @@ -235,33 +59,13 @@
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
<configuration>
<gpgArguments>
<arg>--pinentry-mode</arg>
<arg>loopback</arg>
</gpgArguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<repositories>
<!-- Added to get the Atmosphere 1.1.0-SNAPSHOT, can be removed when 1.1.0 is released -->
<repository>
<id>oss.sonatype.org-snapshot</id>
<url>http://oss.sonatype.org/content/repositories/snapshots</url>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
Expand All @@ -278,11 +82,17 @@
<type>jar</type>
<scope>compile</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api -->
<!-- API, java.xml.bind module -->
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.2</version>
</dependency>
<!-- Runtime, com.sun.xml.bind module -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.2.3</version>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.3.2</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
Expand All @@ -296,16 +106,6 @@
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.apache.logging.log4j</groupId>-->
<!-- <artifactId>log4j-api</artifactId>-->
<!-- <version>2.6.2</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.apache.logging.log4j</groupId>-->
<!-- <artifactId>log4j-core</artifactId>-->
<!-- <version>2.6.2</version>-->
<!-- </dependency>-->
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
Expand Down Expand Up @@ -333,13 +133,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>2.4.1</version>
<type>maven-plugin</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
Expand Down Expand Up @@ -383,7 +176,6 @@
<type>jar</type>
<scope>provided</scope>
</dependency>
<!-- <dependency><groupId>qdox</groupId><artifactId>qdox</artifactId><version>1.6.1</version></dependency>-->
<dependency>
<groupId>org.dataone</groupId>
<artifactId>d1_test_resources</artifactId>
Expand Down Expand Up @@ -422,4 +214,4 @@
</plugin>
</plugins>
</reporting>
</project>
</project>
Loading
Loading