Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Optaplanner 9 is on main branch, Jakarta namespace as default #3051

Merged
merged 3 commits into from
Dec 18, 2023
Merged

Optaplanner 9 is on main branch, Jakarta namespace as default #3051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a86d18a
Migrate to OptaPlanner 9
lucamolteni Dec 4, 2023
090e532
Upgrade Quarkus to LTS 3.2.9
lucamolteni Dec 4, 2023
ef26c65
Remove Java 11 from GH Actions
lucamolteni Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
java-version: [ 11, 17, 20 ]
java-version: [ 17, 20 ]
maven-version: [ '3.8.7' ]
fail-fast: false
runs-on: ${{ matrix.os }}
Expand Down
2 changes: 1 addition & 1 deletion build/optaplanner-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-parent</artifactId>
<version>8.45.0-SNAPSHOT</version>
<version>9.45.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
16 changes: 8 additions & 8 deletions build/optaplanner-build-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-parent</artifactId>
<version>8.45.0-SNAPSHOT</version>
<version>9.45.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand All @@ -42,11 +42,11 @@
<version.org.drools>8.44.0.Final</version.org.drools>

<!-- Normal dependency versions -->
<version.ch.qos.logback>1.2.9</version.ch.qos.logback>
<version.ch.qos.logback>1.4.6</version.ch.qos.logback>
<version.org.apache.logging.log4j>2.20.0</version.org.apache.logging.log4j>
<version.com.thoughtworks.xstream>1.4.20</version.com.thoughtworks.xstream>
<version.io.quarkiverse.operatorsdk>5.1.4</version.io.quarkiverse.operatorsdk>
<version.io.quarkus>2.16.10.Final</version.io.quarkus>
<version.io.quarkiverse.operatorsdk>6.0.3</version.io.quarkiverse.operatorsdk>
<version.io.quarkus>3.2.9.Final</version.io.quarkus>
<version.org.apache.commons.math3>3.6.1</version.org.apache.commons.math3>
<version.org.apache.commons.text>1.10.0</version.org.apache.commons.text>
<version.org.apache.poi>5.2.3</version.org.apache.poi>
Expand All @@ -55,9 +55,9 @@
<version.org.jdom2>2.0.6.1</version.org.jdom2>
<version.org.jfree.jfreechart>1.5.4</version.org.jfree.jfreechart>
<version.org.openrewrite.recipe>1.19.3</version.org.openrewrite.recipe>
<version.org.slf4j>1.7.36</version.org.slf4j><!-- TODO keep in sync with quarkus-bom -->
<version.org.springframework>5.3.27</version.org.springframework>
<version.org.springframework.boot>2.7.12</version.org.springframework.boot>
<version.org.slf4j>2.0.6</version.org.slf4j><!-- TODO keep in sync with quarkus-bom -->
<version.org.springframework>6.0.8</version.org.springframework>
<version.org.springframework.boot>3.0.7</version.org.springframework.boot>

<!-- ************************************************************************ -->
<!-- Plugins -->
Expand All @@ -76,7 +76,7 @@
Do not upgrade unless prepared to deal with JPMS issues.
If upgrading, ensure build still passes with the full profile (-Dfull).
-->
<version.jaxb2.plugin>2.5.0</version.jaxb2.plugin>
<version.jaxb2.plugin>3.1.0</version.jaxb2.plugin>
<version.pitest.plugin>1.14.4</version.pitest.plugin>
<version.revapi.plugin>0.15.0</version.revapi.plugin>
<version.sniffer.plugin>1.23</version.sniffer.plugin>
Expand Down
2 changes: 1 addition & 1 deletion build/optaplanner-distribution-internal/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-build-parent</artifactId>
<version>8.45.0-SNAPSHOT</version>
<version>9.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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-parent</artifactId>
<version>8.45.0-SNAPSHOT</version>
<version>9.45.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>optaplanner-ide-config</artifactId>
Expand Down
6 changes: 1 addition & 5 deletions build/optaplanner-javadoc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-build-parent</artifactId>
<version>8.45.0-SNAPSHOT</version>
<version>9.45.0-SNAPSHOT</version>
<relativePath>../optaplanner-build-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down Expand Up @@ -83,10 +83,6 @@
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
</dependency>
<dependency>
<groupId>org.graalvm.sdk</groupId>
<artifactId>graal-sdk</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/optaplanner-constraint-drl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-core-parent</artifactId>
<version>8.45.0-SNAPSHOT</version>
<version>9.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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-core-parent</artifactId>
<version>8.45.0-SNAPSHOT</version>
<version>9.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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-core-parent</artifactId>
<version>8.45.0-SNAPSHOT</version>
<version>9.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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-core-parent</artifactId>
<version>8.45.0-SNAPSHOT</version>
<version>9.45.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
5 changes: 4 additions & 1 deletion core/optaplanner-core-impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-core-parent</artifactId>
<version>8.45.0-SNAPSHOT</version>
<version>9.45.0-SNAPSHOT</version>
</parent>

