Merge pull request #43 from NeuroML/development

Changes for NeuroML v2.3.1 release
NeuroML · Aug 20, 2024 · 555d734 · 555d734
2 parents fe071d7 + 7ae6388
commit 555d734
Show file tree

Hide file tree

Showing 7 changed files with 244 additions and 68 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,18 +16,28 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ '8', '11', '16', '17', '19' ]
-        runs-on: [ubuntu-latest, macos-latest, windows-latest]
+        java: [ '8', '11', '16', '17', '19', '21' ]
+        runs-on: [ubuntu-latest, macos-12, windows-latest]
+        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@v3
+    - uses: actions/checkout@v4
     - name: Set up JDK ${{ matrix.Java }}
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.Java }}
         distribution: 'temurin'
 
+    - name: Install HDF5 on macos-latest (v14)
+      if: ${{ matrix.runs-on == 'macos-latest' }}
+      run: |
+        brew install hdf5
+
     - name: Install and test (non Win)
       env:
         main_repo_branch: ${GITHUB_REF_NAME}

diff --git a/.github/workflows/javadocs.yml b/.github/workflows/javadocs.yml
@@ -9,16 +9,17 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Set up JDK 17
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v4
       with:
         java-version: 17
         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
 
@@ -28,17 +29,17 @@ jobs:
         pip install ghp-import
 
     - name: Checkout NeuroML2
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         repository: NeuroML/NeuroML2
-        ref: development
+        ref: ${{ github.ref }}
         path: NeuroML2
 
     - name: Checkout org.neuroml.model.injectingplugin
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         repository: NeuroML/org.neuroml.model.injectingplugin
-        ref: development
+        ref: ${{ github.ref }}
         path: org.neuroml.model.injectingplugin
 
     - name: Install NeuroML deps

diff --git a/pom.xml b/pom.xml
@@ -3,10 +3,10 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.neuroml.model</groupId>
     <artifactId>org.neuroml.model</artifactId>
-    <version>1.9.1</version>
+    <version>1.10.1</version>
     <packaging>bundle</packaging>
     <properties>
-        <build.version2>2.3</build.version2>
+        <build.version2>2.3.1</build.version2>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
@@ -19,12 +19,12 @@
         <dependency>
             <groupId>org.neuroml.model.injectingplugin</groupId>
             <artifactId>org.neuroml.model.injectingplugin</artifactId>
-            <version>1.9.1</version>
+            <version>1.10.1</version>
         </dependency>
         <dependency>
             <groupId>org.neuroml.core</groupId>
             <artifactId>neuroml2-base-definitions</artifactId>
-            <version>1.9.1</version>
+            <version>1.10.1</version>
         </dependency>
 
         <dependency>
@@ -64,7 +64,7 @@
                             &lt;br /&gt;
                             &lt;br /&gt;
                     </top>
-                    <bottom>Copyright NeuroML Contributors 2022</bottom>
+                    <bottom>Copyright NeuroML Contributors 2024</bottom>
                 </configuration>
             </plugin>
             <plugin>
@@ -105,7 +105,7 @@
                         </goals>
                         <configuration>
                             <resourceBundles>
-                                <resourcebundle>org.neuroml.core:neuroml2-base-definitions:1.9.1</resourcebundle>
+                                <resourcebundle>org.neuroml.core:neuroml2-base-definitions:1.10.1</resourcebundle>
                             </resourceBundles>
                         </configuration>
                     </execution>
@@ -158,8 +158,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>
             <plugin>
@@ -198,7 +198,7 @@
                                 <plugin>
                                     <groupId>org.neuroml.model.injectingplugin</groupId>
                                     <artifactId>org.neuroml.model.injectingplugin</artifactId>
-                                    <version>1.9.1</version>
+                                    <version>1.10.1</version>
                                 </plugin>
                             </plugins>
                         </configuration>