Merge pull request #3 from 4Science/DS-4525

DS-4525 Update ORCID JAXB to version 3

Author: tdonohue

.travis.yml

@@ -1,2 +1,4 @@
 language: java
 sudo: false
+jdk:
+  - openjdk8

README.md

@@ -3,7 +3,7 @@
 This is an ORCID-Model Java API generated (using JAXB) from the official ORCID XSDs.
 
 Resources:
-* ORCID-Model Official XSDs: https://github.com/ORCID/ORCID-Source/tree/master/orcid-model/src/main/resources
+* ORCID-Model Official XSDs: https://github.com/ORCID/orcid-model/tree/master/src/main/resources
 
 ***
 :warning: WARNING: GENERATED SOURCE CODE
@@ -18,18 +18,18 @@ USE AT YOUR OWN RISK. This source code has only been tested with DSpace and may
 The below will regenerate/update the ORCID Java API stored in the `src/main/java` folder of this GitHub repo.
 
 1. Clone this `orcid-jaxb-api` repo locally
-2. Clone the [ORCID-Source](https://github.com/ORCID/ORCID-Source/) repo (to a different location), and optionally checkout a specific tag:
+2. Clone the [ORCID-model](https://github.com/ORCID/orcid-model/) repo (to a different location), and optionally checkout a specific tag:
    ```
-   git clone https://github.com/ORCID/ORCID-Source.git
+   git clone https://github.com/ORCID/orcid-model.git
    ```
 3. Copy the necessary ORCID XSD folders into this repo's `src/main/resources/xsd/` folder. Check the POM `<schemaIncludes>` list for the XSDs we need.
   _Be sure not to overwrite the `.gitignore` already in the "empty" `xsd` folder, as we do NOT want to keep the XSDs in this repo!_
    ```
    # Copy over common_2.1 XSDs
-   cp -r [ORCID-Source]/orcid-model/src/main/resources/common_2.1 [orcid-jaxb-api]/src/main/resources/xsd/
+   cp -r [ORCID-model]/src/main/resources/common_3.0 [orcid-jaxb-api]/src/main/resources/xsd/
    
    # Copy over record_2.1 XSDs
-   cp -r [ORCID-Source]/orcid-model/src/main/resources/record_2.1 [orcid-jaxb-api]/src/main/resources/xsd/
+   cp -r [ORCID-model]/src/main/resources/record_3.0 [orcid-jaxb-api]/src/main/resources/xsd/
    ```
 4. Build project (with profile `generate-sources-from-jaxb` enabled)
    ```
@@ -44,7 +44,7 @@ The below will regenerate/update the ORCID Java API stored in the `src/main/java
 
 ## Build Project
 
-After regenerating the ORCID Java API (using JAXB and ORCID's XSDs -- see above), you can easily build this project by just running:
+**The project requires JAVA 6-8 to build**. After regenerating the ORCID Java API (using JAXB and ORCID's XSDs -- see above), you can easily build this project by just running:
 
 ```
 mvn -U clean package

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>org.dspace</groupId>
     <artifactId>orcid-jaxb-api</artifactId>
-    <version>2.1.1-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
 
     <name>ORCID Java API generated via JAXB</name>
     <description>
@@ -53,8 +53,8 @@
                             <schemaDirectory>${basedir}/src/main/resources/xsd</schemaDirectory>
                             <!-- The entire list of XSDs we want to use to generate Java source code -->
                             <schemaIncludes>
-                                <include>common_2.1/*.xsd</include>
-                                <include>record_2.1/*.xsd</include>
+                                <include>common_3.0/*.xsd</include>
+                                <include>record_3.0/*.xsd</include>
                             </schemaIncludes>
                             <episode>false</episode>
                             <args>
@@ -63,7 +63,15 @@
                                 <arg>-XtoString</arg>
                                 <arg>-extension</arg>
                                 <arg>-Xnamespace-prefix</arg>
+                                <arg>-Xannotate</arg>
                             </args>
+                            <plugins>
+                                <plugin>
+                                    <groupId>org.jvnet.jaxb2_commons</groupId>
+                                    <artifactId>jaxb2-basics-annotate</artifactId>
+                                    <version>1.1.0</version>
+                                </plugin>
+                            </plugins>
                         </configuration>
                         <dependencies>
                             <dependency>
@@ -193,6 +201,14 @@
                      <tagNameFormat>orcid-jaxb-api-@{project.version}</tagNameFormat>
                 </configuration>
             </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.0</version>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>