Skip to content

Commit 0f28dc8

Browse files
kfriedbergerkfriedberger
committed
update Maven projects to latest version of JavaSMT 4.1.0.
The solver OpenSMT 2.5.2 is included, which fixes #341. All necessary files are already uploaded to the OSS Maven repository. Synchronization with other Maven repositories might need a few hours.
1 parent 761c85b commit 0f28dc8

2 files changed

Lines changed: 90 additions & 8 deletions

File tree

‎doc/Example-Maven-Project/pom.xml‎

Lines changed: 44 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ SPDX-License-Identifier: Apache-2.0
1616

1717
<groupId>org.sosy_lab.java_smt_example</groupId>
1818
<artifactId>java-smt-maven-example</artifactId>
19-
<version>1.8</version>
19+
<version>1.9</version>
2020
<name>java-smt-maven-example</name>
2121
<description>Example Maven project to show how to use JavaSMT with native solver libraries.</description>
2222
<url>https://github.com/sosy-lab/java-smt</url>
@@ -69,12 +69,13 @@ SPDX-License-Identifier: Apache-2.0
6969
<project.dependency.relativepath>dependency</project.dependency.relativepath>
7070
<project.dependency.path>${project.build.directory}/${project.dependency.relativepath}</project.dependency.path>
7171

72-
<javasmt.version>4.0.3</javasmt.version>
72+
<javasmt.version>4.1.0</javasmt.version>
7373
<boolector.version>3.2.2-g1a89c229</boolector.version>
7474
<cvc4.version>1.8-prerelease-2020-06-24-g7825d8f28</cvc4.version>
7575
<cvc5.version>1.0.5-g4cb2ab9eb</cvc5.version>
7676
<mathsat.version>5.6.10</mathsat.version>
77-
<javasmt-yices.version>4.0.1</javasmt-yices.version>
77+
<opensmt.version>2.5.2-g7f502169</opensmt.version>
78+
<javasmt-yices.version>4.1.0-1-gc58fe5b4</javasmt-yices.version>
7879
<yices.version>2.6.2-396-g194350c1</yices.version>
7980
<z3.version>4.12.2</z3.version>
8081
</properties>
@@ -215,7 +216,6 @@ SPDX-License-Identifier: Apache-2.0
215216
<classifier>libpolyxx</classifier>
216217
</dependency>
217218

218-
219219
<!-- Yices2 has two dependencies (on Linux) -->
220220
<dependency>
221221
<groupId>org.sosy-lab</groupId>
@@ -231,6 +231,29 @@ SPDX-License-Identifier: Apache-2.0
231231
<classifier>libyices2j</classifier>
232232
</dependency>
233233

234+
<!-- OpenSMT has three dependencies (on Linux) -->
235+
<dependency>
236+
<groupId>org.sosy-lab</groupId>
237+
<artifactId>javasmt-solver-opensmt</artifactId>
238+
<version>${opensmt.version}</version>
239+
<type>jar</type>
240+
<classifier>opensmt</classifier>
241+
</dependency>
242+
<dependency>
243+
<groupId>org.sosy-lab</groupId>
244+
<artifactId>javasmt-solver-opensmt</artifactId>
245+
<version>${opensmt.version}</version>
246+
<type>so</type>
247+
<classifier>libopensmt</classifier>
248+
</dependency>
249+
<dependency>
250+
<groupId>org.sosy-lab</groupId>
251+
<artifactId>javasmt-solver-opensmt</artifactId>
252+
<version>${opensmt.version}</version>
253+
<type>so</type>
254+
<classifier>libopensmtjava</classifier>
255+
</dependency>
256+
234257
<!-- JUnit for testing -->
235258
<dependency>
236259
<groupId>junit</groupId>
@@ -439,6 +462,23 @@ SPDX-License-Identifier: Apache-2.0
439462
<classifier>libyices2j</classifier>
440463
<destFileName>libyices2j.so</destFileName>
441464
</artifactItem>
465+
466+
<!-- OpenSMT has two dependencies (on Linux),
467+
and renaming the JAR file is not required to be copied.-->
468+
<artifactItem>
469+
<groupId>org.sosy-lab</groupId>
470+
<artifactId>javasmt-solver-opensmt</artifactId>
471+
<type>so</type>
472+
<classifier>libopensmtjava</classifier>
473+
<destFileName>libopensmtjava.so</destFileName>
474+
</artifactItem>
475+
<artifactItem>
476+
<groupId>org.sosy-lab</groupId>
477+
<artifactId>javasmt-solver-opensmt</artifactId>
478+
<type>so</type>
479+
<classifier>libopensmt</classifier>
480+
<destFileName>libopensmt.so</destFileName>
481+
</artifactItem>
442482
</artifactItems>
443483
</configuration>
444484
</plugin>

