From 60d9cbc725a474f94b2dbc051caf2bd5b49c42ca Mon Sep 17 00:00:00 2001
From: Hernan Ponce de Leon <hernanl.leon@huawei.com>
Date: Sat, 11 Nov 2023 21:53:34 +0100
Subject: [PATCH 1/2] Update JavaSMT version (with support for OpenSMT)

Signed-off-by: Hernan Ponce de Leon <hernanl.leon@huawei.com>
---
 pom.xml | 44 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 06f331f112..97ae536bd8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,12 +30,13 @@
         <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
 
         <!-- 3rd party solver versions -->
-        <java-smt.version>4.0.2</java-smt.version>
+        <java-smt.version>4.1.0</java-smt.version>
         <boolector.version>3.2.2-g1a89c229</boolector.version>
         <mathsat.version>5.6.10</mathsat.version>
         <cvc4.version>1.8-prerelease-2020-06-24-g7825d8f28</cvc4.version>
         <cvc5.version>1.0.5-g4cb2ab9eb</cvc5.version>
-        <yices2-api.version>4.0.1</yices2-api.version>
+        <opensmt.version>2.5.2-g7f502169</opensmt.version>
+        <yices2-api.version>4.1.0-1-gc58fe5b4</yices2-api.version>
         <yices2.version>2.6.2-396-g194350c1</yices2.version>
         <z3.version>4.12.2</z3.version>
 
@@ -270,6 +271,29 @@
                     <classifier>libpolyxx</classifier>
                 </dependency>
 
+                <!-- OpenSMT dependencies -->
+                <dependency>
+                    <groupId>org.sosy-lab</groupId>
+                    <artifactId>javasmt-solver-opensmt</artifactId>
+                    <version>${opensmt.version}</version>
+                    <type>jar</type>
+                    <classifier>opensmt</classifier>
+                </dependency>
+                <dependency>
+                    <groupId>org.sosy-lab</groupId>
+                    <artifactId>javasmt-solver-opensmt</artifactId>
+                    <version>${opensmt.version}</version>
+                    <type>so</type>
+                    <classifier>libopensmt</classifier>
+                </dependency>
+                <dependency>
+                    <groupId>org.sosy-lab</groupId>
+                    <artifactId>javasmt-solver-opensmt</artifactId>
+                    <version>${opensmt.version}</version>
+                    <type>so</type>
+                    <classifier>libopensmtjava</classifier>
+                </dependency>
+
                 <!-- Yices2 dependencies -->
                 <dependency>
                     <groupId>org.sosy-lab</groupId>
@@ -410,6 +434,22 @@
                                         <destFileName>libpolyxx.so</destFileName>
                                     </artifactItem>
 
+                                    <!-- OpenSMT dependencies -->
+                                    <artifactItem>
+                                        <groupId>org.sosy-lab</groupId>
+                                        <artifactId>javasmt-solver-opensmt</artifactId>
+                                        <type>so</type>
+                                        <classifier>libopensmtjava</classifier>
+                                        <destFileName>libopensmtjava.so</destFileName>
+                                    </artifactItem>
+                                    <artifactItem>
+                                        <groupId>org.sosy-lab</groupId>
+                                        <artifactId>javasmt-solver-opensmt</artifactId>
+                                        <type>so</type>
+                                        <classifier>libopensmt</classifier>
+                                        <destFileName>libopensmt.so</destFileName>
+                                    </artifactItem>
+
                                     <!-- Yices2 dependencies -->
                                     <artifactItem>
                                         <groupId>org.sosy-lab</groupId>

From ed44f700eea83457c9fd1e9218ab7a7c2e73e32f Mon Sep 17 00:00:00 2001
From: Hernan Ponce de Leon <hernanl.leon@huawei.com>
Date: Sun, 12 Nov 2023 12:17:32 +0100
Subject: [PATCH 2/2] Remove explicity jar type from pom since it its default

Signed-off-by: Hernan Ponce de Leon <hernanl.leon@huawei.com>
---
 pom.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 97ae536bd8..6e82cfa032 100644
--- a/pom.xml
+++ b/pom.xml
@@ -202,7 +202,6 @@
                     <groupId>org.sosy-lab</groupId>
                     <artifactId>javasmt-solver-cvc4</artifactId>
                     <version>${cvc4.version}</version>
-                    <type>jar</type>
                     <classifier>CVC4</classifier>
                 </dependency>
                 <dependency>
@@ -232,7 +231,6 @@
                     <groupId>org.sosy-lab</groupId>
                     <artifactId>javasmt-solver-cvc5</artifactId>
                     <version>${cvc5.version}</version>
-                    <type>jar</type>
                     <classifier>cvc5</classifier>
                 </dependency>
                 <dependency>
@@ -276,7 +274,6 @@
                     <groupId>org.sosy-lab</groupId>
                     <artifactId>javasmt-solver-opensmt</artifactId>
                     <version>${opensmt.version}</version>
-                    <type>jar</type>
                     <classifier>opensmt</classifier>
                 </dependency>
                 <dependency>
@@ -299,7 +296,6 @@
                     <groupId>org.sosy-lab</groupId>
                     <artifactId>javasmt-yices2</artifactId>
                     <version>${yices2-api.version}</version>
-                    <type>jar</type>
                 </dependency>
                 <dependency>
                     <groupId>org.sosy-lab</groupId>