Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
greyhairredbear authored Sep 5, 2023
2 parents 441e5e4 + 13bc181 commit 2f92a37
Show file tree
Hide file tree
Showing 50 changed files with 52 additions and 49 deletions.
3 changes: 3 additions & 0 deletions .ci/jenkins/config/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ git:
- name: 8.43.x
seed:
branch: seed-optaplanner-8.43.x
- name: 8.44.x
seed:
branch: seed-optaplanner-8.44.x
main_branch:
default: main
seed:
Expand Down
2 changes: 1 addition & 1 deletion build/optaplanner-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-parent</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion build/optaplanner-build-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-parent</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion build/optaplanner-distribution-internal/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-build-parent</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
<relativePath>../optaplanner-build-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion build/optaplanner-ide-config/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-parent</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>optaplanner-ide-config</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion build/optaplanner-javadoc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-build-parent</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
<relativePath>../optaplanner-build-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion core/optaplanner-constraint-drl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-core-parent</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion core/optaplanner-constraint-streams-bavet/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-core-parent</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion core/optaplanner-constraint-streams-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-core-parent</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion core/optaplanner-constraint-streams-drools/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-core-parent</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion core/optaplanner-core-impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-core-parent</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
</parent>

<artifactId>optaplanner-core-impl</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/optaplanner-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-core-parent</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-build-parent</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
<relativePath>../build/optaplanner-build-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion optaplanner-benchmark/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-build-parent</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
<relativePath>../build/optaplanner-build-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion optaplanner-docs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-build-parent</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
<relativePath>../build/optaplanner-build-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion optaplanner-examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-build-parent</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
<relativePath>../build/optaplanner-build-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion optaplanner-migration/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-build-parent</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
<relativePath>../build/optaplanner-build-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion optaplanner-operator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-build-parent</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
<relativePath>../build/optaplanner-build-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
</parent>

<artifactId>optaplanner-persistence-common</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
</parent>

<artifactId>optaplanner-persistence-jackson</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
</parent>

<artifactId>optaplanner-persistence-jaxb</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
</parent>

<artifactId>optaplanner-persistence-jpa</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
</parent>

<artifactId>optaplanner-persistence-jsonb</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
</parent>

<artifactId>optaplanner-persistence-xstream</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion optaplanner-persistence/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-build-parent</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
<relativePath>../build/optaplanner-build-parent/pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-benchmark-parent</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
</parent>

<artifactId>optaplanner-quarkus-benchmark-deployment</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-benchmark-parent</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
</parent>

<artifactId>optaplanner-quarkus-benchmark-integration-test</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-integration</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-benchmark-parent</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
</parent>

<artifactId>optaplanner-quarkus-benchmark</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-jackson-parent</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
</parent>

<artifactId>optaplanner-quarkus-jackson-deployment</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-jackson-parent</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
</parent>

<artifactId>optaplanner-quarkus-jackson-integration-test</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-integration</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
</parent>

<artifactId>optaplanner-quarkus-jackson-parent</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-jackson-parent</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
</parent>

<artifactId>optaplanner-quarkus-jackson</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-jsonb-parent</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
</parent>

<artifactId>optaplanner-quarkus-jsonb-deployment</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-jsonb-parent</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
</parent>

<artifactId>optaplanner-quarkus-jsonb-integration-test</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-integration</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
</parent>

<artifactId>optaplanner-quarkus-jsonb-parent</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-jsonb-parent</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
</parent>

<artifactId>optaplanner-quarkus-jsonb</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-parent</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
</parent>

<artifactId>optaplanner-quarkus-deployment</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-parent</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
</parent>

<artifactId>optaplanner-quarkus-devui-integration-test</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-parent</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
</parent>

<artifactId>optaplanner-quarkus-drl-integration-test</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-parent</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
</parent>

<artifactId>optaplanner-quarkus-integration-test</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-integration</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
</parent>

<artifactId>optaplanner-quarkus-parent</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-parent</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
</parent>

<artifactId>optaplanner-quarkus-reflection-integration-test</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-parent</artifactId>
<version>8.44.0-SNAPSHOT</version>
<version>8.45.0-SNAPSHOT</version>
</parent>

<artifactId>optaplanner-quarkus</artifactId>
Expand Down
Loading

0 comments on commit 2f92a37

Please sign in to comment.