Update com.io7m.blackthorne 1.3.1 → 2.0.0.

io7m-com · Aug 10, 2023 · 49bfc82 · 49bfc82
1 parent 8b8192f
commit 49bfc82
Show file tree

Hide file tree

Showing 15 changed files with 40 additions and 39 deletions.
diff --git a/README-CHANGES.xml b/README-CHANGES.xml
@@ -6,10 +6,11 @@
         <c:change date="2023-06-25T00:00:00+00:00" summary="Initial major version."/>
       </c:changes>
     </c:release>
-    <c:release date="2023-08-10T17:44:06+00:00" is-open="true" ticket-system="com.github.io7m.trasco" version="1.1.0">
+    <c:release date="2023-08-10T17:45:43+00:00" is-open="true" ticket-system="com.github.io7m.trasco" version="1.1.0">
       <c:changes>
         <c:change date="2023-08-10T00:00:00+00:00" summary="Update com.io7m.jxe:com.io7m.jxe.core 1.0.0 → 1.0.2."/>
-        <c:change date="2023-08-10T17:44:06+00:00" summary="Update ch.qos.logback:logback-classic 1.4.9 → 1.4.11."/>
+        <c:change date="2023-08-10T00:00:00+00:00" summary="Update ch.qos.logback:logback-classic 1.4.9 → 1.4.11."/>
+        <c:change date="2023-08-10T17:45:43+00:00" summary="Update com.io7m.blackthorne 1.3.1 → 2.0.0."/>
       </c:changes>
     </c:release>
   </c:releases>

diff --git a/com.io7m.trasco.vanilla/pom.xml b/com.io7m.trasco.vanilla/pom.xml
@@ -47,7 +47,7 @@
     </dependency>
     <dependency>
       <groupId>com.io7m.blackthorne</groupId>
-      <artifactId>com.io7m.blackthorne.api</artifactId>
+      <artifactId>com.io7m.blackthorne.core</artifactId>
     </dependency>
     <dependency>
       <groupId>com.io7m.blackthorne</groupId>

diff --git a/...sco.vanilla/src/main/java/com/io7m/trasco/vanilla/internal/TrSchemaSetRevisionParser.java b/...sco.vanilla/src/main/java/com/io7m/trasco/vanilla/internal/TrSchemaSetRevisionParser.java
@@ -20,9 +20,9 @@
 import com.io7m.anethum.api.ParseSeverity;
 import com.io7m.anethum.api.ParseStatus;
 import com.io7m.anethum.api.ParsingException;
-import com.io7m.blackthorne.api.BTException;
-import com.io7m.blackthorne.api.BTParseError;
-import com.io7m.blackthorne.api.BTPreserveLexical;
+import com.io7m.blackthorne.core.BTException;
+import com.io7m.blackthorne.core.BTParseError;
+import com.io7m.blackthorne.core.BTPreserveLexical;
 import com.io7m.blackthorne.jxe.BlackthorneJXE;
 import com.io7m.trasco.api.TrSchemaRevisionSet;
 import com.io7m.trasco.api.TrSchemaRevisionSetParserType;

diff --git a/com.io7m.trasco.vanilla/src/main/java/com/io7m/trasco/vanilla/internal/v1/TrV1.java b/com.io7m.trasco.vanilla/src/main/java/com/io7m/trasco/vanilla/internal/v1/TrV1.java
@@ -16,7 +16,7 @@
 
 package com.io7m.trasco.vanilla.internal.v1;
 
