Skip to content

Commit e3e692e

Browse files
committed
Java 11 compiler version, jaxb 3 api
1 parent be67019 commit e3e692e

31 files changed

+111
-112
lines changed

Diff for: oai2-plugin/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ limitations under the License.
4343
<artifactId>maven-compiler-plugin</artifactId>
4444
<version>3.1</version>
4545
<configuration>
46-
<source>1.8</source>
47-
<target>1.8</target>
46+
<source>11</source>
47+
<target>11</target>
4848
</configuration>
4949
</plugin>
5050
</plugins>

Diff for: oai2-plugin/src/main/java/org/openarchives/oai2/AboutType.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020

2121
package org.openarchives.oai2;
2222

23-
import javax.xml.bind.annotation.XmlAccessType;
24-
import javax.xml.bind.annotation.XmlAccessorType;
25-
import javax.xml.bind.annotation.XmlAnyElement;
26-
import javax.xml.bind.annotation.XmlType;
23+
import jakarta.xml.bind.annotation.XmlAccessType;
24+
import jakarta.xml.bind.annotation.XmlAccessorType;
25+
import jakarta.xml.bind.annotation.XmlAnyElement;
26+
import jakarta.xml.bind.annotation.XmlType;
2727

2828

2929
/**

Diff for: oai2-plugin/src/main/java/org/openarchives/oai2/DeletedRecordType.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
package org.openarchives.oai2;
2222

23-
import javax.xml.bind.annotation.XmlEnum;
24-
import javax.xml.bind.annotation.XmlEnumValue;
25-
import javax.xml.bind.annotation.XmlType;
23+
import jakarta.xml.bind.annotation.XmlEnum;
24+
import jakarta.xml.bind.annotation.XmlEnumValue;
25+
import jakarta.xml.bind.annotation.XmlType;
2626

2727

2828
/**

Diff for: oai2-plugin/src/main/java/org/openarchives/oai2/DescriptionType.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020

2121
package org.openarchives.oai2;
2222

23-
import javax.xml.bind.annotation.XmlAccessType;
24-
import javax.xml.bind.annotation.XmlAccessorType;
25-
import javax.xml.bind.annotation.XmlAnyElement;
26-
import javax.xml.bind.annotation.XmlType;
23+
import jakarta.xml.bind.annotation.XmlAccessType;
24+
import jakarta.xml.bind.annotation.XmlAccessorType;
25+
import jakarta.xml.bind.annotation.XmlAnyElement;
26+
import jakarta.xml.bind.annotation.XmlType;
2727

2828

2929
/**

Diff for: oai2-plugin/src/main/java/org/openarchives/oai2/GetRecordType.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020

2121
package org.openarchives.oai2;
2222

23-
import javax.xml.bind.annotation.XmlAccessType;
24-
import javax.xml.bind.annotation.XmlAccessorType;
25-
import javax.xml.bind.annotation.XmlElement;
26-
import javax.xml.bind.annotation.XmlType;
23+
import jakarta.xml.bind.annotation.XmlAccessType;
24+
import jakarta.xml.bind.annotation.XmlAccessorType;
25+
import jakarta.xml.bind.annotation.XmlElement;
26+
import jakarta.xml.bind.annotation.XmlType;
2727

2828

2929
/**

Diff for: oai2-plugin/src/main/java/org/openarchives/oai2/GranularityType.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
package org.openarchives.oai2;
2222

23-
import javax.xml.bind.annotation.XmlEnum;
24-
import javax.xml.bind.annotation.XmlEnumValue;
25-
import javax.xml.bind.annotation.XmlType;
23+
import jakarta.xml.bind.annotation.XmlEnum;
24+
import jakarta.xml.bind.annotation.XmlEnumValue;
25+
import jakarta.xml.bind.annotation.XmlType;
2626

2727

2828
/**

Diff for: oai2-plugin/src/main/java/org/openarchives/oai2/HeaderType.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222

2323
import java.util.ArrayList;
2424
import java.util.List;
25-
import javax.xml.bind.annotation.XmlAccessType;
26-
import javax.xml.bind.annotation.XmlAccessorType;
27-
import javax.xml.bind.annotation.XmlAttribute;
28-
import javax.xml.bind.annotation.XmlElement;
29-
import javax.xml.bind.annotation.XmlType;
25+
import jakarta.xml.bind.annotation.XmlAccessType;
26+
import jakarta.xml.bind.annotation.XmlAccessorType;
27+
import jakarta.xml.bind.annotation.XmlAttribute;
28+
import jakarta.xml.bind.annotation.XmlElement;
29+
import jakarta.xml.bind.annotation.XmlType;
3030

3131

3232
/**

Diff for: oai2-plugin/src/main/java/org/openarchives/oai2/IdentifyType.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222

2323
import java.util.ArrayList;
2424
import java.util.List;
25-
import javax.xml.bind.annotation.XmlAccessType;
26-
import javax.xml.bind.annotation.XmlAccessorType;
27-
import javax.xml.bind.annotation.XmlElement;
28-
import javax.xml.bind.annotation.XmlSchemaType;
29-
import javax.xml.bind.annotation.XmlType;
25+
import jakarta.xml.bind.annotation.XmlAccessType;
26+
import jakarta.xml.bind.annotation.XmlAccessorType;
27+
import jakarta.xml.bind.annotation.XmlElement;
28+
import jakarta.xml.bind.annotation.XmlSchemaType;
29+
import jakarta.xml.bind.annotation.XmlType;
3030

3131

3232
/**

Diff for: oai2-plugin/src/main/java/org/openarchives/oai2/ListIdentifiersType.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222

2323
import java.util.ArrayList;
2424
import java.util.List;
25-
import javax.xml.bind.annotation.XmlAccessType;
26-
import javax.xml.bind.annotation.XmlAccessorType;
27-
import javax.xml.bind.annotation.XmlElement;
28-
import javax.xml.bind.annotation.XmlType;
25+
import jakarta.xml.bind.annotation.XmlAccessType;
26+
import jakarta.xml.bind.annotation.XmlAccessorType;
27+
import jakarta.xml.bind.annotation.XmlElement;
28+
import jakarta.xml.bind.annotation.XmlType;
2929

3030

3131
/**

Diff for: oai2-plugin/src/main/java/org/openarchives/oai2/ListMetadataFormatsType.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222

2323
import java.util.ArrayList;
2424
import java.util.List;
25-
import javax.xml.bind.annotation.XmlAccessType;
26-
import javax.xml.bind.annotation.XmlAccessorType;
27-
import javax.xml.bind.annotation.XmlElement;
28-
import javax.xml.bind.annotation.XmlType;
25+
import jakarta.xml.bind.annotation.XmlAccessType;
26+
import jakarta.xml.bind.annotation.XmlAccessorType;
27+
import jakarta.xml.bind.annotation.XmlElement;
28+
import jakarta.xml.bind.annotation.XmlType;
2929

3030

3131
/**

Diff for: oai2-plugin/src/main/java/org/openarchives/oai2/ListRecordsType.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222

2323
import java.util.ArrayList;
2424
import java.util.List;
25-
import javax.xml.bind.annotation.XmlAccessType;
26-
import javax.xml.bind.annotation.XmlAccessorType;
27-
import javax.xml.bind.annotation.XmlElement;
28-
import javax.xml.bind.annotation.XmlType;
25+
import jakarta.xml.bind.annotation.XmlAccessType;
26+
import jakarta.xml.bind.annotation.XmlAccessorType;
27+
import jakarta.xml.bind.annotation.XmlElement;
28+
import jakarta.xml.bind.annotation.XmlType;
2929

3030

3131
/**

Diff for: oai2-plugin/src/main/java/org/openarchives/oai2/ListSetsType.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222

2323
import java.util.ArrayList;
2424
import java.util.List;
25-
import javax.xml.bind.annotation.XmlAccessType;
26-
import javax.xml.bind.annotation.XmlAccessorType;
27-
import javax.xml.bind.annotation.XmlElement;
28-
import javax.xml.bind.annotation.XmlType;
25+
import jakarta.xml.bind.annotation.XmlAccessType;
26+
import jakarta.xml.bind.annotation.XmlAccessorType;
27+
import jakarta.xml.bind.annotation.XmlElement;
28+
import jakarta.xml.bind.annotation.XmlType;
2929

3030

3131
/**

Diff for: oai2-plugin/src/main/java/org/openarchives/oai2/MetadataFormatType.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020

2121
package org.openarchives.oai2;
2222

23-
import javax.xml.bind.annotation.XmlAccessType;
24-
import javax.xml.bind.annotation.XmlAccessorType;
25-
import javax.xml.bind.annotation.XmlElement;
26-
import javax.xml.bind.annotation.XmlSchemaType;
27-
import javax.xml.bind.annotation.XmlType;
23+
import jakarta.xml.bind.annotation.XmlAccessType;
24+
import jakarta.xml.bind.annotation.XmlAccessorType;
25+
import jakarta.xml.bind.annotation.XmlElement;
26+
import jakarta.xml.bind.annotation.XmlSchemaType;
27+
import jakarta.xml.bind.annotation.XmlType;
2828

2929

3030
/**

Diff for: oai2-plugin/src/main/java/org/openarchives/oai2/MetadataType.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020

2121
package org.openarchives.oai2;
2222

23-
import javax.xml.bind.annotation.XmlAccessType;
24-
import javax.xml.bind.annotation.XmlAccessorType;
25-
import javax.xml.bind.annotation.XmlAnyElement;
26-
import javax.xml.bind.annotation.XmlType;
23+
import jakarta.xml.bind.annotation.XmlAccessType;
24+
import jakarta.xml.bind.annotation.XmlAccessorType;
25+
import jakarta.xml.bind.annotation.XmlAnyElement;
26+
import jakarta.xml.bind.annotation.XmlType;
2727

2828

2929
/**

Diff for: oai2-plugin/src/main/java/org/openarchives/oai2/OAIPMHerrorType.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020

2121
package org.openarchives.oai2;
2222

23-
import javax.xml.bind.annotation.XmlAccessType;
24-
import javax.xml.bind.annotation.XmlAccessorType;
25-
import javax.xml.bind.annotation.XmlAttribute;
26-
import javax.xml.bind.annotation.XmlType;
27-
import javax.xml.bind.annotation.XmlValue;
23+
import jakarta.xml.bind.annotation.XmlAccessType;
24+
import jakarta.xml.bind.annotation.XmlAccessorType;
25+
import jakarta.xml.bind.annotation.XmlAttribute;
26+
import jakarta.xml.bind.annotation.XmlType;
27+
import jakarta.xml.bind.annotation.XmlValue;
2828

2929

3030
/**

Diff for: oai2-plugin/src/main/java/org/openarchives/oai2/OAIPMHerrorcodeType.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
package org.openarchives.oai2;
2222

23-
import javax.xml.bind.annotation.XmlEnum;
24-
import javax.xml.bind.annotation.XmlEnumValue;
25-
import javax.xml.bind.annotation.XmlType;
23+
import jakarta.xml.bind.annotation.XmlEnum;
24+
import jakarta.xml.bind.annotation.XmlEnumValue;
25+
import jakarta.xml.bind.annotation.XmlType;
2626

2727

2828
/**

Diff for: oai2-plugin/src/main/java/org/openarchives/oai2/OAIPMHtype.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
package org.openarchives.oai2;
2222

23-
import javax.xml.bind.annotation.*;
24-
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
23+
import jakarta.xml.bind.annotation.*;
24+
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
2525
import javax.xml.datatype.XMLGregorianCalendar;
2626
import java.util.ArrayList;
2727
import java.util.List;

Diff for: oai2-plugin/src/main/java/org/openarchives/oai2/ObjectFactory.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
package org.openarchives.oai2;
2222

23-
import javax.xml.bind.JAXBElement;
24-
import javax.xml.bind.annotation.XmlElementDecl;
25-
import javax.xml.bind.annotation.XmlRegistry;
23+
import jakarta.xml.bind.JAXBElement;
24+
import jakarta.xml.bind.annotation.XmlElementDecl;
25+
import jakarta.xml.bind.annotation.XmlRegistry;
2626
import javax.xml.namespace.QName;
2727

2828

Diff for: oai2-plugin/src/main/java/org/openarchives/oai2/RecordType.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020

2121
package org.openarchives.oai2;
2222

23-
import javax.xml.bind.annotation.XmlAccessType;
24-
import javax.xml.bind.annotation.XmlAccessorType;
25-
import javax.xml.bind.annotation.XmlElement;
26-
import javax.xml.bind.annotation.XmlType;
23+
import jakarta.xml.bind.annotation.XmlAccessType;
24+
import jakarta.xml.bind.annotation.XmlAccessorType;
25+
import jakarta.xml.bind.annotation.XmlElement;
26+
import jakarta.xml.bind.annotation.XmlType;
2727
import java.util.ArrayList;
2828
import java.util.List;
2929

Diff for: oai2-plugin/src/main/java/org/openarchives/oai2/RequestType.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020

2121
package org.openarchives.oai2;
2222

23-
import javax.xml.bind.annotation.XmlAccessType;
24-
import javax.xml.bind.annotation.XmlAccessorType;
25-
import javax.xml.bind.annotation.XmlAttribute;
26-
import javax.xml.bind.annotation.XmlSchemaType;
27-
import javax.xml.bind.annotation.XmlType;
28-
import javax.xml.bind.annotation.XmlValue;
23+
import jakarta.xml.bind.annotation.XmlAccessType;
24+
import jakarta.xml.bind.annotation.XmlAccessorType;
25+
import jakarta.xml.bind.annotation.XmlAttribute;
26+
import jakarta.xml.bind.annotation.XmlSchemaType;
27+
import jakarta.xml.bind.annotation.XmlType;
28+
import jakarta.xml.bind.annotation.XmlValue;
2929

3030

3131
/**

Diff for: oai2-plugin/src/main/java/org/openarchives/oai2/ResumptionTokenType.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
package org.openarchives.oai2;
2222

23-
import javax.xml.bind.annotation.*;
24-
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
23+
import jakarta.xml.bind.annotation.*;
24+
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
2525
import javax.xml.datatype.XMLGregorianCalendar;
2626
import java.math.BigInteger;
2727

Diff for: oai2-plugin/src/main/java/org/openarchives/oai2/SetType.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222

2323
import java.util.ArrayList;
2424
import java.util.List;
25-
import javax.xml.bind.annotation.XmlAccessType;
26-
import javax.xml.bind.annotation.XmlAccessorType;
27-
import javax.xml.bind.annotation.XmlElement;
28-
import javax.xml.bind.annotation.XmlType;
25+
import jakarta.xml.bind.annotation.XmlAccessType;
26+
import jakarta.xml.bind.annotation.XmlAccessorType;
27+
import jakarta.xml.bind.annotation.XmlElement;
28+
import jakarta.xml.bind.annotation.XmlType;
2929

3030

3131
/**

Diff for: oai2-plugin/src/main/java/org/openarchives/oai2/StatusType.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
package org.openarchives.oai2;
2222

23-
import javax.xml.bind.annotation.XmlEnum;
24-
import javax.xml.bind.annotation.XmlEnumValue;
25-
import javax.xml.bind.annotation.XmlType;
23+
import jakarta.xml.bind.annotation.XmlEnum;
24+
import jakarta.xml.bind.annotation.XmlEnumValue;
25+
import jakarta.xml.bind.annotation.XmlType;
2626

2727

2828
/**

Diff for: oai2-plugin/src/main/java/org/openarchives/oai2/VerbType.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
package org.openarchives.oai2;
2222

23-
import javax.xml.bind.annotation.XmlEnum;
24-
import javax.xml.bind.annotation.XmlEnumValue;
25-
import javax.xml.bind.annotation.XmlType;
23+
import jakarta.xml.bind.annotation.XmlEnum;
24+
import jakarta.xml.bind.annotation.XmlEnumValue;
25+
import jakarta.xml.bind.annotation.XmlType;
2626

2727

2828
/**

Diff for: oai2-plugin/src/main/java/org/openarchives/oai2/XmlDatestampAdapter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import org.socialhistoryservices.api.oai.Parsing;
44

5-
import javax.xml.bind.annotation.adapters.XmlAdapter;
5+
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
66
import javax.xml.datatype.XMLGregorianCalendar;
77

88
/**

Diff for: oai2-plugin/src/main/java/org/socialhistoryservices/api/oai/OAIQueryResponseWriter.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
import org.openarchives.oai2.RequestType;
3333
import org.openarchives.oai2.ResumptionTokenType;
3434

35-
import javax.xml.bind.JAXBElement;
36-
import javax.xml.bind.JAXBException;
37-
import javax.xml.bind.Marshaller;
35+
import jakarta.xml.bind.JAXBElement;
36+
import jakarta.xml.bind.JAXBException;
37+
import jakarta.xml.bind.Marshaller;
3838
import javax.xml.datatype.XMLGregorianCalendar;
3939
import javax.xml.namespace.QName;
4040
import javax.xml.transform.Result;

Diff for: oai2-plugin/src/main/java/org/socialhistoryservices/api/oai/OAIRequestHandler.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
import org.apache.solr.search.SyntaxError;
3939
import org.openarchives.oai2.*;
4040

41-
import javax.xml.bind.JAXBContext;
42-
import javax.xml.bind.JAXBException;
41+
import jakarta.xml.bind.JAXBContext;
42+
import jakarta.xml.bind.JAXBException;
4343
import javax.xml.transform.Source;
4444
import javax.xml.transform.Templates;
4545
import javax.xml.transform.TransformerConfigurationException;

Diff for: oai2-plugin/src/main/java/org/socialhistoryservices/api/oai/Parsing.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
import org.openarchives.oai2.OAIPMHtype;
2424
import org.openarchives.oai2.VerbType;
2525

26-
import javax.xml.bind.JAXBElement;
27-
import javax.xml.bind.JAXBException;
28-
import javax.xml.bind.Unmarshaller;
26+
import jakarta.xml.bind.JAXBElement;
27+
import jakarta.xml.bind.JAXBException;
28+
import jakarta.xml.bind.Unmarshaller;
2929
import javax.xml.datatype.DatatypeConfigurationException;
3030
import javax.xml.datatype.DatatypeFactory;
3131
import javax.xml.datatype.XMLGregorianCalendar;

0 commit comments

Comments
 (0)