Skip to content

Commit 858352d

Browse files
gsmetgsmet
authored
Merge pull request #10051 from ge0ffrey/externalizeOptaPlannerExtension
Externalize OptaPlanner extension
2 parents 7450e80 + 4daeeed commit 858352d

File tree

67 files changed

+27
-2457
lines changed

Some content is hidden

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

67 files changed

+27
-2457
lines changed

‎.github/workflows/ci-actions.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -467,8 +467,6 @@ jobs:
467467
test-extension
468468
logging-gelf
469469
bootstrap-config
470-
optaplanner-jackson
471-
optaplanner-jsonb
472470
# kubernetes-client alone takes 30mn+
473471
- category: Misc3
474472
timeout: 50

‎bom/deployment/pom.xml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -722,21 +722,6 @@
722722
<artifactId>quarkus-liquibase-deployment</artifactId>
723723
<version>${project.version}</version>
724724
</dependency>
725-
<dependency>
726-
<groupId>io.quarkus</groupId>
727-
<artifactId>quarkus-optaplanner-deployment</artifactId>
728-
<version>${project.version}</version>
729-
</dependency>
730-
<dependency>
731-
<groupId>io.quarkus</groupId>
732-
<artifactId>quarkus-optaplanner-jackson-deployment</artifactId>
733-
<version>${project.version}</version>
734-
</dependency>
735-
<dependency>
736-
<groupId>io.quarkus</groupId>
737-
<artifactId>quarkus-optaplanner-jsonb-deployment</artifactId>
738-
<version>${project.version}</version>
739-
</dependency>
740725
<dependency>
741726
<groupId>io.quarkus</groupId>
742727
<artifactId>quarkus-spring-di-deployment</artifactId>

‎bom/runtime/pom.xml‎

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -169,16 +169,12 @@
169169
<subethasmtp.version>3.1.7</subethasmtp.version>
170170
<hibernate-quarkus-local-cache.version>0.1.0</hibernate-quarkus-local-cache.version>
171171
<kubernetes-client.version>4.10.2</kubernetes-client.version>
172-
<optaplanner.version>7.36.1.Final</optaplanner.version>
173-
<!-- Namespaced to avoid clashing with the kogito version in the universe-bom. We're working on getting rid of this potential version mismatch -->
174-
<optaplanner-kogito.version>0.10.1</optaplanner-kogito.version>
175172
<sundr.version>0.19.1</sundr.version> <!-- this is to avoid annoying pop-up in eclipse about failure to init Velocity logging -->
176173
<flapdoodle.mongo.version>2.2.0</flapdoodle.mongo.version>
177174
<quarkus-spring-api.version>5.2.SP3</quarkus-spring-api.version>
178175
<quarkus-spring-data-api.version>2.1.SP1</quarkus-spring-data-api.version>
179176
<quarkus-spring-security-api.version>5.2.Final</quarkus-spring-security-api.version>
180177
<quarkus-spring-boot-api.version>2.1.SP1</quarkus-spring-boot-api.version>
181-
<mvel2.version>2.4.7.Final</mvel2.version>
182178
<htmlunit.version>2.40.0</htmlunit.version>
183179
<mockito.version>3.3.3</mockito.version>
184180
<jna.version>5.3.1</jna.version><!-- should satisfy both testcontainers and mongodb -->
@@ -261,15 +257,6 @@
261257
<type>pom</type>
262258
</dependency>
263259

264-
<!-- Optaplanner dependencies, imported as a BOM -->
265-
<dependency>
266-
<groupId>org.optaplanner</groupId>
267-
<artifactId>optaplanner-bom</artifactId>
268-
<version>${optaplanner.version}</version>
269-
<scope>import</scope>
270-
<type>pom</type>
271-
</dependency>
272-
273260
<!-- gRPC dependencies, imported as a BOM -->
274261
<dependency>
275262
<groupId>io.grpc</groupId>
@@ -945,21 +932,6 @@
945932
<artifactId>quarkus-consul-config</artifactId>
946933
<version>${project.version}</version>
947934
</dependency>
948-
<dependency>
949-
<groupId>io.quarkus</groupId>
950-
<artifactId>quarkus-optaplanner</artifactId>
951-
<version>${project.version}</version>
952-
</dependency>
953-
<dependency>
954-
<groupId>io.quarkus</groupId>
955-
<artifactId>quarkus-optaplanner-jackson</artifactId>
956-
<version>${project.version}</version>
957-
</dependency>
958-
<dependency>
959-
<groupId>io.quarkus</groupId>
960-
<artifactId>quarkus-optaplanner-jsonb</artifactId>
961-
<version>${project.version}</version>
962-
</dependency>
963935
<dependency>
964936
<groupId>io.quarkus</groupId>
965937
<artifactId>quarkus-tika</artifactId>
@@ -3367,28 +3339,6 @@
33673339
<version>${google-http-client.version}</version>
33683340
</dependency>
33693341