‎doc/Example-Maven-Web-Project/pom.xml‎

Lines changed: 46 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ SPDX-License-Identifier: Apache-2.0
1616

1717
<groupId>org.sosy_lab.java_smt_web_example</groupId>
1818
<artifactId>java-smt-web-example</artifactId>
19-
<version>1.8</version>
19+
<version>1.9</version>
2020
<packaging>war</packaging>
2121

2222
<name>java-smt-maven-web-example</name>
@@ -71,12 +71,13 @@ SPDX-License-Identifier: Apache-2.0
7171
<project.dependency.relativepath>dependency</project.dependency.relativepath>
7272
<project.dependency.path>${project.build.directory}/${project.dependency.relativepath}</project.dependency.path>
7373

74-
<javasmt.version>4.0.3</javasmt.version>
74+
<javasmt.version>4.1.0</javasmt.version>
7575
<boolector.version>3.2.2-g1a89c229</boolector.version>
7676
<cvc4.version>1.8-prerelease-2020-06-24-g7825d8f28</cvc4.version>
7777
<cvc5.version>1.0.5-g4cb2ab9eb</cvc5.version>
7878
<mathsat.version>5.6.10</mathsat.version>
79-
<javasmt-yices.version>4.0.1</javasmt-yices.version>
79+
<opensmt.version>2.5.2-g7f502169</opensmt.version>
80+
<javasmt-yices.version>4.1.0-1-gc58fe5b4</javasmt-yices.version>
8081
<yices.version>2.6.2-396-g194350c1</yices.version>
8182
<z3.version>4.12.2</z3.version>
8283
</properties>
@@ -217,7 +218,6 @@ SPDX-License-Identifier: Apache-2.0
217218
<classifier>libpolyxx</classifier>
218219
</dependency>
219220

220-
221221
<!-- Yices2 has two dependencies (on Linux) -->
222222
<dependency>
223223
<groupId>org.sosy-lab</groupId>
@@ -233,6 +233,29 @@ SPDX-License-Identifier: Apache-2.0
233233
<classifier>libyices2j</classifier>
234234
</dependency>
235235

236+
<!-- OpenSMT has three dependencies (on Linux) -->
237+
<dependency>
238+
<groupId>org.sosy-lab</groupId>
239+
<artifactId>javasmt-solver-opensmt</artifactId>
240+
<version>${opensmt.version}</version>
241+
<type>jar</type>
242+
<classifier>opensmt</classifier>
243+
</dependency>
244+
<dependency>
245+
<groupId>org.sosy-lab</groupId>
246+
<artifactId>javasmt-solver-opensmt</artifactId>
247+
<version>${opensmt.version}</version>
248+
<type>so</type>
249+
<classifier>libopensmt</classifier>
250+
</dependency>
251+
<dependency>
252+
<groupId>org.sosy-lab</groupId>
253+
<artifactId>javasmt-solver-opensmt</artifactId>
254+
<version>${opensmt.version}</version>
255+
<type>so</type>
256+
<classifier>libopensmtjava</classifier>
257+
</dependency>
258+
236259
<!-- JUnit for testing -->
237260
<dependency>
238261
<groupId>junit</groupId>
@@ -295,6 +318,8 @@ SPDX-License-Identifier: Apache-2.0
295318
<include>libpoly.so</include>
296319
<include>libpolyxx.so</include>
297320
<include>libyices2j.so</include>
321+
<include>libopensmt.so</include>
322+
<include>libopensmtjava.so</include>
298323
</includes>
299324
<targetPath>WEB-INF/lib</targetPath>
300325
</resource>
@@ -485,6 +510,23 @@ SPDX-License-Identifier: Apache-2.0
485510
<classifier>libyices2j</classifier>
486511
<destFileName>libyices2j.so</destFileName>
487512
</artifactItem>
513+
514+
<!-- OpenSMT has two dependencies (on Linux),
515+
and renaming the JAR file is not required to be copied.-->
516+
<artifactItem>
517+
<groupId>org.sosy-lab</groupId>
518+
<artifactId>javasmt-solver-opensmt</artifactId>
519+
<type>so</type>
520+
<classifier>libopensmtjava</classifier>
521+
<destFileName>libopensmtjava.so</destFileName>
522+
</artifactItem>
523+
<artifactItem>
524+
<groupId>org.sosy-lab</groupId>
525+
<artifactId>javasmt-solver-opensmt</artifactId>
526+
<type>so</type>
527+
<classifier>libopensmt</classifier>
528+
<destFileName>libopensmt.so</destFileName>
529+
</artifactItem>
488530
</artifactItems>
489531
</configuration>
490532
</plugin>

0 commit comments

Comments
 (0)