Merge branch 'release/1.5.0'

Release: com.io7m.xstructural 1.5.0 Change: Add 1em margin to list items (Ticket: #21) Change: Update dependencies
io7m-com · Jun 30, 2022 · 7f5f5ee · 7f5f5ee
2 parents 4aacfbd + 2726c28
commit 7f5f5ee
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 20 deletions.
diff --git a/README-CHANGES.xml b/README-CHANGES.xml
@@ -34,7 +34,7 @@
         <c:change date="2021-06-27T00:00:00+00:00" summary="Fix a schema bug that rejected valid footnotes in documents"/>
       </c:changes>
     </c:release>
-    <c:release date="2022-02-03T22:22:51+00:00" is-open="false" ticket-system="com.github.io7m.xstructural" version="1.4.0">
+    <c:release date="2022-02-03T00:00:00+00:00" is-open="false" ticket-system="com.github.io7m.xstructural" version="1.4.0">
       <c:changes>
         <c:change date="2022-02-03T00:00:00+00:00" summary="Fix a bug where documents with comments would be rejected">
           <c:tickets>
@@ -48,6 +48,16 @@
         </c:change>
       </c:changes>
     </c:release>
+    <c:release date="2022-06-30T08:47:08+00:00" is-open="false" ticket-system="com.github.io7m.xstructural" version="1.5.0">
+      <c:changes>
+        <c:change date="2022-06-30T00:00:00+00:00" summary="Add 1em margin to list items">
+          <c:tickets>
+            <c:ticket id="21"/>
+          </c:tickets>
+        </c:change>
+        <c:change date="2022-06-30T00:00:00+00:00" summary="Update dependencies"/>
+      </c:changes>
+    </c:release>
   </c:releases>
   <c:ticket-systems>
     <c:ticket-system default="true" id="com.github.io7m.xstructural" url="https://www.github.com/io7m/xstructural/issues/"/>

diff --git a/com.io7m.xstructural.api/pom.xml b/com.io7m.xstructural.api/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.xstructural</artifactId>
     <groupId>com.io7m.xstructural</groupId>
-    <version>1.4.0</version>
+    <version>1.5.0</version>
   </parent>
 
   <artifactId>com.io7m.xstructural.api</artifactId>

diff --git a/com.io7m.xstructural.cmdline/pom.xml b/com.io7m.xstructural.cmdline/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.xstructural</artifactId>
     <groupId>com.io7m.xstructural</groupId>
-    <version>1.4.0</version>
+    <version>1.5.0</version>
   </parent>
 
   <artifactId>com.io7m.xstructural.cmdline</artifactId>

diff --git a/com.io7m.xstructural.documentation/pom.xml b/com.io7m.xstructural.documentation/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.xstructural</artifactId>
     <groupId>com.io7m.xstructural</groupId>
-    <version>1.4.0</version>
+    <version>1.5.0</version>
   </parent>
 
   <artifactId>com.io7m.xstructural.documentation</artifactId>

diff --git a/....xstructural.documentation/src/main/resources/com/io7m/xstructural/documentation/main.xml b/....xstructural.documentation/src/main/resources/com/io7m/xstructural/documentation/main.xml
@@ -9,7 +9,7 @@
     <dc:creator>Mark Raynsford</dc:creator>
     <dc:date>2021-06-27T00:00:00Z</dc:date>
     <dc:description>User documentation for the ${project.groupId} package.</dc:description>
-    <dc:identifier>d792ce57-6851-415a-b6c9-18550e512136</dc:identifier>
+    <dc:identifier>59c00e65-2e1e-4e86-97b5-b4b1a650eea5</dc:identifier>
     <dc:language>en</dc:language>
     <dc:rights>Public Domain</dc:rights>
     <dc:title>xstructural ${project.version}</dc:title>

diff --git a/com.io7m.xstructural.tests/pom.xml b/com.io7m.xstructural.tests/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <artifactId>com.io7m.xstructural</artifactId>
     <groupId>com.io7m.xstructural</groupId>
-    <version>1.4.0</version>
+    <version>1.5.0</version>
   </parent>
 
   <artifactId>com.io7m.xstructural.tests</artifactId>

diff --git a/com.io7m.xstructural.vanilla/pom.xml b/com.io7m.xstructural.vanilla/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.xstructural</artifactId>
     <groupId>com.io7m.xstructural</groupId>
-    <version>1.4.0</version>
+    <version>1.5.0</version>
   </parent>
 
   <artifactId>com.io7m.xstructural.vanilla</artifactId>
@@ -66,6 +66,10 @@
       <groupId>org.w3c</groupId>
       <artifactId>epubcheck</artifactId>
     </dependency>
+    <dependency>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/com.io7m.xstructural.xml/pom.xml b/com.io7m.xstructural.xml/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.io7m.xstructural</groupId>
     <artifactId>com.io7m.xstructural</artifactId>
-    <version>1.4.0</version>
+    <version>1.5.0</version>
   </parent>
 
   <artifactId>com.io7m.xstructural.xml</artifactId>

diff --git a/com.io7m.xstructural.xml/src/main/css/com/io7m/xstructural/xml/structural.css b/com.io7m.xstructural.xml/src/main/css/com/io7m/xstructural/xml/structural.css
@@ -367,6 +367,7 @@ h6
   font-family:   var(--stContentFont);
   color:         var(--stContentColor);
   padding-right: 1em;
+  margin-top:    1em;
 }
 
 /*

diff --git a/pom.xml b/pom.xml
@@ -6,12 +6,12 @@
   <parent>
     <groupId>com.io7m.primogenitor</groupId>
     <artifactId>com.io7m.primogenitor.full</artifactId>
-    <version>7.0.0-beta0003</version>
+    <version>7.1.0</version>
   </parent>
 
   <groupId>com.io7m.xstructural</groupId>
   <artifactId>com.io7m.xstructural</artifactId>
-  <version>1.4.0</version>
+  <version>1.5.0</version>
   <packaging>pom</packaging>
 
   <description>Structural document format</description>
@@ -29,7 +29,7 @@
 
   <properties>
     <com.io7m.immutables.version>2.8.8</com.io7m.immutables.version>
-    <io7m.api.previousVersion>1.3.0</io7m.api.previousVersion>
+    <io7m.api.previousVersion>1.4.0</io7m.api.previousVersion>
     <junit.version>5.7.0</junit.version>
   </properties>
 
@@ -82,7 +82,7 @@
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>org.osgi.annotation.bundle</artifactId>
-        <version>1.1.1</version>
+        <version>2.0.0</version>
       </dependency>
       <dependency>
         <groupId>org.osgi</groupId>
@@ -112,12 +112,12 @@
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
-        <version>2.0.0-alpha1</version>
+        <version>2.0.0-alpha7</version>
       </dependency>
       <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-classic</artifactId>
-        <version>1.3.0-alpha5</version>
+        <version>1.3.0-alpha14</version>
       </dependency>
       <dependency>
         <groupId>org.junit.jupiter</groupId>
@@ -132,22 +132,22 @@
       <dependency>
         <groupId>com.io7m.junreachable</groupId>
         <artifactId>com.io7m.junreachable.core</artifactId>
-        <version>3.0.0</version>
+        <version>4.0.0</version>
       </dependency>
       <dependency>
         <groupId>com.beust</groupId>
         <artifactId>jcommander</artifactId>
-        <version>1.78</version>
+        <version>1.82</version>
       </dependency>
       <dependency>
         <groupId>com.io7m.primogenitor</groupId>
         <artifactId>com.io7m.primogenitor.support</artifactId>
-        <version>7.0.0-beta0003</version>
+        <version>7.1.0</version>
       </dependency>
       <dependency>
         <groupId>com.github.marschall</groupId>
         <artifactId>memoryfilesystem</artifactId>
-        <version>2.1.0</version>
+        <version>2.3.0</version>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
@@ -157,12 +157,12 @@
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
-        <version>2.8.0</version>
+        <version>2.11.0</version>
       </dependency>
       <dependency>
         <groupId>org.w3c</groupId>
         <artifactId>epubcheck</artifactId>
-        <version>4.2.5</version>
+        <version>4.2.6</version>
         <exclusions>
           <exclusion>
             <groupId>xerces</groupId>
@@ -190,6 +190,11 @@
           </exclusion>
         </exclusions>
       </dependency>
+      <dependency>
+        <groupId>xml-apis</groupId>
+        <artifactId>xml-apis</artifactId>
+        <version>1.4.01</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>