Merge pull request #2 from dockstore/dockstore_release

Dockstore release
dockstore · May 8, 2023 · a756554 · a756554
2 parents 7b86760 + 3e73ad6
commit a756554
Show file tree

Hide file tree

Showing 507 changed files with 2,361 additions and 2,331 deletions.
diff --git a/.github/workflows/mvn.yml b/.github/workflows/mvn.yml
@@ -0,0 +1,24 @@
+name: Java CI
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      # Step that does that actual cache save and restore
+      - uses: actions/cache@v1
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+           ${{ runner.os }}-maven-
+      - name: Set up JDK
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17.0.4+8'
+          distribution: 'adopt'           
+      - name: Build with mvn
+        run: mvn -B -ntp  clean install 
diff --git a/pom.xml b/pom.xml
@@ -1,16 +1,15 @@
-<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/maven-v4_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/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.orcid</groupId>
-	<artifactId>orcid-model</artifactId>
-	<version>3.2.0</version>
+	<artifactId>orcid-model-jakarta</artifactId>
+	<version>3.3.1-SNAPSHOT</version>
 
 	<name>ORCID - Model</name>
 	<description>Container for all classes that will be used to marshal and unmarshal XML/JSON from the API</description>
-	<url>http://github.com/ORCID/orcid-model</url>
+	<url>https://github.com/ORCID/orcid-model</url>
 
 	<properties>
+		<github.url>scm:git:[email protected]:denis-yuen/orcid-model.git</github.url>
 		<main.basedir>${project.basedir}</main.basedir>
 		<swagger.version>2.2.7</swagger.version>
 		<jena.version>3.6.0</jena.version>
@@ -21,7 +20,7 @@
 	<licenses>
 		<license>
 			<name>MIT License</name>
-			<url>http://www.opensource.org/licenses/mit-license.php</url>
+			<url>https://www.opensource.org/licenses/mit-license.php</url>
 		</license>
 	</licenses>
 
@@ -35,10 +34,11 @@
 	</developers>
 
 	<scm>
-		<connection>scm:git:git://github.com/ORCID/orcid-model.git</connection>
-		<developerConnection>scm:git:ssh://github.com:ORCID/orcid-model.git</developerConnection>
-		<url>http://github.com/ORCID/orcid-model/tree/master</url>
-	</scm>
+		<connection>${github.url}</connection>
+		<developerConnection>${github.url}</developerConnection>
+		<url>${github.url}</url>
+	  <tag>3.3.0</tag>
+  </scm>
 
 	<profiles>
 		<profile>
@@ -81,7 +81,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
-						<version>2.9.1</version>
+						<version>3.5.0</version>
 						<executions>
 							<execution>
 								<id>attach-javadocs</id>
@@ -122,7 +122,7 @@
 			<plugin>
 	        <groupId>org.apache.maven.plugins</groupId>
 	        <artifactId>maven-enforcer-plugin</artifactId>
-	        <version>3.0.0-M3</version>
+	        <version>3.0.0</version>
 	        <executions>
 	            <execution>
 	            <id>enforce-versions</id>
@@ -132,10 +132,10 @@
 	            <configuration>
 	                <rules>
 	                    <requireMavenVersion>
-	                        <version>3.6.3</version>
+	                        <version>3.8.6</version>
 	                    </requireMavenVersion>
 	                    <requireJavaVersion>
-	                        <version>11</version>
+	                        <version>17</version>
 	                    </requireJavaVersion>
 	                </rules>
 	            </configuration>
@@ -145,17 +145,17 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.8.1</version>
+				<version>3.10.1</version>
 				<inherited>true</inherited>
 				<configuration>
-					<source>11</source>
-					<target>11</target>
+					<source>17</source>
+					<target>17</target>
 				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.2.0</version>
+				<version>3.5.0</version>
 				<executions>
 					<execution>
 						<id>attach-javadocs</id>
@@ -169,13 +169,10 @@
 	</build>
 
 	<distributionManagement>
