From 41dbd3aae1de870b3f0305d684c750fc907811d8 Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Fri, 22 Sep 2023 17:38:30 +0100 Subject: [PATCH 1/8] To v1.10.0 --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 0cb71bba..5efc0714 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.neuroml1.model org.neuroml1.model - 1.9.1 + 1.10.0 bundle 1.8.1 @@ -19,7 +19,7 @@ org.neuroml.model.injectingplugin org.neuroml.model.injectingplugin - 1.9.1 + 1.10.0 @@ -89,7 +89,7 @@ org.neuroml.model.injectingplugin org.neuroml.model.injectingplugin - 1.9.1 + 1.10.0 @@ -125,7 +125,7 @@ org.neuroml.model.injectingplugin org.neuroml.model.injectingplugin - 1.9.1 + 1.10.0 @@ -162,7 +162,7 @@ org.neuroml.model.injectingplugin org.neuroml.model.injectingplugin - 1.9.1 + 1.10.0 From 9a38c059364136187dc097e9448e78e8bd2a379b Mon Sep 17 00:00:00 2001 From: pgleeson Date: Wed, 1 May 2024 11:03:51 +0100 Subject: [PATCH 2/8] Test on Java 21 --- .github/workflows/ci.yml | 6 +++--- .github/workflows/javadocs.yml | 8 ++++---- pom.xml | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8f574f83..6a965d54 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,14 +16,14 @@ 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 ] 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' diff --git a/.github/workflows/javadocs.yml b/.github/workflows/javadocs.yml index a5a2fb2b..4d6397a2 100644 --- a/.github/workflows/javadocs.yml +++ b/.github/workflows/javadocs.yml @@ -9,16 +9,16 @@ 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 - name: Set up Python 3.9 - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: 3.9 @@ -28,7 +28,7 @@ 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 diff --git a/pom.xml b/pom.xml index 5efc0714..e45b1b9f 100644 --- a/pom.xml +++ b/pom.xml @@ -44,8 +44,8 @@ maven-compiler-plugin 3.8.1 - 1.7 - 1.7 + 1.8 + 1.8 From a6d020b8109701e00d0bf8de9a87d1944f91371d Mon Sep 17 00:00:00 2001 From: pgleeson Date: Wed, 1 May 2024 11:05:29 +0100 Subject: [PATCH 3/8] Exclude some on mac --- .github/workflows/ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6a965d54..3b0c6575 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,6 +18,11 @@ jobs: matrix: 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: From 078406c6372e257998df24d4dad79a8da51e233e Mon Sep 17 00:00:00 2001 From: pgleeson Date: Wed, 1 May 2024 11:09:40 +0100 Subject: [PATCH 4/8] Add distribution --- .github/workflows/javadocs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/javadocs.yml b/.github/workflows/javadocs.yml index 4d6397a2..972e4ca5 100644 --- a/.github/workflows/javadocs.yml +++ b/.github/workflows/javadocs.yml @@ -16,6 +16,7 @@ jobs: with: java-version: 17 java-package: jdk + distribution: 'temurin' - name: Set up Python 3.9 uses: actions/setup-python@v5 From e3329035acf60b0eb808cfca22f431225d3d3416 Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Tue, 11 Jun 2024 11:59:16 +0100 Subject: [PATCH 5/8] To v1.10.1 --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index e45b1b9f..2695bd27 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.neuroml1.model org.neuroml1.model - 1.10.0 + 1.10.1 bundle 1.8.1 @@ -19,7 +19,7 @@ org.neuroml.model.injectingplugin org.neuroml.model.injectingplugin - 1.10.0 + 1.10.1 @@ -89,7 +89,7 @@ org.neuroml.model.injectingplugin org.neuroml.model.injectingplugin - 1.10.0 + 1.10.1 @@ -125,7 +125,7 @@ org.neuroml.model.injectingplugin org.neuroml.model.injectingplugin - 1.10.0 + 1.10.1 @@ -162,7 +162,7 @@ org.neuroml.model.injectingplugin org.neuroml.model.injectingplugin - 1.10.0 + 1.10.1 From bbb5e49745a5b2e30e4e75775ad2ecd6df4d74bb Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Tue, 11 Jun 2024 12:09:25 +0100 Subject: [PATCH 6/8] Use ${GITHUB_REF_NAME} --- .github/workflows/javadocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/javadocs.yml b/.github/workflows/javadocs.yml index 972e4ca5..924c1d34 100644 --- a/.github/workflows/javadocs.yml +++ b/.github/workflows/javadocs.yml @@ -32,7 +32,7 @@ jobs: uses: actions/checkout@v4 with: repository: NeuroML/org.neuroml.model.injectingplugin - ref: development + ref: ${GITHUB_REF_NAME} path: org.neuroml.model.injectingplugin - name: Install NeuroML deps From 085dfbef403d6a1b7ef7634d45d3c34a5516790b Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Tue, 11 Jun 2024 12:13:13 +0100 Subject: [PATCH 7/8] Update javadocs.yml --- .github/workflows/javadocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/javadocs.yml b/.github/workflows/javadocs.yml index 924c1d34..cd7ce330 100644 --- a/.github/workflows/javadocs.yml +++ b/.github/workflows/javadocs.yml @@ -32,7 +32,7 @@ jobs: uses: actions/checkout@v4 with: repository: NeuroML/org.neuroml.model.injectingplugin - ref: ${GITHUB_REF_NAME} + ref: ${{ github.ref }} path: org.neuroml.model.injectingplugin - name: Install NeuroML deps From 15b5a31f40d63ce5fbf82cf2985d2d62a41cc82d Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Tue, 11 Jun 2024 12:15:30 +0100 Subject: [PATCH 8/8] Bump year in docs --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2695bd27..87171b67 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ <br /> <br /> - Copyright NeuroML Contributors 2023 + Copyright NeuroML Contributors 2024