diff --git a/Jenkinsfile b/Jenkinsfile index 4db6b7d54ac..6f79d761744 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -249,6 +249,7 @@ void checkoutOptaplannerRepo() { MavenCommand getMavenCommand(String directory, boolean addQuarkusVersion=true, boolean canNative = false) { mvnCmd = new MavenCommand(this, ['-fae']) .withSettingsXmlId('kogito_release_settings') + .withSnapshotsDisabledInSettings() // add timestamp to Maven logs .withOptions(['-Dorg.slf4j.simpleLogger.showDateTime=true', '-Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss,SSS']) .inDirectory(directory) diff --git a/addons/cloudevents/cloudevents-spring-boot-addon-it/pom.xml b/addons/cloudevents/cloudevents-spring-boot-addon-it/pom.xml index b1d66e4dd0a..b5996d49aa6 100644 --- a/addons/cloudevents/cloudevents-spring-boot-addon-it/pom.xml +++ b/addons/cloudevents/cloudevents-spring-boot-addon-it/pom.xml @@ -25,6 +25,23 @@ kogito-maven-plugin ${project.version} + + org.kie.kogito + kogito-bom + ${project.version} + pom + test + + + org.kie.kogito + kogito-springboot-starter + test + + + org.kie.kogito + kogito-cloudevents-spring-boot-addon + test + @@ -33,9 +50,6 @@ maven-invoker-plugin true - ${project.build.directory}/it - ${project.build.directory}/local-repo - true verify diff --git a/addons/explainability-addon/explainability-quarkus-addon/pom.xml b/addons/explainability-addon/explainability-quarkus-addon/pom.xml index a88a32a474f..53751854385 100644 --- a/addons/explainability-addon/explainability-quarkus-addon/pom.xml +++ b/addons/explainability-addon/explainability-quarkus-addon/pom.xml @@ -82,9 +82,9 @@ **/Native*IT.java - + org.jboss.logmanager.LogManager - + diff --git a/addons/persistence/infinispan-quarkus-health-addon/pom.xml b/addons/persistence/infinispan-quarkus-health-addon/pom.xml index 8478e6c0f28..258eaff8658 100644 --- a/addons/persistence/infinispan-quarkus-health-addon/pom.xml +++ b/addons/persistence/infinispan-quarkus-health-addon/pom.xml @@ -96,7 +96,7 @@ verify - + ${container.image.infinispan} diff --git a/addons/task-management/task-management-quarkus-addon/pom.xml b/addons/task-management/task-management-quarkus-addon/pom.xml index cd938fcc44c..d4de2f85dae 100644 --- a/addons/task-management/task-management-quarkus-addon/pom.xml +++ b/addons/task-management/task-management-quarkus-addon/pom.xml @@ -95,7 +95,7 @@ org/kie/kogito/task/management/test/* - + org.jboss.logmanager.LogManager ${container.image.infinispan} diff --git a/archetypes/kogito-quarkus-archetype/pom.xml b/archetypes/kogito-quarkus-archetype/pom.xml index fd8470e385f..e873500b435 100644 --- a/archetypes/kogito-quarkus-archetype/pom.xml +++ b/archetypes/kogito-quarkus-archetype/pom.xml @@ -30,6 +30,18 @@ + + org.kie.kogito + kogito-quarkus-bom + ${project.version} + pom + test + + + org.kie.kogito + kogito-quarkus + test + diff --git a/archetypes/kogito-quarkus-dm-archetype/pom.xml b/archetypes/kogito-quarkus-dm-archetype/pom.xml index 9c94ce841dd..37b0587bead 100644 --- a/archetypes/kogito-quarkus-dm-archetype/pom.xml +++ b/archetypes/kogito-quarkus-dm-archetype/pom.xml @@ -30,6 +30,28 @@ + + org.kie.kogito + kogito-quarkus-bom + ${project.version} + pom + test + + + org.kie.kogito + kogito-quarkus-rules + test + + + org.kie.kogito + kogito-quarkus-decisions + test + + + org.kie.kogito + kogito-quarkus-predictions + test + diff --git a/archetypes/kogito-springboot-archetype/pom.xml b/archetypes/kogito-springboot-archetype/pom.xml index e5a8986b85b..8d6dad20a99 100644 --- a/archetypes/kogito-springboot-archetype/pom.xml +++ b/archetypes/kogito-springboot-archetype/pom.xml @@ -20,6 +20,12 @@ ${project.version} provided + + + org.kie.kogito + kogito-springboot-starter + test + diff --git a/archetypes/kogito-springboot-dm-archetype/pom.xml b/archetypes/kogito-springboot-dm-archetype/pom.xml index 2ad73a965f6..6fa957765b2 100644 --- a/archetypes/kogito-springboot-dm-archetype/pom.xml +++ b/archetypes/kogito-springboot-dm-archetype/pom.xml @@ -20,6 +20,12 @@ ${project.version} provided + + + org.kie.kogito + kogito-springboot-starter + test + diff --git a/archetypes/pom.xml b/archetypes/pom.xml index d6ca343d705..31998b4321c 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -15,11 +15,26 @@ 11 + + + + + maven-archetype-plugin + + ${session.request.localRepositoryPath.path} + + + + + + default - true + + !productized + kogito-springboot-archetype @@ -38,6 +53,29 @@ kogito-quarkus-dm-archetype + + + set-settings-when-provided + + ${session.request.userSettingsFile.path} + + + + + + maven-archetype-plugin + + ${session.request.userSettingsFile.path} + + + + + + diff --git a/integration-tests/integration-tests-kogito-plugin/pom.xml b/integration-tests/integration-tests-kogito-plugin/pom.xml index de14df169d3..c799250b40f 100644 --- a/integration-tests/integration-tests-kogito-plugin/pom.xml +++ b/integration-tests/integration-tests-kogito-plugin/pom.xml @@ -20,6 +20,26 @@ ${project.version} test + + org.kie.kogito + kogito-bom + ${project.version} + pom + test + + + org.kie.kogito + kogito-quarkus-bom + ${project.version} + pom + test + + + org.kie.kogito + process-management-addon + ${project.version} + test + @@ -28,9 +48,6 @@ maven-invoker-plugin true - ${project.build.directory}/it - ${project.build.directory}/local-repo - true verify ${version.io.quarkus} diff --git a/integration-tests/integration-tests-kogito-plugin/src/it/integration-tests-kogito-plugin-it/pom.xml b/integration-tests/integration-tests-kogito-plugin/src/it/integration-tests-kogito-plugin-it/pom.xml index 00589e0e076..4581ab36789 100644 --- a/integration-tests/integration-tests-kogito-plugin/src/it/integration-tests-kogito-plugin-it/pom.xml +++ b/integration-tests/integration-tests-kogito-plugin/src/it/integration-tests-kogito-plugin-it/pom.xml @@ -98,13 +98,13 @@ maven-surefire-plugin @version.surefire.plugin@ - + org.jboss.logmanager.LogManager ${maven.home} ${session.request.localRepositoryPath.path} ${session.request.userSettingsFile.path} - + diff --git a/integration-tests/integration-tests-quarkus-decisions/pom.xml b/integration-tests/integration-tests-quarkus-decisions/pom.xml index 57be1cd0fcd..e997acd53dd 100644 --- a/integration-tests/integration-tests-quarkus-decisions/pom.xml +++ b/integration-tests/integration-tests-quarkus-decisions/pom.xml @@ -166,10 +166,10 @@ verify - + org.jboss.logmanager.LogManager ${project.build.directory}/${project.build.finalName}-runner - + diff --git a/integration-tests/integration-tests-quarkus-predictions/pom.xml b/integration-tests/integration-tests-quarkus-predictions/pom.xml index ff89aed8a54..7dddbf47fff 100644 --- a/integration-tests/integration-tests-quarkus-predictions/pom.xml +++ b/integration-tests/integration-tests-quarkus-predictions/pom.xml @@ -128,7 +128,7 @@ org.apache.maven.plugins maven-surefire-plugin - + org.jboss.logmanager.LogManager ${container.image.infinispan} @@ -160,9 +160,9 @@ verify - + ${project.build.directory}/${project.build.finalName}-runner - + diff --git a/integration-tests/integration-tests-quarkus-processes/pom.xml b/integration-tests/integration-tests-quarkus-processes/pom.xml index 8d08b174f68..5db2f26f667 100644 --- a/integration-tests/integration-tests-quarkus-processes/pom.xml +++ b/integration-tests/integration-tests-quarkus-processes/pom.xml @@ -168,7 +168,7 @@ org/kie/kogito/integrationtests/quarkus/* - + org.jboss.logmanager.LogManager ${container.image.infinispan} ${container.image.kafka} @@ -206,7 +206,7 @@ org/kie/kogito/integrationtests/quarkus/* org/kie/kogito/integrationtests/quarkus/infinispan/* - + true @@ -242,9 +242,9 @@ verify - + ${project.build.directory}/${project.build.finalName}-runner - + diff --git a/integration-tests/integration-tests-quarkus-rules/pom.xml b/integration-tests/integration-tests-quarkus-rules/pom.xml index 193e40a83e7..aeee1ce64bd 100644 --- a/integration-tests/integration-tests-quarkus-rules/pom.xml +++ b/integration-tests/integration-tests-quarkus-rules/pom.xml @@ -132,7 +132,7 @@ org.apache.maven.plugins maven-surefire-plugin - + org.jboss.logmanager.LogManager ${container.image.infinispan} @@ -164,9 +164,9 @@ verify - + ${project.build.directory}/${project.build.finalName}-runner - + diff --git a/integration-tests/integration-tests-springboot/pom.xml b/integration-tests/integration-tests-springboot/pom.xml index 1c46bc37a6f..e6f93e1ca54 100644 --- a/integration-tests/integration-tests-springboot/pom.xml +++ b/integration-tests/integration-tests-springboot/pom.xml @@ -34,7 +34,40 @@ test - + + org.kie.kogito + kogito-bom + ${project.version} + pom + test + + + org.kie.kogito + kogito-quarkus-bom + ${project.version} + pom + test + + + org.kie.kogito + kogito-cloudevents-spring-boot-addon + test + + + org.kie.kogito + kogito-test-utils + test + + + org.kie.kogito + process-management-springboot-addon + test + + + org.kie.kogito + task-management-springboot-addon + test + org.infinispan infinispan-spring-boot-starter-remote @@ -92,9 +125,6 @@ maven-invoker-plugin true - ${project.build.directory}/it - ${project.build.directory}/local-repo - true verify ${container.image.infinispan} diff --git a/jbpm/jbpm-bpmn2/pom.xml b/jbpm/jbpm-bpmn2/pom.xml index 4a242c2bc5f..c9eb586eb20 100755 --- a/jbpm/jbpm-bpmn2/pom.xml +++ b/jbpm/jbpm-bpmn2/pom.xml @@ -128,10 +128,10 @@ maven-surefire-plugin - + true - + diff --git a/kogito-build-parent/pom.xml b/kogito-build-parent/pom.xml index c7cccd9bcfb..bda61f4b394 100644 --- a/kogito-build-parent/pom.xml +++ b/kogito-build-parent/pom.xml @@ -1104,6 +1104,10 @@ ${tests.surefire.include} + + ${session.request.localRepositoryPath.path} + ${session.request.userSettingsFile.path} + @@ -1123,6 +1127,8 @@ false false true + ${session.request.localRepositoryPath.path} + ${session.request.userSettingsFile.path} @@ -1211,6 +1217,9 @@ ${skipTests} ${skipTests} true + ${project.build.directory}/it + ${project.build.directory}/local-repo + true diff --git a/kogito-quarkus-parent/kogito-quarkus-extension/kogito-quarkus-integration-test-hot-reload/pom.xml b/kogito-quarkus-parent/kogito-quarkus-extension/kogito-quarkus-integration-test-hot-reload/pom.xml index 4f56b6d44f7..b85a4ce4133 100644 --- a/kogito-quarkus-parent/kogito-quarkus-extension/kogito-quarkus-integration-test-hot-reload/pom.xml +++ b/kogito-quarkus-parent/kogito-quarkus-extension/kogito-quarkus-integration-test-hot-reload/pom.xml @@ -108,11 +108,11 @@ verify - + ${project.build.directory}/${project.build.finalName}-runner - + diff --git a/kogito-quarkus-parent/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/pom.xml b/kogito-quarkus-parent/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/pom.xml index 3e26be136f7..0eb2b1f3e4d 100644 --- a/kogito-quarkus-parent/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/pom.xml +++ b/kogito-quarkus-parent/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/pom.xml @@ -60,6 +60,20 @@ ${version.io.quarkus} test + + org.kie.kogito + kogito-bom + ${project.version} + pom + test + + + org.kie.kogito + kogito-quarkus-bom + ${project.version} + pom + test + @@ -73,7 +87,7 @@ maven-failsafe-plugin - + ${maven.home} diff --git a/kogito-quarkus-parent/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/java/io/quarkus/it/kogito/devmode/DevMojoIT.java b/kogito-quarkus-parent/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/java/io/quarkus/it/kogito/devmode/DevMojoIT.java index cb4de035fc5..02da052d80c 100644 --- a/kogito-quarkus-parent/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/java/io/quarkus/it/kogito/devmode/DevMojoIT.java +++ b/kogito-quarkus-parent/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/java/io/quarkus/it/kogito/devmode/DevMojoIT.java @@ -45,6 +45,10 @@ public class DevMojoIT extends RunAndCheckMojoTestBase { private static final String HTTP_TEST_PORT = "65535"; + private static final String PROPERTY_MAVEN_REPO_LOCAL = "maven.repo.local"; + private static final String PROPERTY_MAVEN_SETTINGS = "maven.settings"; + private static final String MAVEN_REPO_LOCAL = System.getProperty(PROPERTY_MAVEN_REPO_LOCAL); + private static final String MAVEN_SETTINGS = System.getProperty(PROPERTY_MAVEN_SETTINGS); static { RestAssured.enableLoggingOfRequestAndResponseIfValidationFails(); @@ -90,9 +94,30 @@ protected void run(boolean performCompile, String... options) throws FileNotFoun // Since the Kogito extension split, this requires more memory, going for a default of 1GB, per surefire. args.add("-Djvm.args=-Xmx1024m"); + + args.addAll(getProvidedMavenProperties()); + running.execute(args, Collections.emptyMap()); } + private List getProvidedMavenProperties() { + List additionalArguments = new ArrayList<>(); + if (MAVEN_REPO_LOCAL != null) { + additionalArguments.add(String.format("-D%s=%s", PROPERTY_MAVEN_REPO_LOCAL, MAVEN_REPO_LOCAL)); + } + if (MAVEN_SETTINGS != null) { + /* Invoker would fail if the received settings.xml file did not exist. + * That can happen when ${session.request.userSettingsFile.path} is passed as value for maven.settings + * property from the pom.xml and at the same time user does not have settings.xml in ~/.m2/ nor they provided + * specific settings.xml using -s argument. + */ + if (new File(MAVEN_SETTINGS).exists()) { + additionalArguments.add(String.format("-s %s", MAVEN_SETTINGS)); + } + } + return additionalArguments; + } + @Test public void testBPMN2HotReload() throws Exception { testDir = initProject("projects/classic-inst", "projects/project-intrumentation-reload-bpmn"); diff --git a/kogito-quarkus-parent/kogito-quarkus-extension/kogito-quarkus-integration-test/pom.xml b/kogito-quarkus-parent/kogito-quarkus-extension/kogito-quarkus-integration-test/pom.xml index 4688dddd1aa..267b73cae9e 100644 --- a/kogito-quarkus-parent/kogito-quarkus-extension/kogito-quarkus-integration-test/pom.xml +++ b/kogito-quarkus-parent/kogito-quarkus-extension/kogito-quarkus-integration-test/pom.xml @@ -104,9 +104,9 @@ verify - + ${project.build.directory}/${project.build.finalName}-runner - + diff --git a/kogito-quarkus-parent/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-integration-test/pom.xml b/kogito-quarkus-parent/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-integration-test/pom.xml index 476e3fc650b..7491da1b628 100644 --- a/kogito-quarkus-parent/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-integration-test/pom.xml +++ b/kogito-quarkus-parent/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-integration-test/pom.xml @@ -102,9 +102,9 @@ verify - + ${project.build.directory}/${project.build.finalName}-runner - + diff --git a/kogito-quarkus-parent/pom.xml b/kogito-quarkus-parent/pom.xml index 9bc20efcba4..6c29e948cb3 100644 --- a/kogito-quarkus-parent/pom.xml +++ b/kogito-quarkus-parent/pom.xml @@ -43,7 +43,7 @@ maven-surefire-plugin - + org.jboss.logmanager.LogManager