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.

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

Update to OptaPlanner 999-SNAPSHOT #625

Merged
merged 3 commits into from
Feb 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/full-downstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
id: build-chain
uses: apache/incubator-kie-kogito-pipelines/.ci/actions/build-chain@main
with:
definition-file: https://raw.githubusercontent.com/${GROUP}/optaplanner/main/.ci/buildchain-config.yaml
definition-file: https://raw.githubusercontent.com/${GROUP:apache}/incubator-kie-optaplanner/${BRANCH:main}/.ci/buildchain-config.yaml
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
OPTAPLANNER_BUILD_MVN_OPTS_UPSTREAM: "-Dfull"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/jenkins-tests-PR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
name: Jenkins Tests
on:
pull_request:
paths:
paths:
- '.ci/jenkins/**'
- '.github/workflows/jenkins-tests-PR.yml'

Expand All @@ -25,7 +25,7 @@ jobs:
uses: apache/incubator-kie-kogito-pipelines/.ci/actions/dsl-tests@main
with:
project: optaplanner
main-config-file-repo: kiegroup/optaplanner
main-config-file-repo: apache/incubator-kie-optaplanner
main-config-file-path: .ci/jenkins/config/main.yaml
branch-config-file-repo: kiegroup/optaplanner
base-branch: ${{ env.BASE_BRANCH }}
branch-config-file-repo: apache/incubator-kie-optaplanner
base-branch: ${{ env.BASE_BRANCH }}
10 changes: 5 additions & 5 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
nightly:
if: github.repository == 'kiegroup/optaplanner-quickstarts'
if: github.repository == 'apache/incubator-kie-optaplanner-quickstarts'
concurrency:
group: nightly
cancel-in-progress: true
Expand All @@ -22,14 +22,14 @@ jobs:
steps:
- name: Support long paths
if: ${{ matrix.os == 'windows-latest' }}
uses: kiegroup/kie-ci/.ci/actions/long-paths@main
uses: apache/incubator-kie-kogito-pipelines/.ci/actions/long-paths@main
- name: Java and Maven Setup
uses: apache/incubator-kie-kogito-pipelines/.ci/actions/maven@main
with:
java-version: ${{ matrix.java-version }}
maven-version: ${{ matrix.maven-version }}
cache-key-prefix: ${{ runner.os }}-${{ matrix.java-version }}-maven${{ matrix.maven-version }}
- uses: actions/checkout@v3
- uses: actions/checkout@v3
- name: Build with Maven
run: mvn -B clean install --file pom.xml dependency:tree -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3
- name: Set build information
Expand All @@ -40,10 +40,10 @@ jobs:
echo "action_url=${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" >> $GITHUB_ENV
- name: Set failure message
if: ${{ failure() }}
run: echo "zulip_message=:cross_mark:Build ERROR. See ${{env.action_url}}" >> $GITHUB_ENV
run: echo "zulip_message=:cross_mark:Build ERROR. See ${{env.action_url}}" >> $GITHUB_ENV
- name: Set success message
if: ${{ success() }}
run: echo "zulip_message=:check:Build OK. See ${{env.action_url}}" >> $GITHUB_ENV
run: echo "zulip_message=:check:Build OK. See ${{env.action_url}}" >> $GITHUB_ENV
- name: Send a stream message
if: ${{ always() }}
uses: zulip/github-actions-zulip/send-message@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
- name: Build Chain
uses: apache/incubator-kie-kogito-pipelines/.ci/actions/build-chain@main
with:
definition-file: https://raw.githubusercontent.com/${GROUP:kiegroup}/optaplanner/${BRANCH:main}/.ci/buildchain-config.yaml
definition-file: https://raw.githubusercontent.com/${GROUP:apache}/incubator-kie-optaplanner/${BRANCH:main}/.ci/buildchain-config.yaml
annotations-prefix: ${{ runner.os }}-${{ matrix.java-version }}/${{ matrix.maven-version }}
github-token: "${{ secrets.GITHUB_TOKEN }}"
- name: Surefire Report
Expand Down
2 changes: 1 addition & 1 deletion build/optaplanner-distribution/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-quickstarts-parent</artifactId>
<version>9.45.0-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion build/quickstarts-showcase/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-quickstarts-parent</artifactId>
<version>9.45.0-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions hello-world/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id "application"
}

