Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes for NeuroML v2.3.1 release #21

Merged
merged 10 commits into from
Aug 20, 2024
Merged

Changes for NeuroML v2.3.1 release #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
41dbd3a
To v1.10.0
pgleeson Sep 22, 2023
9a38c05
Test on Java 21
pgleeson May 1, 2024
a6d020b
Exclude some on mac
pgleeson May 1, 2024
078406c
Add distribution
pgleeson May 1, 2024
ad5a908
Merge pull request #19 from NeuroML/experimental
pgleeson May 1, 2024
e332903
To v1.10.1
pgleeson Jun 11, 2024
bbb5e49
Use ${GITHUB_REF_NAME}
pgleeson Jun 11, 2024
085dfbe
Update javadocs.yml
pgleeson Jun 11, 2024
15b5a31
Bump year in docs
pgleeson Jun 11, 2024
fb4e3c0
Merge pull request #20 from NeuroML/experimental
pgleeson Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,19 @@ jobs:
strategy:
fail-fast: false
matrix:
java: [ '8', '11', '16', '17', '19' ]
java: [ '8', '11', '16', '17', '19', '21' ]
runs-on: [ubuntu-latest, macos-latest, 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@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: 'temurin'
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/javadocs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -28,10 +29,10 @@ jobs:
pip install ghp-import

- 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
Expand Down
16 changes: 8 additions & 8 deletions pom.xml
View file
Open in desktop
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.9.1</version>
<version>1.10.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.9.1</version>
<version>1.10.1</version>
</dependency>
</dependencies>
<build>
Expand All @@ -35,7 +35,7 @@
&lt;br /&gt;
&lt;br /&gt;
</top>
<bottom>Copyright NeuroML Contributors 2023</bottom>
<bottom>Copyright NeuroML Contributors 2024</bottom>
</configuration>
</plugin>
<plugin>
Expand All @@ -44,8 +44,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<source>1.8</source>
<target>1.8</target>
</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.9.1</version>
<version>1.10.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.9.1</version>
<version>1.10.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.9.1</version>
<version>1.10.1</version>
</plugin>
</plugins>
</configuration>
Expand Down