-		<snapshotRepository>
-			<id>ossrh</id>
-			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
-		</snapshotRepository>
 		<repository>
-			<id>ossrh</id>
-			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+			<id>central</id>
+			<name>artifacts.oicr.on.ca-releases</name>
+			<url>https://artifacts.oicr.on.ca/artifactory/collab-release</url>
 		</repository>
 	</distributionManagement>
 
@@ -191,18 +188,18 @@
 			<version>2.6</version>
 		</dependency>
 		<dependency>
-			<groupId>com.fasterxml.jackson.jaxrs</groupId>
-			<artifactId>jackson-jaxrs-json-provider</artifactId>
+			<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
+			<artifactId>jackson-jakarta-rs-json-provider</artifactId>
 			<version>${jackson.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>io.swagger.core.v3</groupId>
-			<artifactId>swagger-jaxrs2</artifactId>
+			<artifactId>swagger-jaxrs2-jakarta</artifactId>
 			<version>${swagger.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>io.swagger.core.v3</groupId>
-			<artifactId>swagger-annotations</artifactId>
+			<artifactId>swagger-annotations-jakarta</artifactId>
 			<version>${swagger.version}</version>
 		</dependency>
 
@@ -222,17 +219,27 @@
              <groupId>com.fasterxml.jackson.core</groupId>
              <artifactId>jackson-databind</artifactId>
              <version>${jackson.version}</version>
-        </dependency> 
+        </dependency>
 		<dependency>
-			<groupId>com.sun.xml.bind</groupId>
-			<artifactId>jaxb-impl</artifactId>
-			<version>2.3.6</version>
-			</dependency>
+			<groupId>jakarta.xml.bind</groupId>
+			<artifactId>jakarta.xml.bind-api</artifactId>
+			<version>3.0.1</version>
+		</dependency>
 		<dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-            <version>1.3.2</version>
-        </dependency>
+			<groupId>org.glassfish.jaxb</groupId>
+			<artifactId>jaxb-runtime</artifactId>
+			<version>3.0.2</version>
+		</dependency>
+		<dependency>
+			<groupId>jakarta.validation</groupId>
+			<artifactId>jakarta.validation-api</artifactId>
+			<version>3.0.2</version>
+		</dependency>
+		<dependency>
+			<groupId>jakarta.annotation</groupId>
+			<artifactId>jakarta.annotation-api</artifactId>
+			<version>2.0.0</version>
+		</dependency>
 
 		<!-- test -->
 		<dependency>

diff --git a/src/main/java/org/orcid/jaxb/model/client_v2/ClientSummary.java b/src/main/java/org/orcid/jaxb/model/client_v2/ClientSummary.java
@@ -2,11 +2,11 @@
 
 import java.io.Serializable;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(propOrder = { "name", "description" })

diff --git a/src/main/java/org/orcid/jaxb/model/clientgroup/ClientType.java b/src/main/java/org/orcid/jaxb/model/clientgroup/ClientType.java
@@ -10,9 +10,9 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnumValue;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.orcid.jaxb.model.message.ScopePathType;
 

diff --git a/src/main/java/org/orcid/jaxb/model/clientgroup/MemberType.java b/src/main/java/org/orcid/jaxb/model/clientgroup/MemberType.java
@@ -1,8 +1,8 @@
 package org.orcid.jaxb.model.clientgroup;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnumValue;
+import jakarta.xml.bind.annotation.XmlType;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 

diff --git a/src/main/java/org/orcid/jaxb/model/clientgroup/ObjectFactory.java b/src/main/java/org/orcid/jaxb/model/clientgroup/ObjectFactory.java
@@ -7,9 +7,9 @@
 
 package org.orcid.jaxb.model.clientgroup;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
 
 /**

diff --git a/src/main/java/org/orcid/jaxb/model/clientgroup/OrcidClientGroup.java b/src/main/java/org/orcid/jaxb/model/clientgroup/OrcidClientGroup.java
@@ -13,10 +13,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.Unmarshaller;
 
 public class OrcidClientGroup implements Serializable {
 

diff --git a/src/main/java/org/orcid/jaxb/model/clientgroup/RedirectUri.java b/src/main/java/org/orcid/jaxb/model/clientgroup/RedirectUri.java
@@ -3,14 +3,14 @@
 import java.io.Serializable;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlValue;
 
 import org.orcid.jaxb.model.message.ScopePathType;
 

diff --git a/src/main/java/org/orcid/jaxb/model/clientgroup/RedirectUriType.java b/src/main/java/org/orcid/jaxb/model/clientgroup/RedirectUriType.java
@@ -7,9 +7,9 @@
 
 package org.orcid.jaxb.model.clientgroup;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnumValue;
+import jakarta.xml.bind.annotation.XmlType;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 

diff --git a/src/main/java/org/orcid/jaxb/model/clientgroup/RedirectUris.java b/src/main/java/org/orcid/jaxb/model/clientgroup/RedirectUris.java
@@ -2,11 +2,11 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 /**
  * Java class for anonymous complex type.

diff --git a/src/main/java/org/orcid/jaxb/model/clientgroup/package-info.java b/src/main/java/org/orcid/jaxb/model/clientgroup/package-info.java
@@ -5,6 +5,6 @@
 // Generated on: 2012.04.18 at 12:45:00 PM BST 
 //
 
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/orcid", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/orcid", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package org.orcid.jaxb.model.clientgroup;
 
diff --git a/src/main/java/org/orcid/jaxb/model/common/AvailableLocales.java b/src/main/java/org/orcid/jaxb/model/common/AvailableLocales.java
@@ -1,7 +1,7 @@
 package org.orcid.jaxb.model.common;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 

diff --git a/src/main/java/org/orcid/jaxb/model/common/SequenceType.java b/src/main/java/org/orcid/jaxb/model/common/SequenceType.java
@@ -2,8 +2,8 @@
 
 import java.io.Serializable;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 /**
  * @author Declan Newman (declan)

diff --git a/src/main/java/org/orcid/jaxb/model/common/adapters/AvailableLocalesAdapter.java b/src/main/java/org/orcid/jaxb/model/common/adapters/AvailableLocalesAdapter.java
@@ -1,6 +1,6 @@
 package org.orcid.jaxb.model.common.adapters;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 import org.orcid.jaxb.model.common.AvailableLocales;
 

diff --git a/src/main/java/org/orcid/jaxb/model/common/adapters/CitationTypeAdapter.java b/src/main/java/org/orcid/jaxb/model/common/adapters/CitationTypeAdapter.java
@@ -1,6 +1,6 @@
 package org.orcid.jaxb.model.common.adapters;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 import org.orcid.jaxb.model.common.CitationType;
 

diff --git a/src/main/java/org/orcid/jaxb/model/common/adapters/ContributorRoleAdapter.java b/src/main/java/org/orcid/jaxb/model/common/adapters/ContributorRoleAdapter.java
@@ -1,6 +1,6 @@
 package org.orcid.jaxb.model.common.adapters;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 import org.orcid.jaxb.model.common.ContributorRole;
 

diff --git a/src/main/java/org/orcid/jaxb/model/common/adapters/CurrencyAdapter.java b/src/main/java/org/orcid/jaxb/model/common/adapters/CurrencyAdapter.java
@@ -2,7 +2,7 @@
 
 import java.util.Currency;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 public class CurrencyAdapter extends XmlAdapter<String, Currency> {
 

diff --git a/src/main/java/org/orcid/jaxb/model/common/adapters/FundingContributorRoleAdapter.java b/src/main/java/org/orcid/jaxb/model/common/adapters/FundingContributorRoleAdapter.java
@@ -1,6 +1,6 @@
 package org.orcid.jaxb.model.common.adapters;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 import org.orcid.jaxb.model.common.FundingContributorRole;