Skip to content

Commit d10522c

Browse files
committed
Merge branch 'main' into maven399
2 parents 8d59786 + 1f90939 commit d10522c

472 files changed

Lines changed: 157 additions & 783383 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.

.ci/jenkins/config/main.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ git:
1919
- name: 10.1.x
2020
seed:
2121
branch: seed-optaplanner-10.1.x
22+
- name: 2.2.x
23+
seed:
24+
branch: seed-optaplanner-2.2.x
2225
seed:
2326
config_file:
2427
git:

build/optaplanner-build-parent/pom.xml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@
4242
<version.org.drools>${project.version}</version.org.drools>
4343

4444
<!-- Normal dependency versions -->
45-
<version.ch.qos.logback>1.5.16</version.ch.qos.logback>
45+
<version.ch.qos.logback>1.5.19</version.ch.qos.logback>
4646
<version.org.apache.logging.log4j>2.22.1</version.org.apache.logging.log4j>
4747
<version.com.thoughtworks.xstream>1.4.21</version.com.thoughtworks.xstream>
4848
<version.io.quarkiverse.operatorsdk>6.6.7</version.io.quarkiverse.operatorsdk>
49-
<version.io.quarkus>3.20.1</version.io.quarkus>
50-
<version.io.netty>4.1.121.Final</version.io.netty>
49+
<version.io.quarkus>3.20.3</version.io.quarkus>
50+
<version.io.netty>4.1.127.Final</version.io.netty>
5151
<version.org.apache.commons.math3>3.6.1</version.org.apache.commons.math3>
5252
<version.org.apache.commons.text>1.11.0</version.org.apache.commons.text>
5353
<version.org.apache.openjpa>4.0.0</version.org.apache.openjpa>
@@ -87,9 +87,7 @@
8787

8888
<!-- Plugin configuration properties -->
8989
<maven.min.version>3.8.1</maven.min.version>
90-
<maven.compiler.release>11</maven.compiler.release>
91-
<!-- A workaround for https://youtrack.jetbrains.com/issue/IDEA-276403. -->
92-
<maven.compiler.target>11</maven.compiler.target>
90+
<maven.compiler.release>17</maven.compiler.release>
9391
<!-- This property needs to be defined in all modules that use the packaging 'jar'.
9492
It is used by different plugins to make sure the module/bundle names are consistent. -->
9593
<java.module.name/>

optaplanner-docs/.gitignore

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

optaplanner-docs/pom.xml

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

optaplanner-docs/src/antora-template.yml

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

optaplanner-docs/src/antora.yml

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

optaplanner-docs/src/main/assembly/generated-docs-zip.xml

Lines changed: 0 additions & 48 deletions
This file was deleted.
Binary file not shown.

0 commit comments

Comments
 (0)