Skip to content

Commit 94ffa78

Browse files
rsynekrsynek
committed
chore: merge model parents and disconnect it from build parent
1 parent b701d2c commit 94ffa78

3 files changed

Lines changed: 72 additions & 142 deletions

File tree

‎model/facade/model-base-parent/pom.xml‎

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

‎model/facade/model-parent/pom.xml‎

Lines changed: 72 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<parent>
4-
<groupId>ai.timefold.solver</groupId>
5-
<artifactId>timefold-solver-model-base-parent</artifactId>
6-
<version>${revision}</version>
7-
<relativePath>../model-base-parent/pom.xml</relativePath>
8-
</parent>
93
<modelVersion>4.0.0</modelVersion>
4+
<groupId>ai.timefold.solver</groupId>
105
<artifactId>timefold-solver-model-parent</artifactId>
6+
<version>${revision}</version>
117
<packaging>pom</packaging>
128
<name>(Preview) Timefold Solver Model Parent</name>
139
<description>
@@ -17,6 +13,9 @@
1713
</description>
1814

1915
<properties>
16+
<revision>999-SNAPSHOT</revision>
17+
<ai.timefold.sdk.enterprise>false</ai.timefold.sdk.enterprise>
18+
2019
<!--suppress UnresolvedMavenProperty -->
2120
<ai.timefold.platform.model.test.api-key>${env.TF_PLATFORM_TEST_API_KEY}</ai.timefold.platform.model.test.api-key>
2221
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -60,6 +59,10 @@
6059
<!-- ************************************************************************ -->
6160
<!-- Dependencies -->
6261
<!-- ************************************************************************ -->
62+
<version.ai.timefold.solver>${revision}</version.ai.timefold.solver>
63+
<version.io.quarkus>3.35.3</version.io.quarkus>
64+
<version.org.assertj>3.27.7</version.org.assertj>
65+
<version.org.awaitility>4.3.0</version.org.awaitility>
6366
<version.org.webjars.bootstrap>5.3.8</version.org.webjars.bootstrap>
6467
<version.org.webjars.jquery>3.7.1</version.org.webjars.jquery>
6568
<version.org.webjars.font-awesome>7.2.0</version.org.webjars.font-awesome>
@@ -69,6 +72,8 @@
6972
<!-- ************************************************************************ -->
7073
<!-- Plugins -->
7174
<!-- ************************************************************************ -->
75+
<version.antrun.plugin>3.2.0</version.antrun.plugin>
76+
<version.exec.plugin>3.6.3</version.exec.plugin>
7277
<version.google-jib>3.5.1</version.google-jib>
7378
<version.jib-layer-filter-extension-maven>0.3.0</version.jib-layer-filter-extension-maven>
7479
<version.openapi-diff.plugin>2.1.7</version.openapi-diff.plugin>
@@ -85,6 +90,26 @@
8590

