Skip to content

Commit d4442f0

Browse files
committed
Merge branch 'release-4.10.18'
2 parents 2a67204 + bfdaacf commit d4442f0

1,293 files changed

Lines changed: 2908 additions & 1676 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949

5050
# Initializes the CodeQL tools for scanning.
5151
- name: Initialize CodeQL
52-
uses: github/codeql-action/init@v1
52+
uses: github/codeql-action/init@v2
5353
with:
5454
languages: ${{ matrix.language }}
5555
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -60,7 +60,7 @@ jobs:
6060
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
6161
# If this step fails, then you should remove it and run the build manually (see below)
6262
- name: Autobuild
63-
uses: github/codeql-action/autobuild@v1
63+
uses: github/codeql-action/autobuild@v2
6464

6565
# ℹ️ Command-line programs to run using the OS shell.
6666
# 📚 https://git.io/JvXDl
@@ -74,4 +74,4 @@ jobs:
7474
# make release
7575

7676
- name: Perform CodeQL Analysis
77-
uses: github/codeql-action/analyze@v1
77+
uses: github/codeql-action/analyze@v2

.github/workflows/publish-snapshot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
gpg-passphrase: MAVEN_GPG_PASSPHRASE
2929

3030
- name: publish packages
31-
run: mvn -P ossrhDeploy --batch-mode -DskipTests javadoc:aggregate-jar source:jar deploy
31+
run: mvn -s scripts/settings.xml -P ossrhDeploy --batch-mode -DskipTests javadoc:aggregate-jar source:jar deploy
3232
env:
3333
MAVEN_USERNAME: ${{ secrets.OSS_SONATYPE_USERNAME }}
3434
MAVEN_PASSWORD: ${{ secrets.OSS_SONATYPE_PASSWORD }}

.lgtm.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

.travis.yml

Lines changed: 0 additions & 70 deletions
This file was deleted.

CHANGES.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,35 @@ Choco Solver ChangeLog
44
This file is dedicated to sum up the new features added and bugs fixed in Choco-solver since the version, 4.0.0.
55
**Note**: double-space is replaced by "\t" character on release process. Make sure the format is ok.
66

7+
4.10.18 - 27 Jan 2025
8+
---------------------
9+
10+
### Major features:
11+
- Fix unexpected behaviour when using `neg()` intvar in arithm #1115
12+
- Fix bin packing initial propagation (#1113)
13+
- Fixed an error in `increasing` constraint documentation and updated `decreasing` constraint documentation (#1103)
14+
-
15+
### Deprecated API (to be removed in next release):
16+
17+
**Full Changelog**: https://github.com/chocoteam/choco-solver/compare/v4.10.17...v4.10.18
18+
19+
4.10.17 - 23 Sep 2024
20+
-------------------
21+
22+
### Hotfix
23+
- Fix bug in `PropHybridTable` (#1102)
24+
25+
**Full Changelog**: https://github.com/chocoteam/choco-solver/compare/v4.10.16...v4.10.17
26+
27+
4.10.16 - 12 Sep 2024
28+
-------------------
29+
30+
### Hotfix
31+
- Fix bug in `IntAffineView` (#1101)
32+
33+
**Full Changelog**: https://github.com/chocoteam/choco-solver/compare/v4.10.15...v4.10.16
34+
35+
736
4.10.17 - 23 Sep 2024
837
-------------------
938

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BSD 4-Clause License
22

3-
Copyright (c) 2024, IMT Atlantique
3+
Copyright (c) 2025, IMT Atlantique
44
All rights reserved.
55

66
Redistribution and use in source and binary forms, with or without

README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
![Build](https://github.com/chocoteam/choco-solver/actions/workflows/maven-test.yml/badge.svg)
1010
[![codecov.io](https://codecov.io/github/chocoteam/choco-solver/coverage.svg?branch=master)](https://codecov.io/github/chocoteam/choco-solver?branch=master)
11-
[![Total alerts](https://img.shields.io/lgtm/alerts/g/chocoteam/choco-solver.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/chocoteam/choco-solver/alerts/)
1211
[![Codacy Badge](https://app.codacy.com/project/badge/Grade/f1bafa113f94486b96343d63782c0f7a)](https://www.codacy.com/gh/chocoteam/choco-solver/dashboard?utm_source=github.com&utm_medium=referral&utm_content=chocoteam/choco-solver&utm_campaign=Badge_Grade)
1312

1413

@@ -18,7 +17,7 @@
1817

1918
Choco-solver is an open-source Java library for Constraint Programming.
2019

21-
Current stable version is 4.10.17 (23 Sep 2024).
20+
Current stable version is 4.10.18 (27 Jan 2025).
2221

2322
Choco-solver comes with:
2423
- various type of variables (integer, boolean, set, graph and real),
@@ -28,7 +27,7 @@ Choco-solver comes with:
2827

2928
But also, facilities to interact with the search loop, factories to help modelling, many samples, etc.
3029

31-
Choco-solver is distributed under BSD 4-Clause License (Copyright (c) 1999-2024, IMT Atlantique).
30+
Choco-solver is distributed under BSD 4-Clause License (Copyright (c) 1999-2025, IMT Atlantique).
3231

3332
Contact:
3433
- [Choco-solver on Discord](https://discord.gg/aH6zxa7e64)
@@ -125,7 +124,7 @@ So you only have to edit your `pom.xml` to declare the following library depende
125124
<dependency>
126125
<groupId>org.choco-solver</groupId>
127126
<artifactId>choco-solver</artifactId>
128-
<version>4.10.17</version>
127+
<version>4.10.18</version>
129128
</dependency>
130129
```
131130

examples/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
This file is part of examples, http://choco-solver.org/
44
5-
Copyright (c) 2024, IMT Atlantique. All rights reserved.
5+
Copyright (c) 2025, IMT Atlantique. All rights reserved.
66
77
Licensed under the BSD 4-clause license.
88
@@ -17,7 +17,7 @@
1717
<parent>
1818
<groupId>org.choco-solver</groupId>
1919
<artifactId>choco</artifactId>
20-
<version>4.10.17</version>
20+
<version>4.10.18</version>
2121
</parent>
2222
<artifactId>examples</artifactId>
2323
<packaging>jar</packaging>

examples/src/main/java/module-info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is part of examples, http://choco-solver.org/
33
*
4-
* Copyright (c) 2024, IMT Atlantique. All rights reserved.
4+
* Copyright (c) 2025, IMT Atlantique. All rights reserved.
55
*
66
* Licensed under the BSD 4-clause license.
77
*

examples/src/main/java/org/chocosolver/examples/AbstractProblem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is part of examples, http://choco-solver.org/
33
*
4-
* Copyright (c) 2024, IMT Atlantique. All rights reserved.
4+
* Copyright (c) 2025, IMT Atlantique. All rights reserved.
55
*
66
* Licensed under the BSD 4-clause license.
77
*

0 commit comments

Comments
 (0)