Merge pull request #102 from NeuroML/development

Changes for NeuroML v2.3.1 release
NeuroML · Aug 20, 2024 · b435277 · b435277
2 parents 182e9ea + eb54da6
commit b435277
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 24 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,17 +16,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ '8', '11', '16', '17', '19']
-        runs-on: [ubuntu-latest, macos-latest, windows-2019 ]
+        java: [ '8', '11', '16', '17', '19', '21' ]
+        runs-on: [ubuntu-latest, macos-12, windows-2019] # Note macos-12, not latest/14, due to hdf5 install issue
+        exclude:
+          - runs-on: macos-latest
+            java: "8"
+          - runs-on: macos-latest
+            java: "16"
 
     name: Test on Java ${{ matrix.Java }} on ${{ matrix.runs-on }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up JDK ${{ matrix.Java }}
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.Java }}
-        distribution: 'adopt'
+        distribution: 'temurin'
 
     - name: Install using getNeuroML.py (non Win)
       env:

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -13,17 +13,18 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - uses: nelonoel/[email protected]
 
     - name: Set up JDK 11
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v4
       with:
         java-version: 11
         java-package: jdk
+        distribution: 'temurin'
 
     - name: Set up Python 3.9
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: 3.9
 
@@ -33,49 +34,49 @@ jobs:
         pip install ghp-import
 
     - name: Checkout NeuroML2
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         repository: NeuroML/NeuroML2
         ref: development
         path: NeuroML2
 
     - name: Checkout org.lemsml
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         repository: LEMS/jLEMS
         ref: development
         path: jLEMS
 
     - name: Checkout org.neuroml.model.injectingplugin
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         repository: NeuroML/org.neuroml.model.injectingplugin
         ref: development
         path: org.neuroml.model.injectingplugin
 
     - name: Checkout org.neuroml1.model
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         repository: NeuroML/org.neuroml1.model
         ref: development
         path: org.neuroml1.model
 
     - name: Checkout org.neuroml.model
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         repository: NeuroML/org.neuroml.model
         ref: development
         path: org.neuroml.model
 
     - name: Checkout org.neuroml.export
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         repository: NeuroML/org.neuroml.export
         ref: development
         path: org.neuroml.export
 
     - name: Checkout org.neuroml.import
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         repository: NeuroML/org.neuroml.import
         ref: development

diff --git a/jnml b/jnml
@@ -5,7 +5,7 @@
 #   Type java -X for more info
 export JNML_MAX_MEMORY=400M
 
-export JNML_VERSION=0.12.4
+export JNML_VERSION=0.13.3
 
 
 export CLASSPATH=.:./target/jNeuroML-$JNML_VERSION-jar-with-dependencies.jar:$JNML_HOME/target/jNeuroML-$JNML_VERSION-jar-with-dependencies.jar

diff --git a/jnml.bat b/jnml.bat
@@ -1,6 +1,6 @@
 @echo off
 
-set JNML_VERSION=0.12.4
+set JNML_VERSION=0.13.3
 
 set CLASSPATH=target\jNeuroML-%JNML_VERSION%-jar-with-dependencies.jar;%JNML_HOME%\jNeuroML-%JNML_VERSION%-jar-with-dependencies.jar
 

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.neuroml</groupId>
     <artifactId>jNeuroML</artifactId>
-    <version>0.12.4</version>
+    <version>0.13.3</version>
     <packaging>jar</packaging>
 
     <name>jNeuroML</name>
@@ -24,12 +24,12 @@
         <dependency>
             <groupId>org.neuroml1.model</groupId>
             <artifactId>org.neuroml1.model</artifactId>
-            <version>1.9.1</version>
+            <version>1.10.1</version>
         </dependency>
         <dependency>
             <groupId>org.neuroml.import</groupId>
             <artifactId>org.neuroml.import</artifactId>
-            <version>1.9.1</version>
+            <version>1.10.1</version>
         </dependency>
 
         <!-- Dependencies to force use of log4j 2.17.1 -->
@@ -59,7 +59,7 @@
                             &lt;br /&gt;
                             &lt;br /&gt;
                     </top>
-                    <bottom>Copyright NeuroML Contributors 2023</bottom>
+                    <bottom>Copyright NeuroML Contributors 2024</bottom>
                 </configuration>
             </plugin>
             <plugin>
@@ -95,8 +95,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.0</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
 

diff --git a/src/main/java/org/neuroml/JNeuroML.java b/src/main/java/org/neuroml/JNeuroML.java
@@ -60,7 +60,7 @@ public class JNeuroML
 
     public static final String JNML_SCRIPT = "jnml";
 
-    public static final String JNML_VERSION = "0.12.4";
+    public static final String JNML_VERSION = "0.13.3";
 
     public static final String HELP_FLAG = "-help";
     public static final String HELP_FLAG_SHORT = "-h";