Skip to content

Jaxb3 and Jakarta #6

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
Asger-KB merged 3 commits into from
Jul 30, 2026
+59 −113
Merged

Jaxb3 and Jakarta #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c81b6c
Jaxb3 and Jakarta
Asger-KB Jul 14, 2026
2b775e0
pom specify java 21
Asger-KB Jul 30, 2026
3bc6e6f
updated jenkins file
Asger-KB Jul 30, 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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ Changes of the Bitrepository.org protocol specification.
The change log covers changes in the protocol from protocol version 23 and newer.
Changes prior to version 23 have never been documented in a change log form. For references of changes prior to that look at the version control history.

## [33] - 2026-07-14
###
- Updated to use Java 17 and Jakarta

## [32] - 2022-09-07
### Changed
- Project `groupId` updated from `org.bitrepository` to `org.bitrepository.message-xml`
Expand Down
67 changes: 8 additions & 59 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,59 +1,8 @@
#!/usr/bin/env groovy

openshift.withCluster() {

podTemplate(
inheritFrom: 'maven',
cloud: 'openshift', //cloud must be openshift
envVars: [ //This fixes the error with en_US.utf8 not being found
envVar(key:"LC_ALL", value:"C.utf8")
],
volumes: [ //mount the settings.xml
secretVolume(mountPath: '/etc/m2', secretName: 'maven-settings')
]) {

try {
//GO to a node with maven and settings.xml
node(POD_LABEL) {
//Do not use concurrent builds
properties([disableConcurrentBuilds()])

def mvnCmd = "mvn -s /etc/m2/settings.xml --batch-mode"

stage('checkout') {
checkout scm
}

stage('Mvn clean package') {
sh "${mvnCmd} -PallTests clean package"
}

stage('Analyze build results') {
recordIssues aggregatingResults: true,
tools: [java(),
javaDoc(),
mavenConsole(),
taskScanner(highTags:'FIXME', normalTags:'TODO', includePattern: '**/*.java', excludePattern: 'target/**/*')]
}

stage('Push to Nexus (if Master)') {
echo "Branch name ${env.BRANCH_NAME}"
if (env.BRANCH_NAME == 'master') {
sh "${mvnCmd} clean deploy -DskipTests=true"
} else {
echo "Branch ${env.BRANCH_NAME} is not master, so no mvn deploy"
}
}
}
} catch (e) {
currentBuild.result = 'FAILURE'
throw e
} finally {
configFileProvider([configFile(fileId: "notifier", variable: 'notifier')]) {
def notifier = load notifier
notifier.notifyInCaseOfFailureOrImprovement(true, "#playground")
}
}
}
}

library identifier: 'StandardBuild@master', retriever: modernSCM(scm: [$class: 'GitSCMSource', remote: 'https://sbprojects.statsbiblioteket.dk/stash/scm/ist/jenkins-shared.git', credentialsId: 'crowd'],libraryPath: "Kuana") _

StandardBuild {
agent="maven"
maven="3.9.11"
jdk="21"
mavenLocalRepo='${WORKSPACE}/.repository/'
}
87 changes: 34 additions & 53 deletions message-xml-java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,26 @@

<dependencies>
<dependency>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics-runtime</artifactId>
<version>0.11.1</version>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-plugins-runtime</artifactId>
<version>4.0.12</version>
</dependency>
<!-- Below jakarta/jaxb dependencies are necessary for jaxb-xml with java 11-->
<!-- https://mvnrepository.com/artifact/javax.xml.bind/javax.xml.bind-api -->
<dependency>
<!-- https://mvnrepository.com/artifact/javax.xml.bind/javax.xml.bind-api -->
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.3</version>
<version>4.0.5</version>
</dependency>
<!-- https://mvnrepository.com/artifact/jakarta.activation/jakarta.activation-api -->
<dependency>
<!-- https://mvnrepository.com/artifact/jakarta.activation/jakarta.activation-api -->
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>1.2.2</version>
<version>2.1.4</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.3.6</version>
<version>4.0.9</version>
<scope>runtime</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -108,72 +107,54 @@
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
<version>2.5.0</version>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-maven-plugin</artifactId>
<version>4.0.12</version>
<configuration>
<!-- Necessary to exclude .xjb and .xml files as long as they share same folder as xsd files
- otherwise must specify source-files individually -->
<xjcSourceExcludeFilters>
<filter implementation="org.codehaus.mojo.jaxb2.shared.filters.pattern.PatternFileFilter">
<patterns>
<pattern>\.xjb</pattern>
<pattern>\.xml</pattern>
</patterns>
</filter>
</xjcSourceExcludeFilters>
<schemaDirectory>${project.basedir}/src/main/resources/xsd/</schemaDirectory>
<extension>true</extension>
<arguments>
<argument>-XtoString</argument>
<argument>-Xequals</argument>
<argument>-XhashCode</argument>
<argument>-Xannotate</argument>
</arguments>
<args>
<arg>-XtoString</arg>
<arg>-XsimpleEquals</arg>
<arg>-XsimpleHashCode</arg>
</args>
<plugins>
<plugin>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-plugins</artifactId>
<version>4.0.12</version>
</plugin>
</plugins>
</configuration>
<executions>
<execution>
<id>generate-message-classes</id>
<goals>
<goal>xjc</goal>
<goal>generate</goal>
</goals>
<phase>process-sources</phase>
<configuration>
<outputDirectory>${project.build.directory}/generated-sources/messages</outputDirectory>
<sources>
<source>${project.build.directory}/message-xml/xsd</source>
</sources>
<xjbSources>
<xjbSource>${project.build.directory}/message-xml/xsd/bindings.xjb</xjbSource>
</xjbSources>
<generateDirectory>${project.build.directory}/generated-sources/messages</generateDirectory>
<schemaDirectory>${project.build.directory}/message-xml/xsd</schemaDirectory>
<bindingIncludes>bindings.xjb</bindingIncludes>
</configuration>
</execution>
<execution>
<id>generate-message-versioning-classes</id>
<goals>
<goal>xjc</goal>
<goal>generate</goal>
</goals>
<phase>process-sources</phase>
<configuration>
<outputDirectory>${project.build.directory}/generated-sources/versioning</outputDirectory>
<sources>
<source>${project.build.directory}/message-xml/versioning</source>
</sources>
<generateDirectory>${project.build.directory}/generated-sources/versioning</generateDirectory>
<schemaDirectory>${project.build.directory}/message-xml/versioning</schemaDirectory>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics</artifactId>
<version>0.11.1</version>
</dependency>
<dependency>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics-annotate</artifactId>
<version>1.1.0</version>
</dependency>
</dependencies>


</plugin>

</plugins>
</build>
</project>
14 changes: 13 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
Expand Down Expand Up @@ -58,4 +59,15 @@
<additionalparam>-Xdoclint:none</additionalparam>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<release>21</release>
</configuration>
</plugin>
</plugins>
</build>
</project>