Merge branch 'main' of github.com:lifs-tools/jgoslin into main

lifs-tools · Nov 24, 2023 · 71b1538 · 71b1538
2 parents 0e7a4cc + f48b5c2
commit 71b1538
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -43,7 +43,7 @@ jobs:
     - name: Setup Maven settings.xml
       uses: whelk-io/maven-settings-xml-action@v20
       with:
-        servers: '[{ "id": "lifstools-jfrog", "username": "github-deployer", "password": "${env.ARTIFACTORY_TOKEN_REF}" }]'
+        servers: '[{ "id": "artifactory-releases", "username": "github-deployer", "password": "${env.ARTIFACTORY_TOKEN_REF}" },{ "id": "artifactory-snapshots", "username": "github-deployer", "password": "${env.ARTIFACTORY_TOKEN_REF}"}]'
     - name: Set Release version env variable
       env:
         USERNAME: ${{ github.actor }}

diff --git a/cli/pom.xml b/cli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.lifs-tools</groupId>
         <artifactId>jgoslin</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.2.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>jgoslin-cli</artifactId>

diff --git a/parsers/pom.xml b/parsers/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.lifs-tools</groupId>
         <artifactId>jgoslin</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.2.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>jgoslin-parsers</artifactId>

diff --git a/parsers/src/main/java/org/lifstools/jgoslin/domain/Headgroup.java b/parsers/src/main/java/org/lifstools/jgoslin/domain/Headgroup.java
@@ -15,6 +15,7 @@
  */
 package org.lifstools.jgoslin.domain;
 
+import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -148,6 +149,7 @@ public static String getClassString(int _lipid_class) {
         return ClassString.containsKey(_lipid_class) ? ClassString.get(_lipid_class) : "UNDEFINED";
     }
 
+    @JsonGetter("lipidClass")
     public String getClassName() {
         return LipidClasses.getInstance().get(lipidClass).lipidClassName;
     }
@@ -234,6 +236,7 @@ public ElementTable getElements() {
         return elements;
     }
 
+    @JsonGetter("name")
     public String getHeadgroup() {
         return headgroup;
     }
@@ -250,6 +253,7 @@ public void setLipidCategory(LipidCategory lipidCategory) {
         this.lipidCategory = lipidCategory;
     }
 
+    @JsonIgnore
     public int getLipidClass() {
         return lipidClass;
     }

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.lifs-tools</groupId>
     <artifactId>jgoslin</artifactId>
-    <version>2.1.1-SNAPSHOT</version>
+    <version>2.2.0</version>
     <packaging>pom</packaging>
     <name>jgoslin</name>
     <url>https://github.com/lifs-tools/jgoslin</url>	
@@ -407,14 +407,14 @@
             <id>jfrog</id>
             <distributionManagement>
                 <repository>
-                    <id>lifstools-jfrog</id>
-                    <name>lifstools-release</name>
-                    <url>https://lifstools.jfrog.io/artifactory/lifs-libs-release-local</url>
+                    <id>artifactory-releases</id>
+                    <name>lifstools-release-local</name>
+                    <url>https://m.lifs-tools.org/artifactory/lifs-libs-release-local</url>
                 </repository>
                 <snapshotRepository>
-                    <id>lifstools-jfrog</id>
-                    <name>lifstools-snapshot</name>
-                    <url>https://lifstools.jfrog.io/artifactory/lifs-libs-snapshot-local</url>
+                    <id>artifactory-snapshots</id>
+                    <name>lifstools-snapshot-local</name>
+                    <url>https://m.lifs-tools.org/artifactory/lifs-libs-snapshot-local</url>
                 </snapshotRepository>
             </distributionManagement>
         </profile>