8691
<dependencyManagement>
8792
<dependencies>
93+
<dependency>
94+
<groupId>io.quarkus.platform</groupId>
95+
<artifactId>quarkus-bom</artifactId>
96+
<version>${version.io.quarkus}</version>
97+
<type>pom</type>
98+
<scope>import</scope>
99+
</dependency>
100+
<dependency>
101+
<groupId>ai.timefold.solver</groupId>
102+
<artifactId>timefold-solver-bom</artifactId>
103+
<version>${version.ai.timefold.solver}</version>
104+
<type>pom</type>
105+
<scope>import</scope>
106+
</dependency>
107+
<dependency>
108+
<groupId>org.assertj</groupId>
109+
<artifactId>assertj-core</artifactId>
110+
<scope>test</scope>
111+
<version>${version.org.assertj}</version>
112+
</dependency>
88113
<!-- UI webjars -->
89114
<dependency>
90115
<groupId>org.webjars</groupId>
@@ -129,6 +154,16 @@
129154
<artifactId>quarkus-container-image-jib</artifactId>
130155
</dependency>
131156
<!-- Testing -->
157+
<dependency>
158+
<groupId>ai.timefold.solver</groupId>
159+
<artifactId>timefold-solver-model-test</artifactId>
160+
<scope>test</scope>
161+
</dependency>
162+
<dependency>
163+
<groupId>org.assertj</groupId>
164+
<artifactId>assertj-core</artifactId>
165+
<scope>test</scope>
166+
</dependency>
132167
<dependency>
133168
<groupId>io.quarkus</groupId>
134169
<artifactId>quarkus-junit</artifactId>
@@ -163,7 +198,7 @@
163198
<artifactItems>
164199
<artifactItem>
165200
<groupId>ai.timefold.solver.enterprise</groupId>
166-
<artifactId>timefold-solver-enterprise-diagnostic-tools</artifactId>
201+
<artifactId>timefold-solver-enterprise-model-diagnostic-tools</artifactId>
167202
<version>${version.ai.timefold.solver}</version>
168203
<type>jar</type>
169204
<overWrite>true</overWrite>
@@ -218,36 +253,49 @@
218253
<profiles>
219254
<profile>
220255
<id>enterprise</id>
221-
<!-- This profile must NOT be activated during the SDK build, otherwise the build fails. -->
256+
<!-- This profile must NOT be activated during the Solver build, otherwise the build fails. -->
222257
<activation>
223258
<property>
224259
<name>enterprise</name>
225260
<value>true</value>
226261
</property>
227262
</activation>
228263
<properties>
264+
<ai.timefold.sdk.enterprise>true</ai.timefold.sdk.enterprise>
265+
<!-- enable copy of Timefold diagnostic tools when building container image - see container profile -->
229266
<ai.timefold.sdk.enterprise.skipTools>false</ai.timefold.sdk.enterprise.skipTools>
230267
</properties>
268+
<dependencyManagement>
269+
<dependencies>
270+
<dependency>
271+
<groupId>ai.timefold.solver.enterprise</groupId>
272+
<artifactId>timefold-solver-enterprise-bom</artifactId>
273+
<version>${version.ai.timefold.solver}</version>
274+
<type>pom</type>
275+
<scope>import</scope>
276+
</dependency>
277+
</dependencies>
278+
</dependencyManagement>
231279
<dependencies>
232280
<dependency>
233281
<groupId>ai.timefold.solver.enterprise</groupId>
234282
<artifactId>timefold-solver-enterprise-model</artifactId>
235283
</dependency>
236284
<dependency>
237285
<groupId>ai.timefold.solver.enterprise</groupId>
238-
<artifactId>timefold-solver-enterprise-storage-fs</artifactId>
286+
<artifactId>timefold-solver-enterprise-model-storage-fs</artifactId>
239287
</dependency>
240288
<dependency>
241289
<groupId>ai.timefold.solver.enterprise</groupId>
242-
<artifactId>timefold-solver-enterprise-storage-azure</artifactId>
290+
<artifactId>timefold-solver-enterprise-model-storage-azure</artifactId>
243291
</dependency>
244292
<dependency>
245293
<groupId>ai.timefold.solver.enterprise</groupId>
246-
<artifactId>timefold-solver-enterprise-storage-gcs</artifactId>
294+
<artifactId>timefold-solver-enterprise-model-storage-gcs</artifactId>
247295
</dependency>
248296
<dependency>
249297
<groupId>ai.timefold.solver.enterprise</groupId>
250-
<artifactId>timefold-solver-enterprise-storage-s3</artifactId>
298+
<artifactId>timefold-solver-enterprise-model-storage-s3</artifactId>
251299
</dependency>
252300
<dependency>
253301
<groupId>ai.timefold.solver</groupId>
@@ -259,18 +307,8 @@
259307
</dependency>
260308
<!-- Testing -->
261309
<dependency>
262-
<groupId>io.quarkus</groupId>
263-
<artifactId>quarkus-junit</artifactId>
264-
<scope>test</scope>
265-
</dependency>
266-
<dependency>
267-
<groupId>io.rest-assured</groupId>
268-
<artifactId>rest-assured</artifactId>
269-
<scope>test</scope>
270-
</dependency>
271-
<dependency>
272-
<groupId>org.awaitility</groupId>
273-
<artifactId>awaitility</artifactId>
310+
<groupId>ai.timefold.solver.enterprise</groupId>
311+
<artifactId>timefold-solver-enterprise-model-test</artifactId>
274312
<scope>test</scope>
275313
</dependency>
276314
</dependencies>
@@ -287,6 +325,16 @@
287325
</plugin>
288326
</plugins>
289327
</build>
328+
<repositories>
329+
<repository>
330+
<id>timefold</id>
331+
<name>Timefold Enterprise Artifacts Repository</name>
332+
<url>https://timefold.jfrog.io/artifactory/releases/</url>
333+
<snapshots>
334+
<enabled>false</enabled>
335+
</snapshots>
336+
</repository>
337+
</repositories>
290338
</profile>
291339

292340
<!-- Profile that adds benchmark dependency and removes any excludes for compiler plugin. -->

‎model/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
<module>test</module>
3535
<module>facade/model</module>
3636
<module>facade/model-with-maps</module>
37-
<module>facade/model-base-parent</module>
3837
<module>facade/model-parent</module>
3938
<module>rest-definition</module>
4039
<module>model-defaults</module>

0 commit comments

Comments
 (0)