Skip to content

Commit

Permalink
Merge pull request #17 from NeuroML/development
Browse files Browse the repository at this point in the history
Updates for NMLv2.3
  • Loading branch information
pgleeson authored Sep 20, 2023
2 parents 62ae92b + 75e8b64 commit 190da0c
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 17 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
strategy:
fail-fast: false
matrix:
java: [ '8', '11', '16', '17' ]
runs-on: [ubuntu-latest, macos-11, windows-latest ]
java: [ '8', '11', '16', '17', '19' ]
runs-on: [ubuntu-latest, macos-latest, windows-latest ]

name: Test on Java ${{ matrix.Java }} on ${{ matrix.runs-on }}
steps:
Expand All @@ -27,9 +27,9 @@ jobs:
with:
java-version: ${{ matrix.Java }}
distribution: 'temurin'

- name: Install org.neuroml.model.injectingplugin
env:
env:
main_repo_branch: ${GITHUB_REF_NAME}
if: ${{ matrix.runs-on != 'windows-latest' }}
run: |
Expand All @@ -41,11 +41,11 @@ jobs:
git checkout $main_repo_branch
mvn install
cd ..
# Install and test this repo with Maven
mvn install
mvn dependency:tree
- name: Install org.neuroml.model.injectingplugin (Win)
if: ${{ matrix.runs-on == 'windows-latest' }}
run: |
Expand All @@ -58,7 +58,7 @@ jobs:
git checkout $env:main_repo_branch
mvn install
cd ..
# Install and test this repo with Maven
mvn install
mvn dependency:tree
6 changes: 3 additions & 3 deletions .github/workflows/javadocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Publish javadocs

on:
push:
branches: [ development ]
branches: [ development, experimental ]

jobs:
build:
Expand All @@ -11,10 +11,10 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17
java-package: jdk

- name: Set up Python 3.9
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,6 @@ A collection of models in NeuroML can be found at [Open Source Brain](http://www

This code is distributed under the terms of the GNU Lesser General Public License.

The API documentation is [here](http://neuroml.github.io/org.neuroml1.model/).
The API documentation for this is [here](http://neuroml.github.io/org.neuroml1.model/).


12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.neuroml1.model</groupId>
<artifactId>org.neuroml1.model</artifactId>
<version>1.8.1</version>
<version>1.9.1</version>
<packaging>bundle</packaging>
<properties>
<build.version1>1.8.1</build.version1>
Expand All @@ -19,7 +19,7 @@
<dependency>
<groupId>org.neuroml.model.injectingplugin</groupId>
<artifactId>org.neuroml.model.injectingplugin</artifactId>
<version>1.8.1</version>
<version>1.9.1</version>
</dependency>
</dependencies>
<build>
Expand All @@ -35,7 +35,7 @@
&lt;br /&gt;
&lt;br /&gt;
</top>
<bottom>Copyright NeuroML Contributors 2021</bottom>
<bottom>Copyright NeuroML Contributors 2023</bottom>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -89,7 +89,7 @@
<plugin>
<groupId>org.neuroml.model.injectingplugin</groupId>
<artifactId>org.neuroml.model.injectingplugin</artifactId>
<version>1.8.1</version>
<version>1.9.1</version>
</plugin>
</plugins>
</configuration>
Expand Down Expand Up @@ -125,7 +125,7 @@
<plugin>
<groupId>org.neuroml.model.injectingplugin</groupId>
<artifactId>org.neuroml.model.injectingplugin</artifactId>
<version>1.8.1</version>
<version>1.9.1</version>
</plugin>
</plugins>
</configuration>
Expand Down Expand Up @@ -162,7 +162,7 @@
<plugin>
<groupId>org.neuroml.model.injectingplugin</groupId>
<artifactId>org.neuroml.model.injectingplugin</artifactId>
<version>1.8.1</version>
<version>1.9.1</version>
</plugin>
</plugins>
</configuration>
Expand Down

0 comments on commit 190da0c

Please sign in to comment.