Skip to content

Commit ecf9ac9

Browse files
committed
First commit in the jakarta world. This is incomplete but a number of modules build.
Changes so far: * Upgrade to java 21 * Update all maven plugin versions * Switch javax to jakarta where appropriate * A few changes to make those builds work.
1 parent 2aa1611 commit ecf9ac9

File tree

12 files changed

+14
-14
lines changed

12 files changed

+14
-14
lines changed

bw-util2-calendar/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@
5555
</dependency>
5656

5757
<dependency>
58-
<groupId>javax.xml.bind</groupId>
59-
<artifactId>jaxb-api</artifactId>
58+
<groupId>jakarta.xml.bind</groupId>
59+
<artifactId>jakarta.xml.bind-api</artifactId>
6060
</dependency>
6161

6262
<!-- Test Dependencies -->

bw-util2-calendar/src/main/java/org/bedework/util/calendar/IcalToXcal.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
import java.util.List;
153153
import java.util.function.BiFunction;
154154

155-
import javax.xml.bind.JAXBElement;
155+
import jakarta.xml.bind.JAXBElement;
156156

157157
/** Conversion to XML from ical4j
158158
* @author douglm

bw-util2-calendar/src/main/java/org/bedework/util/calendar/WsXMLTranslator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
import java.util.List;
6767
import java.util.function.Consumer;
6868

69-
import javax.xml.bind.JAXBElement;
69+
import jakarta.xml.bind.JAXBElement;
7070
import javax.xml.namespace.QName;
7171

7272
/** Convert to/from Web Services style XML. On input this has been parsed by the

bw-util2-calendar/src/main/java/org/bedework/util/calendar/XcalUtil.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
import java.util.regex.Matcher;
5151
import java.util.regex.Pattern;
5252

53-
import javax.xml.bind.JAXBElement;
53+
import jakarta.xml.bind.JAXBElement;
5454
import javax.xml.datatype.DatatypeConfigurationException;
5555
import javax.xml.datatype.DatatypeFactory;
5656
import javax.xml.datatype.Duration;

bw-util2-calendar/src/main/java/org/bedework/util/calendar/diff/BaseEntityWrapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
import ietf.params.xml.ns.icalendar_2.TextParameterType;
2525

26-
import javax.xml.bind.JAXBElement;
26+
import jakarta.xml.bind.JAXBElement;
2727
import javax.xml.namespace.QName;
2828

2929
/** This class wraps a property.

bw-util2-calendar/src/main/java/org/bedework/util/calendar/diff/CompWrapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import org.oasis_open.docs.ws_calendar.ns.soap.ComponentsSelectionType;
3333
import org.oasis_open.docs.ws_calendar.ns.soap.PropertiesSelectionType;
3434

35-
import javax.xml.bind.JAXBElement;
35+
import jakarta.xml.bind.JAXBElement;
3636
import javax.xml.namespace.QName;
3737

3838
/** This class wraps a component.

bw-util2-calendar/src/main/java/org/bedework/util/calendar/diff/CompsWrapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import java.util.Set;
3131
import java.util.TreeSet;
3232

33-
import javax.xml.bind.JAXBElement;
33+
import jakarta.xml.bind.JAXBElement;
3434

3535
/** This class wraps an array of components.
3636
*

bw-util2-calendar/src/main/java/org/bedework/util/calendar/diff/ParamsWrapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import java.util.Set;
3131
import java.util.TreeSet;
3232

33-
import javax.xml.bind.JAXBElement;
33+
import jakarta.xml.bind.JAXBElement;
3434

3535
/** This class wraps an array of parameters.
3636
*

bw-util2-calendar/src/main/java/org/bedework/util/calendar/diff/PropWrapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import java.util.List;
3333
import java.util.Map;
3434

35-
import javax.xml.bind.JAXBElement;
35+
import jakarta.xml.bind.JAXBElement;
3636
import javax.xml.namespace.QName;
3737

3838
/** This class wraps a property.

bw-util2-calendar/src/main/java/org/bedework/util/calendar/diff/PropsWrapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import java.util.Set;
3131
import java.util.TreeSet;
3232

33-
import javax.xml.bind.JAXBElement;
33+
import jakarta.xml.bind.JAXBElement;
3434
import javax.xml.namespace.QName;
3535

3636
/** This class wraps an array of properties. Properties are ordered by the

bw-util2-vcard/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
</dependency>
5353

5454
<dependency>
55-
<groupId>javax.xml.bind</groupId>
56-
<artifactId>jaxb-api</artifactId>
55+
<groupId>jakarta.xml.bind</groupId>
56+
<artifactId>jakarta.xml.bind-api</artifactId>
5757
</dependency>
5858
</dependencies>
5959
</project>

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.bedework</groupId>
66
<artifactId>bedework-parent</artifactId>
7-
<version>98</version>
7+
<version>200-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>bw-util2</artifactId>

0 commit comments

Comments
 (0)