def optaplannerVersion = "9.45.0-SNAPSHOT"
def optaplannerVersion = "999-SNAPSHOT"
def logbackVersion = "1.2.11"
def junitJupiterVersion = "5.9.0"
def assertjVersion = "3.24.2"
Expand All @@ -15,7 +15,7 @@ repositories {
mavenCentral()
mavenLocal()
maven {
url "https://repository.jboss.org/nexus/content/groups/public/"
url "https://repository.apache.org/content/groups/public/"
mavenContent {
snapshotsOnly()
}
Expand Down
6 changes: 3 additions & 3 deletions hello-world/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jar.with.dependencies.name>hello-world-run</jar.with.dependencies.name>

<version.org.optaplanner>9.45.0-SNAPSHOT</version.org.optaplanner>
<version.org.optaplanner>999-SNAPSHOT</version.org.optaplanner>
<version.org.assertj>3.24.2</version.org.assertj>
<version.org.junit.jupiter>5.9.0</version.org.junit.jupiter>
<version.org.logback>1.2.11</version.org.logback>
Expand Down Expand Up @@ -135,8 +135,8 @@

<repositories>
<repository>
<id>jboss-public-repository-group</id>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
<id>apache-public-repository-group</id>
<url>https://repository.apache.org/content/groups/public/</url>
<releases>
<!-- Get releases only from Maven Central which is faster. -->
<enabled>false</enabled>
Expand Down
6 changes: 3 additions & 3 deletions 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>9.45.0-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
<relativePath/>
</parent>
<!-- IMPORTANT: the individual quickstarts have no parent pom. -->
Expand Down Expand Up @@ -60,8 +60,8 @@
<repositories>
<!-- To get snapshots during development. Remove this in the "stable" branch (which doesn't use snapshots). -->
<repository>
<id>jboss-public-repository-group</id>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
<id>apache-public-repository-group</id>
<url>https://repository.apache.org/content/groups/public/</url>
<releases>
<!-- Get releases only from Maven Central which is faster. -->
<enabled>false</enabled>
Expand Down
26 changes: 14 additions & 12 deletions technology/java-activemq-quarkus/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,16 @@
<packaging>pom</packaging>

<properties>
<version.org.apache.activemq>2.28.0</version.org.apache.activemq>
<maven.compiler.release>11</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<version.io.quarkus>3.0.0.Final</version.io.quarkus>
<version.org.optaplanner>9.45.0-SNAPSHOT</version.org.optaplanner>
<version.org.apache.activemq>2.28.0</version.org.apache.activemq>
<version.org.optaplanner>999-SNAPSHOT</version.org.optaplanner>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<compiler-plugin.version>3.8.1</compiler-plugin.version>
<maven.compiler.release>11</maven.compiler.release>
<surefire-plugin.version>3.0.0-M8</surefire-plugin.version>
<version.compiler.plugin>3.8.1</version.compiler.plugin>
<version.jandex.plugin>1.0.8</version.jandex.plugin>
<version.surefire.plugin>3.0.0-M8</version.surefire.plugin>
</properties>

<modules>
Expand Down Expand Up @@ -102,7 +104,7 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${compiler-plugin.version}</version>
<version>${version.compiler.plugin}</version>
</plugin>
<plugin>
<groupId>io.quarkus</groupId>
Expand All @@ -119,11 +121,11 @@
<plugin>
<groupId>org.jboss.jandex</groupId>
<artifactId>jandex-maven-plugin</artifactId>
<version>1.0.8</version>
<version>${version.jandex.plugin}</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire-plugin.version}</version>
<version>${version.surefire.plugin}</version>
<configuration>
<systemPropertyVariables>
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
Expand All @@ -146,7 +148,7 @@
<plugins>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${surefire-plugin.version}</version>
<version>${version.surefire.plugin}</version>
<executions>
<execution>
<goals>
Expand Down Expand Up @@ -174,8 +176,8 @@

<repositories>
<repository>
<id>jboss-public-repository-group</id>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
<id>apache-public-repository-group</id>
<url>https://repository.apache.org/content/groups/public/</url>
<releases>
<!-- Get releases only from Maven Central which is faster. -->
<enabled>false</enabled>
Expand Down
4 changes: 2 additions & 2 deletions technology/java-spring-boot/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
id "java"
}

def optaplannerVersion = "9.45.0-SNAPSHOT"
def optaplannerVersion = "999-SNAPSHOT"
def assertjVersion = "3.24.2"

group = "org.acme"
Expand All @@ -16,7 +16,7 @@ repositories {
mavenCentral()
mavenLocal()
maven {
url "https://repository.jboss.org/nexus/content/groups/public/"
url "https://repository.apache.org/content/groups/public/"
mavenContent {
snapshotsOnly()
}
Expand Down
6 changes: 3 additions & 3 deletions technology/java-spring-boot/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<maven.compiler.release>17</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<version.org.optaplanner>9.45.0-SNAPSHOT</version.org.optaplanner>
<version.org.optaplanner>999-SNAPSHOT</version.org.optaplanner>
<version.org.springframework.boot>3.0.7</version.org.springframework.boot>

<version.compiler.plugin>3.8.1</version.compiler.plugin>
Expand Down Expand Up @@ -148,8 +148,8 @@

<repositories>
<repository>
<id>jboss-public-repository-group</id>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
<id>apache-public-repository-group</id>
<url>https://repository.apache.org/content/groups/public/</url>
<releases>
<!-- Get releases only from Maven Central which is faster. -->
<enabled>false</enabled>
Expand Down
6 changes: 3 additions & 3 deletions technology/kotlin-quarkus/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<version.io.quarkus>3.0.0.Final</version.io.quarkus>
<version.kotlin>1.8.20</version.kotlin>
<version.org.optaplanner>9.45.0-SNAPSHOT</version.org.optaplanner>
<version.org.optaplanner>999-SNAPSHOT</version.org.optaplanner>

<version.compiler.plugin>3.8.1</version.compiler.plugin>
<version.surefire.plugin>3.0.0-M8</version.surefire.plugin>
Expand Down Expand Up @@ -278,8 +278,8 @@

<repositories>
<repository>
<id>jboss-public-repository-group</id>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
<id>apache-public-repository-group</id>
<url>https://repository.apache.org/content/groups/public/</url>
<releases>
<!-- Get releases only from Maven Central which is faster. -->
<enabled>false</enabled>
Expand Down
9 changes: 5 additions & 4 deletions technology/kubernetes/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@
<maven.compiler.release>11</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<version.org.apache.activemq>2.28.0</version.org.apache.activemq>
<version.io.quarkus>3.0.0.Final</version.io.quarkus>
<version.org.optaplanner>9.45.0-SNAPSHOT</version.org.optaplanner>
<version.org.apache.activemq>2.28.0</version.org.apache.activemq>
<version.org.optaplanner>999-SNAPSHOT</version.org.optaplanner>

<version.compiler.plugin>3.8.1</version.compiler.plugin>
<version.jandex.plugin>1.0.8</version.jandex.plugin>
<version.surefire.plugin>3.0.0-M8</version.surefire.plugin>
Expand Down Expand Up @@ -162,8 +163,8 @@

<repositories>
<repository>
<id>jboss-public-repository-group</id>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
<id>apache-public-repository-group</id>
<url>https://repository.apache.org/content/groups/public/</url>
<releases>
<!-- Get releases only from Maven Central which is faster. -->
<enabled>false</enabled>
Expand Down
6 changes: 3 additions & 3 deletions use-cases/call-center/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<version.io.quarkus>3.0.0.Final</version.io.quarkus>
<version.org.optaplanner>9.45.0-SNAPSHOT</version.org.optaplanner>
<version.org.optaplanner>999-SNAPSHOT</version.org.optaplanner>

<version.compiler.plugin>3.8.1</version.compiler.plugin>
<version.surefire.plugin>3.0.0-M8</version.surefire.plugin>
Expand Down Expand Up @@ -198,8 +198,8 @@

<repositories>
<repository>
<id>jboss-public-repository-group</id>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
<id>apache-public-repository-group</id>
<url>https://repository.apache.org/content/groups/public/</url>
<releases>
<!-- Get releases only from Maven Central which is faster. -->
<enabled>false</enabled>
Expand Down
6 changes: 3 additions & 3 deletions use-cases/employee-scheduling/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<version.io.quarkus>3.0.0.Final</version.io.quarkus>
<version.org.optaplanner>9.45.0-SNAPSHOT</version.org.optaplanner>
<version.org.optaplanner>999-SNAPSHOT</version.org.optaplanner>

<version.compiler.plugin>3.8.1</version.compiler.plugin>
<version.surefire.plugin>3.0.0-M8</version.surefire.plugin>
Expand Down Expand Up @@ -215,8 +215,8 @@

<repositories>
<repository>
<id>jboss-public-repository-group</id>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
<id>apache-public-repository-group</id>
<url>https://repository.apache.org/content/groups/public/</url>
<releases>
<!-- Get releases only from Maven Central which is faster. -->
<enabled>false</enabled>
Expand Down
6 changes: 3 additions & 3 deletions use-cases/facility-location/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<version.io.quarkus>3.0.0.Final</version.io.quarkus>
<version.org.optaplanner>9.45.0-SNAPSHOT</version.org.optaplanner>
<version.org.optaplanner>999-SNAPSHOT</version.org.optaplanner>

<version.compiler.plugin>3.8.1</version.compiler.plugin>
<version.surefire.plugin>3.0.0-M8</version.surefire.plugin>
Expand Down Expand Up @@ -188,8 +188,8 @@

<repositories>
<repository>
<id>jboss-public-repository-group</id>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
<id>apache-public-repository-group</id>
<url>https://repository.apache.org/content/groups/public/</url>
<releases>
<!-- Get releases only from Maven Central which is faster. -->
<enabled>false</enabled>
Expand Down
6 changes: 3 additions & 3 deletions use-cases/maintenance-scheduling/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<version.io.quarkus>3.0.0.Final</version.io.quarkus>
<version.org.optaplanner>9.45.0-SNAPSHOT</version.org.optaplanner>
<version.org.optaplanner>999-SNAPSHOT</version.org.optaplanner>

<version.compiler.plugin>3.8.1</version.compiler.plugin>
<version.surefire.plugin>3.0.0-M8</version.surefire.plugin>
Expand Down Expand Up @@ -215,8 +215,8 @@

<repositories>
<repository>
<id>jboss-public-repository-group</id>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
<id>apache-public-repository-group</id>
<url>https://repository.apache.org/content/groups/public/</url>
<releases>
<!-- Get releases only from Maven Central which is faster. -->
<enabled>false</enabled>
Expand Down
Loading
Loading