To v1.10.0

NeuroML · Sep 22, 2023 · 18c2ce4 · 18c2ce4
1 parent fe071d7
commit 18c2ce4
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,10 +3,10 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.neuroml.model</groupId>
     <artifactId>org.neuroml.model</artifactId>
-    <version>1.9.1</version>
+    <version>1.10.0</version>
     <packaging>bundle</packaging>
     <properties>
-        <build.version2>2.3</build.version2>
+        <build.version2>2.3.1</build.version2>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
@@ -19,12 +19,12 @@
         <dependency>
             <groupId>org.neuroml.model.injectingplugin</groupId>
             <artifactId>org.neuroml.model.injectingplugin</artifactId>
-            <version>1.9.1</version>
+            <version>1.10.0</version>
         </dependency>
         <dependency>
             <groupId>org.neuroml.core</groupId>
             <artifactId>neuroml2-base-definitions</artifactId>
-            <version>1.9.1</version>
+            <version>1.10.0</version>
         </dependency>
 
         <dependency>
@@ -64,7 +64,7 @@
                             &lt;br /&gt;
                             &lt;br /&gt;
                     </top>
-                    <bottom>Copyright NeuroML Contributors 2022</bottom>
+                    <bottom>Copyright NeuroML Contributors 2023</bottom>
                 </configuration>
             </plugin>
             <plugin>
@@ -105,7 +105,7 @@
                         </goals>
                         <configuration>
                             <resourceBundles>
-                                <resourcebundle>org.neuroml.core:neuroml2-base-definitions:1.9.1</resourcebundle>
+                                <resourcebundle>org.neuroml.core:neuroml2-base-definitions:1.10.0</resourcebundle>
                             </resourceBundles>
                         </configuration>
                     </execution>
@@ -198,7 +198,7 @@
                                 <plugin>
                                     <groupId>org.neuroml.model.injectingplugin</groupId>
                                     <artifactId>org.neuroml.model.injectingplugin</artifactId>
-                                    <version>1.9.1</version>
+                                    <version>1.10.0</version>
                                 </plugin>
                             </plugins>
                         </configuration>

diff --git a/src/main/java/org/neuroml/model/util/NeuroMLElements.java b/src/main/java/org/neuroml/model/util/NeuroMLElements.java
@@ -2,7 +2,7 @@
 
 public class NeuroMLElements {
 
-    public static final String ORG_NEUROML_MODEL_VERSION = "1.9.1";
+    public static final String ORG_NEUROML_MODEL_VERSION = "1.10.0";
 
     public static final String NAMESPACE_URI_VERSION_2 = "http://www.neuroml.org/schema/neuroml2";
 
@@ -17,11 +17,12 @@ public class NeuroMLElements {
     public static final String DEFAULT_SCHEMA_LOCATION_VERSION_2_1 = "https://raw.githubusercontent.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.1.xsd";
     public static final String DEFAULT_SCHEMA_LOCATION_VERSION_2_2 = "https://raw.githubusercontent.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.2.xsd";
     public static final String DEFAULT_SCHEMA_LOCATION_VERSION_2_3 = "https://raw.githubusercontent.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.xsd";
+    public static final String DEFAULT_SCHEMA_LOCATION_VERSION_2_3_1 = "https://raw.githubusercontent.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.1.xsd";
 
 
-    public static final String LATEST_SCHEMA_VERSION = "2.3";
+    public static final String LATEST_SCHEMA_VERSION = "2.3.1";
     public static final String LATEST_SCHEMA = "/Schemas/NeuroML2/NeuroML_v"+LATEST_SCHEMA_VERSION+".xsd";
-    public static final String LATEST_SCHEMA_LOCATION = DEFAULT_SCHEMA_LOCATION_VERSION_2_3;
+    public static final String LATEST_SCHEMA_LOCATION = DEFAULT_SCHEMA_LOCATION_VERSION_2_3_1;
 
     // Top level...
     public static final String NEUROML_ROOT = "neuroml";

diff --git a/src/main/resources/bindings/NeuroML_v2.3.1.xjb b/src/main/resources/bindings/NeuroML_v2.3.1.xjb
@@ -0,0 +1,23 @@
+
+<jxb:bindings version="2.0"
+               xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
+               xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <jxb:bindings schemaLocation="../NeuroML_v2.3.1.xsd" node="/xs:schema">
+
+        <jxb:schemaBindings>
+            <jxb:package name="org.neuroml.model"/>
+        </jxb:schemaBindings>
+
+        <jxb:bindings node=".//xs:attribute[@name='morphology']">
+            <jxb:property name="morphologyAttr"/>
+        </jxb:bindings>
+
+        <jxb:bindings node=".//xs:attribute[@name='biophysicalProperties']">
+            <jxb:property name="biophysicalPropertiesAttr"/>
+        </jxb:bindings>
+
+
+    </jxb:bindings>
+
+</jxb:bindings>