<artifactId>optaplanner-core-impl</artifactId>
Expand Down Expand Up @@ -140,6 +140,9 @@
<plugin>
<groupId>org.revapi</groupId>
<artifactId>revapi-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down
4 changes: 2 additions & 2 deletions ...aplanner-core-impl/src/main/java/org/optaplanner/core/api/domain/common/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.api.domain.common;

import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlSchema;
import jakarta.xml.bind.annotation.XmlNsForm;
import jakarta.xml.bind.annotation.XmlSchema;

import org.optaplanner.core.config.solver.SolverConfig;
2 changes: 1 addition & 1 deletion ...taplanner-core-impl/src/main/java/org/optaplanner/core/api/score/stream/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
@XmlSchema(namespace = SolverConfig.XML_NAMESPACE)
package org.optaplanner.core.api.score.stream;

import javax.xml.bind.annotation.XmlSchema;
import jakarta.xml.bind.annotation.XmlSchema;

import org.optaplanner.core.config.solver.SolverConfig;
4 changes: 2 additions & 2 deletions core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/AbstractConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

import java.util.function.Consumer;

import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;

/**
* A config class is a user-friendly, validating configuration class that maps XML input.
Expand Down
6 changes: 3 additions & 3 deletions ...a/org/optaplanner/core/config/constructionheuristic/ConstructionHeuristicPhaseConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
import java.util.List;
import java.util.function.Consumer;

import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElements;
import javax.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlElements;
import jakarta.xml.bind.annotation.XmlType;

import org.optaplanner.core.config.constructionheuristic.decider.forager.ConstructionHeuristicForagerConfig;
import org.optaplanner.core.config.constructionheuristic.placer.EntityPlacerConfig;
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/org/optaplanner/core/config/constructionheuristic/ConstructionHeuristicType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package org.optaplanner.core.config.constructionheuristic;

import javax.xml.bind.annotation.XmlEnum;
import jakarta.xml.bind.annotation.XmlEnum;

import org.optaplanner.core.config.heuristic.selector.entity.EntitySorterManner;
import org.optaplanner.core.config.heuristic.selector.value.ValueSorterManner;
Expand Down
2 changes: 1 addition & 1 deletion ...core/config/constructionheuristic/decider/forager/ConstructionHeuristicForagerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import java.util.function.Consumer;

import javax.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.XmlType;

import org.optaplanner.core.config.AbstractConfig;
import org.optaplanner.core.config.util.ConfigUtils;
Expand Down
2 changes: 1 addition & 1 deletion ...core/config/constructionheuristic/decider/forager/ConstructionHeuristicPickEarlyType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package org.optaplanner.core.config.constructionheuristic.decider.forager;

import javax.xml.bind.annotation.XmlEnum;
import jakarta.xml.bind.annotation.XmlEnum;

@XmlEnum
public enum ConstructionHeuristicPickEarlyType {
Expand Down
4 changes: 2 additions & 2 deletions .../java/org/optaplanner/core/config/constructionheuristic/decider/forager/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.constructionheuristic.decider.forager;

import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlSchema;
import jakarta.xml.bind.annotation.XmlNsForm;
import jakarta.xml.bind.annotation.XmlSchema;

import org.optaplanner.core.config.solver.SolverConfig;
4 changes: 2 additions & 2 deletions ...re-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.constructionheuristic;

import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlSchema;
import jakarta.xml.bind.annotation.XmlNsForm;
import jakarta.xml.bind.annotation.XmlSchema;

import org.optaplanner.core.config.solver.SolverConfig;
2 changes: 1 addition & 1 deletion ...ain/java/org/optaplanner/core/config/constructionheuristic/placer/EntityPlacerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package org.optaplanner.core.config.constructionheuristic.placer;

import javax.xml.bind.annotation.XmlSeeAlso;
import jakarta.xml.bind.annotation.XmlSeeAlso;

import org.optaplanner.core.config.AbstractConfig;

Expand Down
6 changes: 3 additions & 3 deletions ...va/org/optaplanner/core/config/constructionheuristic/placer/PooledEntityPlacerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@

import java.util.function.Consumer;

import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElements;
import javax.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlElements;
import jakarta.xml.bind.annotation.XmlType;

import org.optaplanner.core.config.heuristic.selector.move.MoveSelectorConfig;
import org.optaplanner.core.config.heuristic.selector.move.composite.CartesianProductMoveSelectorConfig;
Expand Down
6 changes: 3 additions & 3 deletions ...va/org/optaplanner/core/config/constructionheuristic/placer/QueuedEntityPlacerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
import java.util.List;
import java.util.function.Consumer;

import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElements;
import javax.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlElements;
import jakarta.xml.bind.annotation.XmlType;

import org.optaplanner.core.config.heuristic.selector.entity.EntitySelectorConfig;
import org.optaplanner.core.config.heuristic.selector.move.MoveSelectorConfig;
Expand Down
6 changes: 3 additions & 3 deletions ...ava/org/optaplanner/core/config/constructionheuristic/placer/QueuedValuePlacerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@

import java.util.function.Consumer;

import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElements;
import javax.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlElements;
import jakarta.xml.bind.annotation.XmlType;

import org.optaplanner.core.config.heuristic.selector.move.MoveSelectorConfig;
import org.optaplanner.core.config.heuristic.selector.move.composite.CartesianProductMoveSelectorConfig;
Expand Down
4 changes: 2 additions & 2 deletions .../src/main/java/org/optaplanner/core/config/constructionheuristic/placer/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.constructionheuristic.placer;

import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlSchema;
import jakarta.xml.bind.annotation.XmlNsForm;
import jakarta.xml.bind.annotation.XmlSchema;

import org.optaplanner.core.config.solver.SolverConfig;
6 changes: 3 additions & 3 deletions ...c/main/java/org/optaplanner/core/config/exhaustivesearch/ExhaustiveSearchPhaseConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@

import java.util.function.Consumer;

import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElements;
import javax.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlElements;
import jakarta.xml.bind.annotation.XmlType;

import org.optaplanner.core.config.heuristic.selector.entity.EntitySelectorConfig;
import org.optaplanner.core.config.heuristic.selector.entity.EntitySorterManner;
Expand Down
2 changes: 1 addition & 1 deletion ...impl/src/main/java/org/optaplanner/core/config/exhaustivesearch/ExhaustiveSearchType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package org.optaplanner.core.config.exhaustivesearch;

import javax.xml.bind.annotation.XmlEnum;
import jakarta.xml.bind.annotation.XmlEnum;

import org.optaplanner.core.config.heuristic.selector.entity.EntitySorterManner;
import org.optaplanner.core.config.heuristic.selector.value.ValueSorterManner;
Expand Down
2 changes: 1 addition & 1 deletion ...-impl/src/main/java/org/optaplanner/core/config/exhaustivesearch/NodeExplorationType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import java.util.Comparator;

import javax.xml.bind.annotation.XmlEnum;
import jakarta.xml.bind.annotation.XmlEnum;

import org.optaplanner.core.impl.exhaustivesearch.node.ExhaustiveSearchNode;
import org.optaplanner.core.impl.exhaustivesearch.node.comparator.BreadthFirstNodeComparator;
Expand Down
4 changes: 2 additions & 2 deletions ...er-core-impl/src/main/java/org/optaplanner/core/config/exhaustivesearch/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.exhaustivesearch;

import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlSchema;
import jakarta.xml.bind.annotation.XmlNsForm;
import jakarta.xml.bind.annotation.XmlSchema;

import org.optaplanner.core.config.solver.SolverConfig;
2 changes: 1 addition & 1 deletion ...c/main/java/org/optaplanner/core/config/heuristic/selector/common/SelectionCacheType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package org.optaplanner.core.config.heuristic.selector.common;

import javax.xml.bind.annotation.XmlEnum;
import jakarta.xml.bind.annotation.XmlEnum;

/**
* There is no INHERIT by design because 2 sequential caches provides no benefit, only memory overhead.
Expand Down
2 changes: 1 addition & 1 deletion ...l/src/main/java/org/optaplanner/core/config/heuristic/selector/common/SelectionOrder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package org.optaplanner.core.config.heuristic.selector.common;

import javax.xml.bind.annotation.XmlEnum;
import jakarta.xml.bind.annotation.XmlEnum;

import org.optaplanner.core.config.heuristic.selector.SelectorConfig;

Expand Down
2 changes: 1 addition & 1 deletion ...org/optaplanner/core/config/heuristic/selector/common/decorator/SelectionSorterOrder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package org.optaplanner.core.config.heuristic.selector.common.decorator;

import javax.xml.bind.annotation.XmlEnum;
import jakarta.xml.bind.annotation.XmlEnum;

import org.optaplanner.core.impl.heuristic.selector.common.decorator.SelectionSorter;

Expand Down
4 changes: 2 additions & 2 deletions ...in/java/org/optaplanner/core/config/heuristic/selector/common/decorator/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.heuristic.selector.common.decorator;

import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlSchema;
import jakarta.xml.bind.annotation.XmlNsForm;
import jakarta.xml.bind.annotation.XmlSchema;

import org.optaplanner.core.config.solver.SolverConfig;
4 changes: 2 additions & 2 deletions ...a/org/optaplanner/core/config/heuristic/selector/common/nearby/NearbySelectionConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
import java.util.function.Consumer;
import java.util.stream.Stream;

import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlType;

import org.optaplanner.core.config.heuristic.selector.SelectorConfig;
import org.optaplanner.core.config.heuristic.selector.common.SelectionCacheType;
Expand Down
Loading