[Git][java-team/cmlxom][master] 3 commits: New upstream version 4.3

[Andrius Merkys (@merkys)]

Andrius Merkys pushed to branch master at Debian Java Maintainers / cmlxom


Commits:
72693c76 by Andrius Merkys at 2022-08-22T03:16:32-04:00
New upstream version 4.3
- - - - -
5340ae2f by Andrius Merkys at 2022-08-22T03:16:39-04:00
Update upstream source from tag 'upstream/4.3'

Update to upstream version '4.3'
with Debian dir 7f4c833d3fd26c345512d3d9eaa2f6fc0245e4a6
- - - - -
995ae1ee by Andrius Merkys at 2022-08-22T03:19:24-04:00
Update changelog for 4.3-1 release

- - - - -


7 changed files:

- .github/workflows/maven.yml
- CITATION.cff
- README.md
- debian/changelog
- pom.xml
- src/main/java/org/xmlcml/cml/base/IntSTAttribute.java
- src/main/java/org/xmlcml/cml/interfacex/HasDictRef.java


Changes:

=====================================
.github/workflows/maven.yml
=====================================
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '8', '11', '14' ]
+        java: [ '8', '11', '14', '17' ]
 
     steps:
     - uses: actions/checkout at v2


=====================================
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.1
-date-released: 2022-03-27
+version: 4.3
+date-released: 2022-08-22
 url: "https://github.com/BlueObelisk/cmlxom"
 preferred-citation:
   type: article


=====================================
README.md
=====================================
@@ -11,7 +11,7 @@ implementing the XML object model (XOM) for the Chemical Markup Language (CML).
 Instructions to increase the version:
 
 ```shell
-mvn versions:set -DnewVersion=4.2-SNAPSHOT
+mvn versions:set -DnewVersion=4.4-SNAPSHOT
 ```
 
 Deploy to Sonatype with the following commands, for snapshots and releases respectively:


=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+cmlxom (4.3-1) unstable; urgency=medium
+
+  * New upstream version 4.3
+
+ -- Andrius Merkys <merkys at debian.org>  Mon, 22 Aug 2022 03:19:20 -0400
+
 cmlxom (4.1-1) unstable; urgency=medium
 
   * New upstream version 4.1


=====================================
pom.xml
=====================================
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.blueobelisk</groupId>
 	<artifactId>cmlxom</artifactId>
-	<version>4.1</version>
+	<version>4.3</version>
 	<packaging>jar</packaging>
 	<name>CMLXOM</name>
 	<description>A Java library for processing CML</description>
@@ -316,17 +316,33 @@
 		<dependency>
 			<groupId>org.blueobelisk</groupId>
 			<artifactId>euclid</artifactId>
-			<version>2.1</version>
+			<version>2.3</version>
 		</dependency>
 		<dependency>
 			<groupId>xom</groupId>
 			<artifactId>xom</artifactId>
 			<version>1.3.7</version>
+			<exclusions>
+				<exclusion>
+					<groupId>xerces</groupId>
+					<artifactId>xercesImpl</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>xalan</groupId>
+					<artifactId>xalan</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>xerces</groupId>
+			<artifactId>xercesImpl</artifactId>
+			<version>2.12.2</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>joda-time</groupId>
 			<artifactId>joda-time</artifactId>
-			<version>2.10.14</version>
+			<version>2.11.0</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-io</groupId>
@@ -336,7 +352,7 @@
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-1.2-api</artifactId>
-			<version>2.17.2</version>
+			<version>2.18.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.ccil.cowan.tagsoup</groupId>
@@ -346,7 +362,7 @@
 		<dependency>
 			<groupId>xml-apis</groupId>
 			<artifactId>xml-apis</artifactId>
-			<version>1.4.01</version>
+			<version>2.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>


=====================================
src/main/java/org/xmlcml/cml/base/IntSTAttribute.java
=====================================
@@ -91,7 +91,6 @@ public class IntSTAttribute extends CMLAttribute {
      * 
      * @param s
      *            the value
-     * @throws RuntimeException
      */
     public void setCMLValue(String s) {
     	if (s!= null && !s.trim().equals(S_EMPTY)) {
@@ -123,8 +122,6 @@ public class IntSTAttribute extends CMLAttribute {
      * 
      * @param i
      *            the value
-     * @throws RuntimeException
-     *             wrong type or value fails
      */
     public void checkValue(int i) {
         if (cmlType != null) {


=====================================
src/main/java/org/xmlcml/cml/interfacex/HasDictRef.java
=====================================
@@ -51,7 +51,8 @@ public interface HasDictRef {
 
 
     /** set dictRef value.
-     * 
+     *
+     * @param dictRef
      */
     void setDictRef(String dictRef);
 



View it on GitLab: https://salsa.debian.org/java-team/cmlxom/-/compare/4379425119d644df6e8343a5e6eb87e94d7c2a5c...995ae1ee7610489e8b3b90330364347850c2390d

-- 
View it on GitLab: https://salsa.debian.org/java-team/cmlxom/-/compare/4379425119d644df6e8343a5e6eb87e94d7c2a5c...995ae1ee7610489e8b3b90330364347850c2390d
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20220822/4e331438/attachment.htm>