Skip to content

Commit 414e819

Browse files
palemieuxfschleich
palemieux
and
fschleich
authored
1.2.0 Release
* migrate from javax.xml.bind.* to jakarta.xml.bind.* * migrate to central repository * move to Java 11 minimum requirement Co-authored-by: Florian Schleich <[email protected]>
1 parent eb29d11 commit 414e819

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+221
-213
lines changed

‎.github/workflows/main.yaml‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,36 @@ name: Test
33
on: [push, pull_request]
44

55
jobs:
6-
build:
7-
8-
runs-on: ubuntu-latest
9-
6+
JavaBuild:
7+
name: Test regxmllibJ
108
if: (github.event_name == 'push' && github.ref == 'refs/heads/main') || github.event_name == 'pull_request'
9+
runs-on: ubuntu-latest
10+
strategy:
11+
matrix:
12+
java-version: [11, 17, 21]
1113

1214
steps:
13-
- name: install dependencies
14-
run: sudo apt install libxerces-c-dev
1515
- name: Checkout repo
1616
uses: actions/checkout@v3
17-
- name: Set up JDK 8
17+
- name: Set up a JDK
1818
uses: actions/setup-java@v3
1919
with:
20-
java-version: '8'
20+
java-version: ${{ matrix.java-version }}
2121
distribution: 'corretto'
2222
cache: maven
2323
- name: Test Java
2424
run: mvn test
25+
26+
cpp_build:
27+
name: Test regxmllibC
28+
if: (github.event_name == 'push' && github.ref == 'refs/heads/main') || github.event_name == 'pull_request'
29+
runs-on: ubuntu-latest
30+
31+
steps:
32+
- name: install dependencies
33+
run: sudo apt install libxerces-c-dev
34+
- name: Checkout repo
35+
uses: actions/checkout@v3
2536
- name: Test C++
2637
run: |
2738
cmake -B build

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ CMakeSettings.json
99
.project
1010
.settings
1111
.vscode/
12-
.classpath
12+
.classpath

‎README.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ REGXMLLIBJ
4545
Prerequisites
4646
-------------
4747

48-
Java 8 language and SDK
48+
Java 11 and above
4949

5050
Maven
5151

‎pom.xml‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>com.sandflow</groupId>
66
<artifactId>regxmllib</artifactId>
7-
<version>1.1.5</version>
7+
<version>1.2.0</version>
88
<packaging>jar</packaging>
99

1010
<properties>
@@ -53,6 +53,11 @@
5353
<version>4.13.1</version>
5454
<scope>test</scope>
5555
</dependency>
56+
<dependency>
57+
<groupId>org.glassfish.jaxb</groupId>
58+
<artifactId>jaxb-runtime</artifactId>
59+
<version>4.0.5</version>
60+
</dependency>
5661
</dependencies>
5762

5863
<build>
@@ -99,22 +104,16 @@
99104
<maven.test.skip>true</maven.test.skip>
100105
</properties>
101106
<dependencies>
102-
<dependency>
103-
<groupId>javax.xml.bind</groupId>
104-
<artifactId>jaxb-api</artifactId>
105-
<version>2.3.1</version>
106-
<scope>runtime</scope>
107-
</dependency>
108107
<dependency>
109108
<groupId>com.sun.xml.bind</groupId>
110109
<artifactId>jaxb-impl</artifactId>
111-
<version>2.3.1</version>
110+
<version>4.0.5</version>
112111
<scope>runtime</scope>
113112
</dependency>
114113
<dependency>
115114
<groupId>com.sun.xml.bind</groupId>
116115
<artifactId>jaxb-core</artifactId>
117-
<version>2.3.0.1</version>
116+
<version>4.0.5</version>
118117
<scope>runtime</scope>
119118
</dependency>
120119
</dependencies>
@@ -196,17 +195,15 @@
196195
</execution>
197196
</executions>
198197
</plugin>
199-
<plugin>
200-
<groupId>org.sonatype.plugins</groupId>
201-
<artifactId>nexus-staging-maven-plugin</artifactId>
202-
<version>1.6.7</version>
198+
<plugin>
199+
<groupId>org.sonatype.central</groupId>
200+
<artifactId>central-publishing-maven-plugin</artifactId>
201+
<version>0.8.0</version>
203202
<extensions>true</extensions>
204203
<configuration>
205-
<serverId>ossrh</serverId>
206-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
207-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
204+
<publishingServerId>central</publishingServerId>
208205
</configuration>
209-
</plugin>
206+
</plugin>
210207
</plugins>
211208
</build>
212209
</profile>

‎src/main/java/com/sandflow/smpte/register/ElementsRegister.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@
3333
import java.net.URI;
3434
import java.util.Collection;
3535
import java.util.HashMap;
36-
import javax.xml.bind.JAXBContext;
37-
import javax.xml.bind.JAXBException;
38-
import javax.xml.bind.Marshaller;
39-
import javax.xml.bind.Unmarshaller;
40-
import javax.xml.bind.annotation.XmlTransient;
41-
import javax.xml.bind.annotation.XmlType;
36+
import jakarta.xml.bind.JAXBContext;
37+
import jakarta.xml.bind.JAXBException;
38+
import jakarta.xml.bind.Marshaller;
39+
import jakarta.xml.bind.Unmarshaller;
40+
import jakarta.xml.bind.annotation.XmlTransient;
41+
import jakarta.xml.bind.annotation.XmlType;
4242

