Merge pull request #29 from NeuroML/osb_test_mac_win

Osb test mac win
NeuroML · Nov 24, 2021 · c02a3c5 · c02a3c5
2 parents 561b73e + f25efad
commit c02a3c5
Show file tree

Hide file tree

Showing 3 changed files with 109 additions and 84 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,50 +5,75 @@ name: Java CI with Maven
 
 on:
   push:
-    branches:  [ master, development, experimental ]
+    branches:  [ master, development, experimental, osb* ]
   pull_request:
-    branches:  [ master, development, experimental ]
+    branches:  [ master, development, experimental, osb* ]
 
 jobs:
   build_and_test:
 
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.runs-on }}
     strategy:
-      matrix:
-        java: [ '8', '11']
+      fail-fast: false
+      matrix:        
+        java: [ '8', '11', '16', '17' ]
+        runs-on: [ubuntu-latest, macos-11, windows-latest]
 
-    name: Test on Java ${{ matrix.Java }}
+    name: Test on Java ${{ matrix.Java }} on ${{ matrix.runs-on }}
     steps:
     - uses: actions/checkout@v2
     - name: Set up JDK ${{ matrix.Java }}
       uses: actions/setup-java@v2
       with:
         java-version: ${{ matrix.Java }}
         distribution: 'temurin'
-    - name: Install org.neuroml.model.injectingplugin
+
+    - name: Install and test (non Win)
+      if: ${{ matrix.runs-on != 'windows-latest' }}
       run: |
+        # Install org.neuroml.model.injectingplugin
         export main_repo_branch=${GITHUB_REF##*/}
         echo Using branch $main_repo_branch
         git clone https://github.com/NeuroML/org.neuroml.model.injectingplugin.git
         cd org.neuroml.model.injectingplugin
         git checkout $main_repo_branch
         mvn install
         cd ..
-    - name: Install NeuroML2
-      run: |
+        
+        # Install NeuroML2
         export main_repo_branch=${GITHUB_REF##*/}
         echo Using branch $main_repo_branch
         git clone https://github.com/NeuroML/NeuroML2.git
         cd NeuroML2
         git checkout $main_repo_branch
         mvn install
         cd ..
-    - name: Test with Maven
-      run: |
-         pwd
-         mvn install
-    - name: Further tests
+        
+        # Install this package and test with Maven
+        pwd
+        mvn install
+        mvn dependency:tree
+        
+    - name: Install and test (Win)
+      if: ${{ matrix.runs-on == 'windows-latest' }}
       run: |
+        # Install org.neuroml.model.injectingplugin
+        echo Using branch $env:GITHUB_REF_NAME
+        git clone https://github.com/NeuroML/org.neuroml.model.injectingplugin.git
+        cd org.neuroml.model.injectingplugin
+        git checkout $env:GITHUB_REF_NAME
+        mvn install
+        cd ..
+        
+        # Install NeuroML2
+        echo Using branch $env:GITHUB_REF_NAME
+        git clone https://github.com/NeuroML/NeuroML2.git
+        cd NeuroML2
+        git checkout $env:GITHUB_REF_NAME
+        mvn install
+        cd ..
+        
+        # Install this package and test with Maven
         pwd
-        ls -alt
+        mvn install
         mvn dependency:tree
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,7 @@ src/main/java/META-INF/MANIFEST.MF
 /src/test/resources/examples/temp/*.h5
 /nb-configuration.xml
 runclass.sh
+/.classpath
+/.project
+/.settings/
+/private
diff --git a/pom.xml b/pom.xml
@@ -10,17 +10,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
-        <dependency>
-            <groupId>com.sun.tools.xjc.maven2</groupId>
-            <artifactId>maven-jaxb-plugin</artifactId>
-            <version>1.1.1</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>jaxb-impl</artifactId>
-                    <groupId>com.sun.xml.bind</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -38,29 +27,29 @@
             <version>1.8.0</version>
         </dependency>
 
-		<dependency>
-			<groupId>ncsa.hdf</groupId>
-			<artifactId>object</artifactId>
-			<version>2.12</version>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>1.7.22</version>
-		</dependency>
+        <dependency>
+            <groupId>ncsa.hdf</groupId>
+            <artifactId>object</artifactId>
+            <version>2.12</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.22</version>
+        </dependency>
 
     </dependencies>
-	<repositories>
+    <repositories>
 
-		<repository>
-			<id>org.geppetto-mvn-repo</id>
-			<url>https://raw.github.com/openworm/org.geppetto.maven/mvn-repo-no-nml-lems</url>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-			</snapshots>
-		</repository>
-	</repositories>
+        <repository>
+            <id>org.geppetto-mvn-repo</id>
+            <url>https://raw.github.com/openworm/org.geppetto.maven/mvn-repo-no-nml-lems</url>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+            </snapshots>
+        </repository>
+    </repositories>
 
     <build>
         <plugins>
@@ -105,51 +94,51 @@
                 </executions>
             </plugin>
             <plugin>
-              <artifactId>maven-remote-resources-plugin</artifactId>
-              <version>1.5</version>
-              <executions>
-                <execution>
-                  <id>fetch-remote-resources</id>
-                  <phase>generate-sources</phase>
-                  <goals>
-                    <goal>process</goal>
-                  </goals>
-                  <configuration>
-                    <resourceBundles>
-                      <resourcebundle>org.neuroml.core:neuroml2-base-definitions:1.8.0</resourcebundle>
-                    </resourceBundles>
-                  </configuration>
-                </execution>
-              </executions>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <version>1.5</version>
+                <executions>
+                    <execution>
+                        <id>fetch-remote-resources</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <resourcebundle>org.neuroml.core:neuroml2-base-definitions:1.8.0</resourcebundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
 
-           <plugin>
-              <artifactId>maven-resources-plugin</artifactId>
-              <version>2.6</version>
-              <executions>
-                <execution>
-                  <id>copy-resources</id>
-                  <phase>generate-sources</phase>
-                  <goals>
-                    <goal>copy-resources</goal>
-                  </goals>
-                  <configuration>
-                    <outputDirectory>${project.build.directory}/maven-shared-archive-resources/Schemas/NeuroML2/bindings/</outputDirectory>
-                    <resources>
-                      <resource>
-                          <directory>${project.basedir}/src/main/resources/bindings/</directory>
-                          <filtering>false</filtering>
-                      </resource>
-                    </resources>
-                  </configuration>
-                </execution>
-              </executions>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/maven-shared-archive-resources/Schemas/NeuroML2/bindings/</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${project.basedir}/src/main/resources/bindings/</directory>
+                                    <filtering>false</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
 
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.3.7</version>
+                <version>5.1.2</version>
                 <extensions>true</extensions>
                 <configuration>
                     <manifestLocation>src/main/java/META-INF</manifestLocation>
@@ -177,6 +166,13 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
                 <version>0.14.0</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.glassfish.jaxb</groupId>
+                        <artifactId>jaxb-runtime</artifactId>
+                        <version>2.3.3</version>
+                    </dependency>
+                </dependencies>
                 <executions>
                     <execution>
                         <id>NeuroML2</id>