Merge pull request #87 from NeuroML/development

Test on windows-2019 See NeuroML/NeuroML2#185
NeuroML · Feb 28, 2022 · 8788029 · 8788029
2 parents 99002b9 + 0923e82
commit 8788029
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
       fail-fast: false
       matrix:
         java: [ '8', '11', '16', '17' ]
-        runs-on: [ubuntu-latest, macos-11, windows-latest ]
+        runs-on: [ubuntu-latest, macos-11, windows-2019 ]
 
     name: Test on Java ${{ matrix.Java }} on ${{ matrix.runs-on }}
     steps:
@@ -29,7 +29,7 @@ jobs:
         distribution: 'adopt'
 
     - name: Install using getNeuroML.py (non Win)
-      if: ${{ matrix.runs-on != 'windows-latest' }}
+      if: ${{ matrix.runs-on != 'windows-2019' }}
       run: |
         export main_repo_branch=${{env.main_repo_branch}}
         if [[ ${main_repo_branch} != "master" && ${main_repo_branch} != "development" && ${main_repo_branch} != "experimental" && ${main_repo_branch} != *"osb"* ]]; then main_repo_branch=development ; fi
@@ -40,7 +40,7 @@ jobs:
         ./jnml -v
 
     - name: Install using getNeuroML.py (Win)
-      if: ${{ matrix.runs-on == 'windows-latest' }}
+      if: ${{ matrix.runs-on == 'windows-2019' }}
       run: |
         $env:main_repo_branch=$env:GITHUB_REF_NAME
         if ( $env:main_repo_branch -ne "master" -and $env:main_repo_branch -ne "development" -and $env:main_repo_branch -ne "experimental" -and $env:main_repo_branch -notlike '*osb*' ) { $env:main_repo_branch="development" }
@@ -52,7 +52,7 @@ jobs:
         .\jnml.bat -v
 
     - name: Further tests (non Win)
-      if: ${{ matrix.runs-on != 'windows-latest' }}
+      if: ${{ matrix.runs-on != 'windows-2019' }}
       run: |
         pwd
         ls -alt
@@ -72,7 +72,7 @@ jobs:
         ls -alt ../NeuroML2/LEMSexamples
 
     - name: Further tests (Win)
-      if: ${{ matrix.runs-on == 'windows-latest' }}
+      if: ${{ matrix.runs-on == 'windows-2019' }}
       run: |
         pwd
         mkdir results

diff --git a/pom.xml b/pom.xml
@@ -32,17 +32,17 @@
             <version>1.8.1</version>
         </dependency>
 
-        <!-- Dependencies to force use of log4j 2.15 -->
+        <!-- Dependencies to force use of log4j 2.17.1 -->
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-1.2-api</artifactId>
-            <version>2.15.0</version>
+            <version>2.17.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.15.0</version>
+            <version>2.17.1</version>
             <scope>test</scope>
         </dependency>