4343
/**
4444
* Elements Register as defined in SMPTE ST 335

‎src/main/java/com/sandflow/smpte/register/GroupsRegister.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@
3434
import java.util.Collection;
3535
import java.util.HashMap;
3636
import java.util.Set;
37-
import javax.xml.bind.JAXBContext;
38-
import javax.xml.bind.JAXBException;
39-
import javax.xml.bind.Marshaller;
40-
import javax.xml.bind.Unmarshaller;
41-
import javax.xml.bind.annotation.XmlTransient;
42-
import javax.xml.bind.annotation.XmlType;
37+
import jakarta.xml.bind.JAXBContext;
38+
import jakarta.xml.bind.JAXBException;
39+
import jakarta.xml.bind.Marshaller;
40+
import jakarta.xml.bind.Unmarshaller;
41+
import jakarta.xml.bind.annotation.XmlTransient;
42+
import jakarta.xml.bind.annotation.XmlType;
4343

4444
/**
4545
* Groups Register as defined in SMPTE ST 395

‎src/main/java/com/sandflow/smpte/register/LabelsRegister.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@
3333
import java.net.URI;
3434
import java.util.Collection;
3535
import java.util.HashMap;
36-
import javax.xml.bind.JAXBContext;
37-
import javax.xml.bind.JAXBException;
38-
import javax.xml.bind.Marshaller;
39-
import javax.xml.bind.Unmarshaller;
40-
import javax.xml.bind.annotation.XmlTransient;
41-
import javax.xml.bind.annotation.XmlType;
36+
import jakarta.xml.bind.JAXBContext;
37+
import jakarta.xml.bind.JAXBException;
38+
import jakarta.xml.bind.Marshaller;
39+
import jakarta.xml.bind.Unmarshaller;
40+
import jakarta.xml.bind.annotation.XmlTransient;
41+
import jakarta.xml.bind.annotation.XmlType;
4242

4343
/**
4444
* Labels Register as defined in SMPTE ST 400

‎src/main/java/com/sandflow/smpte/register/TypesRegister.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@
3535
import java.util.EnumSet;
3636
import java.util.HashMap;
3737
import java.util.List;
38-
import javax.xml.bind.JAXBContext;
39-
import javax.xml.bind.JAXBException;
40-
import javax.xml.bind.Marshaller;
41-
import javax.xml.bind.Unmarshaller;
42-
import javax.xml.bind.annotation.XmlTransient;
43-
import javax.xml.bind.annotation.XmlType;
38+
import jakarta.xml.bind.JAXBContext;
39+
import jakarta.xml.bind.JAXBException;
40+
import jakarta.xml.bind.Marshaller;
41+
import jakarta.xml.bind.Unmarshaller;
42+
import jakarta.xml.bind.annotation.XmlTransient;
43+
import jakarta.xml.bind.annotation.XmlType;
4444

4545
/**
4646
* Types Register as defined in SMPTE ST 2003

‎src/main/java/com/sandflow/smpte/register/brown_sauce/GroupsRegisterModel.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@
3535
import java.util.HashSet;
3636
import java.util.List;
3737
import java.util.Set;
38-
import javax.xml.bind.annotation.XmlAccessType;
39-
import javax.xml.bind.annotation.XmlAccessorType;
40-
import javax.xml.bind.annotation.XmlElement;
41-
import javax.xml.bind.annotation.XmlElementWrapper;
42-
import javax.xml.bind.annotation.XmlList;
43-
import javax.xml.bind.annotation.XmlRootElement;
44-
import javax.xml.bind.annotation.XmlSchemaType;
45-
import javax.xml.bind.annotation.XmlType;
46-
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
38+
import jakarta.xml.bind.annotation.XmlAccessType;
39+
import jakarta.xml.bind.annotation.XmlAccessorType;
40+
import jakarta.xml.bind.annotation.XmlElement;
41+
import jakarta.xml.bind.annotation.XmlElementWrapper;
42+
import jakarta.xml.bind.annotation.XmlList;
43+
import jakarta.xml.bind.annotation.XmlRootElement;
44+
import jakarta.xml.bind.annotation.XmlSchemaType;
45+
import jakarta.xml.bind.annotation.XmlType;
46+
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
4747

4848
/**
4949
* Groups Register as defined in SMPTE ST 395

‎src/main/java/com/sandflow/smpte/register/brown_sauce/package-info.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@
3131
package com.sandflow.smpte.register.brown_sauce;
3232

3333

34-
import javax.xml.bind.annotation.XmlNsForm;
35-
import javax.xml.bind.annotation.XmlSchema;
34+
import jakarta.xml.bind.annotation.XmlNsForm;
35+
import jakarta.xml.bind.annotation.XmlSchema;
3636

0 commit comments

Comments
 (0)