Added orcid to contact following HUPO-PSI/mzTab#202

lifs-tools · Nov 26, 2021 · f6bc4e7 · f6bc4e7
1 parent dee38b5
commit f6bc4e7
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 21 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -7,7 +7,7 @@
         <version>1.0.6</version>
     </parent>
     <artifactId>jmztabm-api</artifactId>
-    <version>1.0.6</version>
+    <version>1.0.7-SNAPSHOT</version>
     <packaging>jar</packaging>
     <properties>
         <swagger.api.spec>mzTab_m_swagger.yml</swagger.api.spec>

diff --git a/api/src/main/resources/mzTab_m_swagger.yml b/api/src/main/resources/mzTab_m_swagger.yml
@@ -348,6 +348,7 @@ definitions:
             MTD	contact[2]-name	Francis Crick
             MTD	contact[2]-affiliation	Cambridge University, UK
             MTD	contact[2]-email	crick@cam.ac.uk
+            MTD contact[2]-orcid        0000-0002-1825-0097
       publication:
         type: array
         description: A publication associated with this file. Several publications can be given by indicating the number in the square brackets after “publication”. PubMed ids must be prefixed by “pubmed:”, DOIs by “doi:”. Multiple identifiers MUST be separated by “|”.
@@ -1416,6 +1417,7 @@ definitions:
         MTD	contact[2]-name	Francis Crick
         MTD	contact[2]-affiliation	Cambridge University, UK
         MTD	contact[2]-email	crick@cam.ac.uk
+        MTD	contact[2]-orcid	0000-0002-1825-0097
     x-mztab-serialize-by-id: 'true'
     type: object
     properties:
@@ -1433,6 +1435,10 @@ definitions:
           description: The contact's e-mail address.
           type: string
           pattern: '^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$'
+        orcid:
+          description: The contact's orcid id, without https prefix.
+          type: string
+          pattern: '^[0-9]{4}-[0-9]{4}-[0-9]{4}-[0-9]{3}[0-9X]{1}'
   Uri:
     description: A URI pointing to the file’s source data (e.g., a MetaboLights records) or an external file with more details about the study design.
     x-mztab-example: |

diff --git a/cli/pom.xml b/cli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.isas.mztab</groupId>
         <artifactId>jmztabm</artifactId>
-        <version>1.0.6</version>
+        <version>1.0.7-SNAPSHOT</version>
     </parent>
     <artifactId>jmztabm-cli</artifactId>
     <properties>

diff --git a/io/pom.xml b/io/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>de.isas.mztab</groupId>
     <artifactId>jmztabm</artifactId>
-    <version>1.0.6</version>
+    <version>1.0.7-SNAPSHOT</version>
   </parent>
   <artifactId>jmztabm-io</artifactId>
   <packaging>jar</packaging>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>de.isas.mztab</groupId>
     <artifactId>jmztabm</artifactId>
-    <version>1.0.6</version>
+    <version>1.0.7-SNAPSHOT</version>
     <packaging>pom</packaging>
     <description>A reader, writer and validator reference implementation for the mzTab format for metabolomics from version 2.0 onwards.</description>
     <name>MzTab-M 2.0 reference implementation.</name>	
@@ -18,18 +18,18 @@
     <developers>
         <developer>
             <name>Nils Hoffmann</name>
-            <email>nils.hoffmann@isas.de</email>
-            <organization>ISAS e.V.</organization>
-            <organizationUrl>https://www.isas.de</organizationUrl>
+            <email>nils.hoffmann@cebitec.uni-bielefeld.de</email>
+            <organization>Center For Biotechnology, Bielefeld University, Bielefeld, Germany</organization>
+            <organizationUrl>https://cebitec.uni-bielefeld.de</organizationUrl>
             <roles>
                 <role>developer</role>
             </roles>
             <timezone>Europe/Berlin</timezone>
         </developer>
     </developers>
     <organization>
-        <name>Leibniz-Institut für Analytische Wissenschaften – ISAS – e.V.</name>
-        <url>https://www.isas.de</url>
+        <name>Center For Biotechnology, Bielefeld University, Bielefeld, Germany</name>
+        <url>https://cebitec.uni-bielefeld.de</url>
     </organization>
     <scm>
         <connection>scm:git:git://github.com/lifs-tools/jmztab-m.git</connection>
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
-                <version>3.8.2</version>
+                <version>3.9.1</version>
                 <dependencies>
                     <dependency><!-- add Asciidoctor Doxia Parser Module -->
                         <groupId>org.asciidoctor</groupId>
@@ -90,17 +90,17 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-site-plugin</artifactId>
-                    <version>3.8.2</version>
+                    <version>3.9.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>3.2.0</version>
                 </plugin>
                 <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-maven</id>
@@ -120,7 +120,7 @@
                 <plugin>
                     <groupId>org.owasp</groupId>
                     <artifactId>dependency-check-maven</artifactId>
-                    <version>6.0.4</version>
+                    <version>6.5.0</version>
                     <configuration>
                         <cveValidForHours>12</cveValidForHours>
                         <failBuildOnCVSS>4</failBuildOnCVSS>
@@ -165,7 +165,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>3.1.1</version>
+                    <version>3.2.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -188,12 +188,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.3.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.1.1</version>
+                    <version>3.3.1</version>
                     <executions>
                         <execution>
                             <id>attach-javadocs</id>
@@ -590,7 +590,7 @@
         <migbase.version>2.2</migbase.version>
         <swagger2markup.version>1.3.3</swagger2markup.version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
-        <jacoco.version>0.8.6</jacoco.version>
+        <jacoco.version>0.8.7</jacoco.version>
         <mockito.version>3.6.28</mockito.version><!--2.19.0-->
         <olsclient.version>2.11</olsclient.version>
         <jxpath.version>1.3</jxpath.version>

diff --git a/test-utils/pom.xml b/test-utils/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>de.isas.mztab</groupId>
     <artifactId>jmztabm</artifactId>
-    <version>1.0.6</version>
+    <version>1.0.7-SNAPSHOT</version>
   </parent>
   <artifactId>jmztabm-test-utils</artifactId>
   <packaging>jar</packaging>
@@ -20,4 +20,4 @@
     </dependency>
   </dependencies>
     <description>Utilities for extracting and testing of mzTab-M test files.</description>
-</project>
+</project>
diff --git a/validation/pom.xml b/validation/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.isas.mztab</groupId>
         <artifactId>jmztabm</artifactId>
-        <version>1.0.6</version>
+        <version>1.0.7-SNAPSHOT</version>
     </parent>
     <artifactId>jmztabm-validation</artifactId>
     <packaging>jar</packaging>