New Upstream Release - cmlxom
Ready changes
Summary
Merged new upstream version: 4.5 (was: 4.3).
Diff
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 60f181f..c44e941 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -10,14 +10,17 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- java: [ '8', '11', '14', '17' ]
+ java: [ 8, 11, 17, 19 ]
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- name: Set up JDK ${{ matrix.java }}
- uses: actions/setup-java@v2
+ uses: actions/setup-java@v3
with:
java-version: ${{ matrix.java }}
- distribution: 'adopt'
+ distribution: 'temurin'
- name: Build with Maven
run: mvn clean install -Dgpg.skip -Dmaven.javadoc.skip=true
+ - name: Upload coverage reports to Codecov
+ uses: codecov/codecov-action@v3
+
diff --git a/.gitignore b/.gitignore
index 56e8931..09180ad 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
foo
-^.project$
-^.settings/
-^.classpath$
-^.gitignore~$
+.project
+.settings/
+.classpath
+.gitignore~
^target/.*
/target/
diff --git a/CITATION.cff b/CITATION.cff
index 608e88f..2cbae0f 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -1,8 +1,8 @@
cff-version: 1.2.0
message: "If you use this software, please cite it as below."
title: CMLXOM
-version: 4.3
-date-released: 2022-08-22
+version: 4.5
+date-released: 2023-04-09
url: "https://github.com/BlueObelisk/cmlxom"
preferred-citation:
type: article
diff --git a/README.md b/README.md
index ea040cd..1938eca 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.blueobelisk/cmlxom/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.blueobelisk/cmlxom)
[![Build Status](https://github.com/BlueObelisk/cmlxom/actions/workflows/maven.yml/badge.svg)](https://github.com/BlueObelisk/cmlxom/actions/workflows/maven.yml)
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.5815142.svg)](https://doi.org/10.5281/zenodo.5815142)
+[![codecov](https://codecov.io/gh/BlueObelisk/cmlxom/branch/main/graph/badge.svg?token=E1NGWVWL04)](https://codecov.io/gh/BlueObelisk/cmlxom)
A Java library for processing CML,
implementing the XML object model (XOM) for the Chemical Markup Language (CML).
@@ -11,13 +12,12 @@ implementing the XML object model (XOM) for the Chemical Markup Language (CML).
Instructions to increase the version:
```shell
-mvn versions:set -DnewVersion=4.4-SNAPSHOT
+mvn versions:set -DnewVersion=4.6-SNAPSHOT
```
Deploy to Sonatype with the following commands, for snapshots and releases respectively:
```sh1ll
mvn clean deploy
-mvn clean deploy -P release
```
diff --git a/debian/changelog b/debian/changelog
index 9de7abb..6fdbf2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cmlxom (4.5-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk> Sun, 09 Apr 2023 18:11:50 -0000
+
cmlxom (4.3-1) unstable; urgency=medium
* New upstream version 4.3
diff --git a/pom.xml b/pom.xml
index 6b2b354..3ab1e46 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.blueobelisk</groupId>
<artifactId>cmlxom</artifactId>
- <version>4.3</version>
+ <version>4.5</version>
<packaging>jar</packaging>
<name>CMLXOM</name>
<description>A Java library for processing CML</description>
@@ -167,7 +167,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
+ <version>3.10.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
@@ -176,7 +176,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.3.2</version>
+ <version>3.4.1</version>
<configuration>
<doclint>all,-missing</doclint>
<source>8</source>
@@ -283,9 +283,28 @@
</goals>
</execution>
</executions>
- </plugin>
- </plugins>
- </build>
+ </plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>0.8.8</version>
+ <executions>
+ <execution>
+ <id>start-agent</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>generate-report</id>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
<distributionManagement>
<snapshotRepository>
@@ -316,12 +335,12 @@
<dependency>
<groupId>org.blueobelisk</groupId>
<artifactId>euclid</artifactId>
- <version>2.3</version>
+ <version>2.5</version>
</dependency>
<dependency>
<groupId>xom</groupId>
<artifactId>xom</artifactId>
- <version>1.3.7</version>
+ <version>1.3.8</version>
<exclusions>
<exclusion>
<groupId>xerces</groupId>
@@ -342,7 +361,7 @@
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
- <version>2.11.0</version>
+ <version>2.12.5</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -352,7 +371,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
- <version>2.18.0</version>
+ <version>2.20.0</version>
</dependency>
<dependency>
<groupId>org.ccil.cowan.tagsoup</groupId>