Merge pull request #80 from NeuroML/development

NeuroML 2.2 release

.github/workflows/ci.yml

@@ -0,0 +1,67 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches:  [ master, development, experimental, osb* ]
+  pull_request:
+    branches:  [ master, development, experimental, osb* ]
+
+jobs:
+  build_and_test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [ '8', '11', '16', '17']
+
+    name: Test on Java ${{ matrix.Java }}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK ${{ matrix.Java }}
+      uses: actions/setup-java@v2
+      with:
+        java-version: ${{ matrix.Java }}
+        distribution: 'temurin'
+
+    - name: Install all
+      run: |
+        export main_repo_branch=${{env.main_repo_branch}}
+        if [[ ${main_repo_branch} != "master" && ${main_repo_branch} != "development" && ${main_repo_branch} != "experimental" && ${main_repo_branch} != *"osb"* ]]; then main_repo_branch=development ; fi
+        echo Using branch $main_repo_branch
+        
+        git clone https://github.com/NeuroML/org.neuroml.model.injectingplugin.git
+        cd org.neuroml.model.injectingplugin
+        git checkout $main_repo_branch
+        mvn install
+        cd ..
+        
+        git clone https://github.com/NeuroML/NeuroML2.git
+        cd NeuroML2
+        git checkout $main_repo_branch
+        mvn install
+        cd ..
+
+        git clone https://github.com/LEMS/jLEMS.git
+        cd jLEMS
+        git checkout $main_repo_branch
+        mvn install
+        cd ..
+
+        git clone https://github.com/NeuroML/org.neuroml.model.git
+        cd org.neuroml.model
+        git checkout $main_repo_branch
+        mvn install
+        cd ..
+        
+    - name: Test with Maven
+      run: |
+         pwd
+         mvn install
+    - name: Further tests
+      run: |
+        pwd
+        ls -alt
+        mvn dependency:tree

README.md

@@ -1,12 +1,13 @@
 Export from NeuroML & LEMS
 ==========================
 
-[![Travis CI](https://travis-ci.com/NeuroML/org.neuroml.export.svg?branch=master)](https://travis-ci.com/NeuroML/org.neuroml.export)
+[![Java CI with Maven](https://github.com/NeuroML/org.neuroml.export/actions/workflows/ci.yml/badge.svg)](https://github.com/NeuroML/org.neuroml.export/actions/workflows/ci.yml)
 [![GitHub](https://img.shields.io/github/license/NeuroML/org.neuroml.export)](https://github.com/NeuroML/org.neuroml.export/blob/master/LICENSE.lesser)
 [![GitHub pull requests](https://img.shields.io/github/issues-pr/NeuroML/org.neuroml.export)](https://github.com/NeuroML/org.neuroml.export/pulls)
 [![GitHub issues](https://img.shields.io/github/issues/NeuroML/org.neuroml.export)](https://github.com/NeuroML/org.neuroml.export/issues)
 [![GitHub Org's stars](https://img.shields.io/github/stars/NeuroML?style=social)](https://github.com/NeuroML)
 [![Twitter Follow](https://img.shields.io/twitter/follow/NeuroML?style=social)](https://twitter.com/NeuroML)
+[![Gitter](https://badges.gitter.im/NeuroML/community.svg)](https://gitter.im/NeuroML/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
 Package to allow models in NeuroML 2 & LEMS format to be exported in various formats.
 Based on earlier code at https://sourceforge.net/apps/trac/neuroml/browser/NeuroML2/src/org/neuroml/exporters 

pom.xml

@@ -4,7 +4,7 @@
     <groupId>org.neuroml.export</groupId>
     <artifactId>org.neuroml.export</artifactId>
     <packaging>bundle</packaging>
-    <version>1.7.2</version>
+    <version>1.8.1</version>
     <name>org.neuroml.export</name>
     <url>http://maven.apache.org</url>
 
@@ -18,12 +18,12 @@
         <dependency>
             <groupId>org.neuroml.model</groupId>
             <artifactId>org.neuroml.model</artifactId>
-            <version>1.7.2</version>
+            <version>1.8.1</version>
         </dependency>
         <dependency>
             <groupId>org.lemsml</groupId>
             <artifactId>jlems</artifactId>
-            <version>0.10.4</version>
+            <version>0.10.6</version>
         </dependency>
         <dependency>
             <groupId>org.apache.velocity</groupId>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.7.4</version>
+            <version>[2.9.10.8,)</version>
         </dependency>
     </dependencies>
     <build>

src/main/java/org/lemsml/export/sedml/SEDMLWriter.java

@@ -103,7 +103,7 @@ public String getMainScript() throws ContentError
 
         if(modelFormat == Format.NEUROML2)
         {
-            startEndElement(main, "model", "id=" + netId, "language=urn:sedml:language:neuroml2", "source=" + inputFileName);
+            startEndElement(main, "model", "id=" + netId, "language=urn:sedml:language:lems", "source=" + inputFileName);
         }
         else if(modelFormat == Format.SBML)
         {
@@ -298,4 +298,4 @@ public static void main(String[] args) throws Exception, ModelFeatureSupportExce
 
 
     }
-}
+}