-import com.io7m.blackthorne.api.BTQualifiedName;
+import com.io7m.blackthorne.core.BTQualifiedName;
 import com.io7m.trasco.xml.schemas.TrSchemas;
 
 /**

diff --git a/...m.trasco.vanilla/src/main/java/com/io7m/trasco/vanilla/internal/v1/TrV1CommentParser.java b/...m.trasco.vanilla/src/main/java/com/io7m/trasco/vanilla/internal/v1/TrV1CommentParser.java
@@ -16,8 +16,8 @@
 
 package com.io7m.trasco.vanilla.internal.v1;
 
-import com.io7m.blackthorne.api.BTElementHandlerType;
-import com.io7m.blackthorne.api.BTElementParsingContextType;
+import com.io7m.blackthorne.core.BTElementHandlerType;
+import com.io7m.blackthorne.core.BTElementParsingContextType;
 
 /**
  * A comment parser.

diff --git a/...co.vanilla/src/main/java/com/io7m/trasco/vanilla/internal/v1/TrV1ParameterDeclParser.java b/...co.vanilla/src/main/java/com/io7m/trasco/vanilla/internal/v1/TrV1ParameterDeclParser.java
@@ -16,8 +16,8 @@
 
 package com.io7m.trasco.vanilla.internal.v1;
 
-import com.io7m.blackthorne.api.BTElementHandlerType;
-import com.io7m.blackthorne.api.BTElementParsingContextType;
+import com.io7m.blackthorne.core.BTElementHandlerType;
+import com.io7m.blackthorne.core.BTElementParsingContextType;
 import com.io7m.trasco.api.TrParameter;
 import com.io7m.trasco.api.TrParameterKind;
 import org.xml.sax.Attributes;

diff --git a/...a/src/main/java/com/io7m/trasco/vanilla/internal/v1/TrV1ParameterReferenceDeclParser.java b/...a/src/main/java/com/io7m/trasco/vanilla/internal/v1/TrV1ParameterReferenceDeclParser.java
@@ -16,8 +16,8 @@
 
 package com.io7m.trasco.vanilla.internal.v1;
 
-import com.io7m.blackthorne.api.BTElementHandlerType;
-import com.io7m.blackthorne.api.BTElementParsingContextType;
+import com.io7m.blackthorne.core.BTElementHandlerType;
+import com.io7m.blackthorne.core.BTElementParsingContextType;
 import com.io7m.trasco.api.TrParameterReference;
 import org.xml.sax.Attributes;
 

diff --git a/.../src/main/java/com/io7m/trasco/vanilla/internal/v1/TrV1ParameterReferencesDeclParser.java b/.../src/main/java/com/io7m/trasco/vanilla/internal/v1/TrV1ParameterReferencesDeclParser.java
@@ -16,10 +16,10 @@
 
 package com.io7m.trasco.vanilla.internal.v1;
 
-import com.io7m.blackthorne.api.BTElementHandlerConstructorType;
-import com.io7m.blackthorne.api.BTElementHandlerType;
-import com.io7m.blackthorne.api.BTElementParsingContextType;
-import com.io7m.blackthorne.api.BTQualifiedName;
+import com.io7m.blackthorne.core.BTElementHandlerConstructorType;
+import com.io7m.blackthorne.core.BTElementHandlerType;
+import com.io7m.blackthorne.core.BTElementParsingContextType;
+import com.io7m.blackthorne.core.BTQualifiedName;
 import com.io7m.trasco.api.TrParameterReference;
 import com.io7m.trasco.api.TrParameterReferences;
 

diff --git a/...o.vanilla/src/main/java/com/io7m/trasco/vanilla/internal/v1/TrV1ParametersDeclParser.java b/...o.vanilla/src/main/java/com/io7m/trasco/vanilla/internal/v1/TrV1ParametersDeclParser.java
@@ -16,10 +16,10 @@
 
 package com.io7m.trasco.vanilla.internal.v1;
 
-import com.io7m.blackthorne.api.BTElementHandlerConstructorType;
-import com.io7m.blackthorne.api.BTElementHandlerType;
-import com.io7m.blackthorne.api.BTElementParsingContextType;
-import com.io7m.blackthorne.api.BTQualifiedName;
+import com.io7m.blackthorne.core.BTElementHandlerConstructorType;
+import com.io7m.blackthorne.core.BTElementHandlerType;
+import com.io7m.blackthorne.core.BTElementParsingContextType;
+import com.io7m.blackthorne.core.BTQualifiedName;
 import com.io7m.trasco.api.TrParameter;
 import org.xml.sax.Attributes;
 

diff --git a/...rasco.vanilla/src/main/java/com/io7m/trasco/vanilla/internal/v1/TrV1SchemaDeclParser.java b/...rasco.vanilla/src/main/java/com/io7m/trasco/vanilla/internal/v1/TrV1SchemaDeclParser.java
@@ -16,10 +16,10 @@
 
 package com.io7m.trasco.vanilla.internal.v1;
 
-import com.io7m.blackthorne.api.BTElementHandlerConstructorType;
-import com.io7m.blackthorne.api.BTElementHandlerType;
-import com.io7m.blackthorne.api.BTElementParsingContextType;
-import com.io7m.blackthorne.api.BTQualifiedName;
+import com.io7m.blackthorne.core.BTElementHandlerConstructorType;
+import com.io7m.blackthorne.core.BTElementHandlerType;
+import com.io7m.blackthorne.core.BTElementParsingContextType;
+import com.io7m.blackthorne.core.BTQualifiedName;
 import com.io7m.trasco.api.TrSchemaRevision;
 import com.io7m.trasco.api.TrStatement;
 import com.io7m.trasco.api.TrStatementParameterized;

diff --git a/...co.vanilla/src/main/java/com/io7m/trasco/vanilla/internal/v1/TrV1SchemaDeclSetParser.java b/...co.vanilla/src/main/java/com/io7m/trasco/vanilla/internal/v1/TrV1SchemaDeclSetParser.java
@@ -16,10 +16,10 @@
 
 package com.io7m.trasco.vanilla.internal.v1;
 
-import com.io7m.blackthorne.api.BTElementHandlerConstructorType;
-import com.io7m.blackthorne.api.BTElementHandlerType;
-import com.io7m.blackthorne.api.BTElementParsingContextType;
-import com.io7m.blackthorne.api.BTQualifiedName;
+import com.io7m.blackthorne.core.BTElementHandlerConstructorType;
+import com.io7m.blackthorne.core.BTElementHandlerType;
+import com.io7m.blackthorne.core.BTElementParsingContextType;
+import com.io7m.blackthorne.core.BTQualifiedName;
 import com.io7m.trasco.api.TrParameter;
 import com.io7m.trasco.api.TrSchemaRevision;
 import com.io7m.trasco.api.TrSchemaRevisionSet;

diff --git a/...a/src/main/java/com/io7m/trasco/vanilla/internal/v1/TrV1StatementParameterizedParser.java b/...a/src/main/java/com/io7m/trasco/vanilla/internal/v1/TrV1StatementParameterizedParser.java
@@ -16,10 +16,10 @@
 
 package com.io7m.trasco.vanilla.internal.v1;
 
-import com.io7m.blackthorne.api.BTElementHandlerConstructorType;
-import com.io7m.blackthorne.api.BTElementHandlerType;
-import com.io7m.blackthorne.api.BTElementParsingContextType;
-import com.io7m.blackthorne.api.BTQualifiedName;
+import com.io7m.blackthorne.core.BTElementHandlerConstructorType;
+import com.io7m.blackthorne.core.BTElementHandlerType;
+import com.io7m.blackthorne.core.BTElementParsingContextType;
+import com.io7m.blackthorne.core.BTQualifiedName;
 import com.io7m.trasco.api.TrParameterInterpolation;
 import com.io7m.trasco.api.TrParameterReferences;
 import com.io7m.trasco.api.TrStatement;

diff --git a/...trasco.vanilla/src/main/java/com/io7m/trasco/vanilla/internal/v1/TrV1StatementParser.java b/...trasco.vanilla/src/main/java/com/io7m/trasco/vanilla/internal/v1/TrV1StatementParser.java
@@ -16,8 +16,8 @@
 
 package com.io7m.trasco.vanilla.internal.v1;
 
-import com.io7m.blackthorne.api.BTElementHandlerType;
-import com.io7m.blackthorne.api.BTElementParsingContextType;
+import com.io7m.blackthorne.core.BTElementHandlerType;
+import com.io7m.blackthorne.core.BTElementParsingContextType;
 import com.io7m.trasco.api.TrStatement;
 
 /**

diff --git a/com.io7m.trasco.vanilla/src/main/java/module-info.java b/com.io7m.trasco.vanilla/src/main/java/module-info.java
@@ -27,12 +27,12 @@
 
   requires com.io7m.trasco.xml.schemas;
 
-  requires org.apache.commons.text;
   requires com.io7m.anethum.api;
-  requires com.io7m.blackthorne.api;
+  requires com.io7m.blackthorne.core;
   requires com.io7m.blackthorne.jxe;
   requires com.io7m.junreachable.core;
   requires com.io7m.jxe.core;
+  requires org.apache.commons.text;
   requires org.slf4j;
 
   exports com.io7m.trasco.vanilla;

diff --git a/pom.xml b/pom.xml
@@ -28,7 +28,7 @@
   </modules>
 
   <properties>
-    <com.io7m.blackthorne.version>2.0.0-SNAPSHOT</com.io7m.blackthorne.version>
+    <com.io7m.blackthorne.version>2.0.0</com.io7m.blackthorne.version>
     <com.io7m.jxtrand.version>2.0.0</com.io7m.jxtrand.version>
     <com.io7m.seltzer.version>1.0.0</com.io7m.seltzer.version>
     <com.io7m.xstructural.version>1.8.0</com.io7m.xstructural.version>
@@ -124,7 +124,7 @@
       </dependency>
       <dependency>
         <groupId>com.io7m.blackthorne</groupId>
-        <artifactId>com.io7m.blackthorne.api</artifactId>
+        <artifactId>com.io7m.blackthorne.core</artifactId>
         <version>${com.io7m.blackthorne.version}</version>
       </dependency>
       <dependency>