This is an automated email from the ASF dual-hosted git repository.
gitgabrio pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/incubator-kie-kogito-runtimes.git
The following commit(s) were added to refs/heads/main by this push:
new 014ff7f7c2 [incubator-kie-issues#2245] Fix wrong parent pom inside
kogito-gradle-plugin (#4195)
014ff7f7c2 is described below
commit 014ff7f7c2796d988dee3a9a762d4d0f53f115e9
Author: Gabriele Cardosi <[email protected]>
AuthorDate: Wed Feb 18 09:28:57 2026 +0100
[incubator-kie-issues#2245] Fix wrong parent pom inside
kogito-gradle-plugin (#4195)
* [incubatore-kie-issues#2245] Fix wrong parent pom inside
kogito-gradle-plugin
* [incubatore-kie-issues#2245] Fix as per PR suggestion
* [incubator-kie-issues#2245] Include header in asf.yaml
* [incubatore-kie-issues#2245] Fix formatting
* [incubatore-kie-issues#2245] Fix impsort
---------
Co-authored-by: Gabriele-Cardosi <[email protected]>
---
.asf.yaml | 19 +++++++++++++
kogito-gradle-plugin/pom.xml | 33 +++++-----------------
.../kie/kogito/gradle/plugin/AbstractKieTask.java | 8 +++---
.../gradle/plugin/KogitoGradleExtension.java | 3 +-
.../kogito/gradle/plugin/KogitoGradlePlugin.java | 7 +++--
.../kie/kogito/gradle/plugin/util/TaskUtil.java | 1 +
.../gradle/plugin/KogitoGradlePluginTest.java | 3 +-
.../src/main/resources/application.properties | 2 +-
8 files changed, 40 insertions(+), 36 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
index 40a66c4cea..9ffac0cd86 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
github:
features:
issues: true
diff --git a/kogito-gradle-plugin/pom.xml b/kogito-gradle-plugin/pom.xml
index 26e4e360e2..35c19f8f54 100644
--- a/kogito-gradle-plugin/pom.xml
+++ b/kogito-gradle-plugin/pom.xml
@@ -27,9 +27,14 @@
<!-- that they should prefer consuming it instead. -->
<!-- do_not_remove: published-with-gradle-metadata -->
<modelVersion>4.0.0</modelVersion>
- <groupId>org.kie.kogito</groupId>
+ <parent>
+ <groupId>org.kie.kogito</groupId>
+ <artifactId>kogito-build-parent</artifactId>
+ <version>999-SNAPSHOT</version>
+ <relativePath>../kogito-build/kogito-build-parent/pom.xml</relativePath>
+ </parent>
+
<artifactId>kogito-gradle-plugin</artifactId>
- <version>999-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Kogito :: Gradle :: Plugin</name>
@@ -43,9 +48,6 @@
<java.module.name>org.kie.kogito.gradle.plugin</java.module.name>
<gradle.version>8.11.1</gradle.version>
<groovy.version>4.0.29</groovy.version>
- <junit.version>5.12.1</junit.version>
- <assertj.version>3.27.7</assertj.version>
- <surefire.plugin.version>3.2.5</surefire.plugin.version>
</properties>
<dependencyManagement>
@@ -97,18 +99,6 @@
<artifactId>gradle-test-kit</artifactId>
<version>${gradle.version}</version>
</dependency>
- <dependency>
- <groupId>org.junit</groupId>
- <artifactId>junit-bom</artifactId>
- <type>pom</type>
- <scope>import</scope>
- <version>${junit.version}</version>
- </dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <version>${assertj.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
@@ -282,15 +272,6 @@
</dependencies>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.plugin.version}</version>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git
a/kogito-gradle-plugin/src/main/java/org/kie/kogito/gradle/plugin/AbstractKieTask.java
b/kogito-gradle-plugin/src/main/java/org/kie/kogito/gradle/plugin/AbstractKieTask.java
index d70a4836a9..17f7857dce 100644
---
a/kogito-gradle-plugin/src/main/java/org/kie/kogito/gradle/plugin/AbstractKieTask.java
+++
b/kogito-gradle-plugin/src/main/java/org/kie/kogito/gradle/plugin/AbstractKieTask.java
@@ -19,8 +19,6 @@
*/
package org.kie.kogito.gradle.plugin;
-import javax.inject.Inject;
-
import java.io.File;
import java.io.IOException;
import java.net.URI;
@@ -28,6 +26,9 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
+
+import javax.inject.Inject;
+
import org.gradle.api.DefaultTask;
import org.gradle.api.GradleException;
import org.gradle.api.Project;
@@ -54,7 +55,6 @@ public abstract class AbstractKieTask extends DefaultTask {
@Internal
protected String gradleCompilerJavaVersion;
-
@Internal
protected Property<File> projectBuildOutputDirectory;
@@ -149,4 +149,4 @@ public abstract class AbstractKieTask extends DefaultTask {
return CodeGenManagerUtil.Framework.NONE;
}
-}
\ No newline at end of file
+}
diff --git
a/kogito-gradle-plugin/src/main/java/org/kie/kogito/gradle/plugin/KogitoGradleExtension.java
b/kogito-gradle-plugin/src/main/java/org/kie/kogito/gradle/plugin/KogitoGradleExtension.java
index 43e9e313fd..7884ec6f49 100644
---
a/kogito-gradle-plugin/src/main/java/org/kie/kogito/gradle/plugin/KogitoGradleExtension.java
+++
b/kogito-gradle-plugin/src/main/java/org/kie/kogito/gradle/plugin/KogitoGradleExtension.java
@@ -19,6 +19,7 @@
package org.kie.kogito.gradle.plugin;
import java.io.File;
+
import org.gradle.api.Project;
import org.gradle.api.provider.Property;
@@ -68,4 +69,4 @@ public class KogitoGradleExtension {
public Project getGradleProject() {
return gradleProject;
}
-}
\ No newline at end of file
+}
diff --git
a/kogito-gradle-plugin/src/main/java/org/kie/kogito/gradle/plugin/KogitoGradlePlugin.java
b/kogito-gradle-plugin/src/main/java/org/kie/kogito/gradle/plugin/KogitoGradlePlugin.java
index 0e4392a1d8..f617eeb626 100644
---
a/kogito-gradle-plugin/src/main/java/org/kie/kogito/gradle/plugin/KogitoGradlePlugin.java
+++
b/kogito-gradle-plugin/src/main/java/org/kie/kogito/gradle/plugin/KogitoGradlePlugin.java
@@ -20,6 +20,7 @@
package org.kie.kogito.gradle.plugin;
import java.io.File;
+
import org.gradle.api.Plugin;
import org.gradle.api.Project;
import org.gradle.api.file.FileCollection;
@@ -38,7 +39,7 @@ public class KogitoGradlePlugin implements Plugin<Project> {
@Override
public void apply(Project project) {
KogitoGradleExtension extension =
project.getExtensions().create("generateModelConfig",
KogitoGradleExtension.class);
- GenerateModelTask generateModelTask =
project.getTasks().create(GENERATE_MODEL_TASK_NAME, GenerateModelTask.class,
extension);
+ GenerateModelTask generateModelTask =
project.getTasks().create(GENERATE_MODEL_TASK_NAME, GenerateModelTask.class,
extension);
generateModelTask.setGroup(GENERATE_MODEL_TASK_NAME);
generateModelTask.dependsOn(project.getTasks().named(CLASSES));
File secondaryGenDir =
project.getLayout().getBuildDirectory().getAsFile().get().toPath().resolve("generated").resolve("sources").resolve("kogito").toFile();
@@ -64,9 +65,9 @@ public class KogitoGradlePlugin implements Plugin<Project> {
.toFile();
FileCollection fileCollection =
project.getConfigurations().getByName("compileClasspath")
.plus(main.getCompileClasspath())
- .plus(project.files(compiledClassesDirectory));
+ .plus(project.files(compiledClassesDirectory));
compileSecondaryJava.setClasspath(fileCollection);
compileSecondaryJava.getDestinationDirectory().set(compiledClassesDirectory);
}
-}
\ No newline at end of file
+}
diff --git
a/kogito-gradle-plugin/src/main/java/org/kie/kogito/gradle/plugin/util/TaskUtil.java
b/kogito-gradle-plugin/src/main/java/org/kie/kogito/gradle/plugin/util/TaskUtil.java
index 6223242914..315f9b9020 100644
---
a/kogito-gradle-plugin/src/main/java/org/kie/kogito/gradle/plugin/util/TaskUtil.java
+++
b/kogito-gradle-plugin/src/main/java/org/kie/kogito/gradle/plugin/util/TaskUtil.java
@@ -30,6 +30,7 @@ import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
+
import org.drools.compiler.kie.builder.impl.InternalKieModule;
import org.drools.compiler.kie.builder.impl.ZipKieModule;
import org.drools.compiler.kproject.models.KieModuleModelImpl;
diff --git
a/kogito-gradle-plugin/src/test/java/org/kie/kogito/gradle/plugin/KogitoGradlePluginTest.java
b/kogito-gradle-plugin/src/test/java/org/kie/kogito/gradle/plugin/KogitoGradlePluginTest.java
index 0d389ca871..648cc8dc59 100644
---
a/kogito-gradle-plugin/src/test/java/org/kie/kogito/gradle/plugin/KogitoGradlePluginTest.java
+++
b/kogito-gradle-plugin/src/test/java/org/kie/kogito/gradle/plugin/KogitoGradlePluginTest.java
@@ -19,6 +19,7 @@
package org.kie.kogito.gradle.plugin;
import java.io.File;
+
import org.gradle.api.Project;
import org.gradle.testfixtures.ProjectBuilder;
import org.junit.jupiter.api.BeforeEach;
@@ -59,4 +60,4 @@ class KogitoGradlePluginTest {
.resolve("kogito")
.toFile());
}
-}
\ No newline at end of file
+}
diff --git a/kogito-maven-plugin-test/src/main/resources/application.properties
b/kogito-maven-plugin-test/src/main/resources/application.properties
index 37162bfd23..9d07c7f599 100644
--- a/kogito-maven-plugin-test/src/main/resources/application.properties
+++ b/kogito-maven-plugin-test/src/main/resources/application.properties
@@ -18,5 +18,5 @@
#
server.address=0.0.0.0
-kogito.generate.rest.decisions=false
+kogito.generate.rest.decisions=true
kogito.generate.rest.processes=true
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