3370-
<!-- Kogito -->
3371-
<dependency>
3372-
<groupId>org.kie.kogito</groupId>
3373-
<artifactId>kogito-api</artifactId>
3374-
<version>${optaplanner-kogito.version}</version>
3375-
</dependency>
3376-
<dependency>
3377-
<groupId>org.kie.kogito</groupId>
3378-
<artifactId>kogito-drools</artifactId>
3379-
<version>${optaplanner-kogito.version}</version>
3380-
</dependency>
3381-
<dependency>
3382-
<groupId>org.kie.kogito</groupId>
3383-
<artifactId>drools-core-static</artifactId>
3384-
<version>${optaplanner-kogito.version}</version>
3385-
</dependency>
3386-
<dependency>
3387-
<groupId>org.mvel</groupId>
3388-
<artifactId>mvel2</artifactId>
3389-
<version>${mvel2.version}</version>
3390-
</dependency>
3391-
33923342
<!-- gRPC additional dependencies (the rest is managed by the BOM) -->
33933343
<dependency>
33943344
<groupId>com.salesforce.servicelibs</groupId>

‎core/deployment/src/main/java/io/quarkus/deployment/Feature.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,6 @@ public enum Feature {
6363
REACTIVE_DB2_CLIENT,
6464
NEO4J,
6565
OIDC,
66-
OPTAPLANNER,
67-
OPTAPLANNER_JACKSON,
68-
OPTAPLANNER_JSONB,
6966
PICOCLI,
7067
QUTE,
7168
RESTEASY,

‎devtools/bom-descriptor-json/src/main/resources/extensions-overrides.json‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,24 @@
388388
"artifact-id": "kogito-quarkus",
389389
"version": "0.8.0",
390390
"description": "Kogito extension"
391+
},
392+
{
393+
"group-id": "org.optaplanner",
394+
"artifact-id": "optaplanner-quarkus",
395+
"version": "7.39.0.CR1",
396+
"description": "OptaPlanner extension"
397+
},
398+
{
399+
"group-id": "org.optaplanner",
400+
"artifact-id": "optaplanner-quarkus-jackson",
401+
"version": "7.39.0.CR1",
402+
"description": "OptaPlanner Jackson extension"
403+
},
404+
{
405+
"group-id": "org.optaplanner",
406+
"artifact-id": "optaplanner-quarkus-jsonb",
407+
"version": "7.39.0.CR1",
408+
"description": "OptaPlanner JSON-B extension"
391409
}
392410
]
393-
}
411+
}

‎docs/src/main/asciidoc/optaplanner.adoc‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ with the following extensions, for Maven or Gradle:
6060
6161
* RESTEasy JAX-RS (`quarkus-resteasy`)
6262
* RESTEasy Jackson (`quarkus-resteasy-jackson`)
63-
* OptaPlanner (`quarkus-optaplanner`)
64-
* OptaPlanner Jackson (`quarkus-optaplanner-jackson`)
63+
* OptaPlanner (`optaplanner-quarkus`)
64+
* OptaPlanner Jackson (`optaplanner-quarkus-jackson`)
6565
6666
Alternatively, generate it from the command line with Maven:
6767
@@ -99,12 +99,12 @@ In Maven, your `pom.xml` file contains these dependencies:
9999
<artifactId>quarkus-resteasy-jackson</artifactId>
100100
</dependency>
101101
<dependency>
102-
<groupId>io.quarkus</groupId>
103-
<artifactId>quarkus-optaplanner</artifactId>
102+
<groupId>org.optaplanner</groupId>
103+
<artifactId>optaplanner-quarkus</artifactId>
104104
</dependency>
105105
<dependency>
106-
<groupId>io.quarkus</groupId>
107-
<artifactId>quarkus-optaplanner-jackson</artifactId>
106+
<groupId>org.optaplanner</groupId>
107+
<artifactId>optaplanner-quarkus-jackson</artifactId>
108108
</dependency>
109109
110110
<dependency>
@@ -123,8 +123,8 @@ In Maven, your `pom.xml` file contains these dependencies:
123123
// implementation enforcedPlatform("io.quarkus:quarkus-universe-bom:{quarkus-version}")
124124
// implementation 'io.quarkus:quarkus-resteasy'
125125
// implementation 'io.quarkus:quarkus-resteasy-jackson'
126-
// implementation 'io.quarkus:quarkus-optaplanner'
127-
// implementation 'io.quarkus:quarkus-optaplanner-jackson'
126+
// implementation 'org.optaplanner:optaplanner-quarkus'
127+
// implementation 'org.optaplanner:optaplanner-quarkus-jackson'
128128
//
129129
// testImplementation 'io.quarkus:quarkus-junit5'
130130
//}

‎extensions/optaplanner-jackson/deployment/pom.xml‎

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

‎extensions/optaplanner-jackson/deployment/src/main/java/io/quarkus/optaplanner/jackson/deployment/OptaPlannerJacksonProcessor.java‎

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

‎extensions/optaplanner-jackson/pom.xml‎

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

‎extensions/optaplanner-jackson/runtime/pom.xml‎

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

0 commit comments

Comments
 (0)