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-examples.git
The following commit(s) were added to refs/heads/main by this push:
new fec28c275 [NO ISSUE] Reorganize plain java examples (#2034)
fec28c275 is described below
commit fec28c27542fed80dd832c120fa68d7767ee0d37
Author: Gabriele Cardosi <[email protected]>
AuthorDate: Tue Nov 5 12:51:34 2024 +0100
[NO ISSUE] Reorganize plain java examples (#2034)
* [NO ISSUE] Reorganizing java examples
* [NO ISSUE] Reorganizing java examples
* [NO ISSUE] Fixing ci
* [NO ISSUE] Fix as per PR suggestion
---------
Co-authored-by: Gabriele-Cardosi <[email protected]>
---
.ci/jenkins/Jenkinsfile.deploy | 2 +-
.ci/jenkins/dsl/jobs.groovy | 9 +++++++
.github/workflows/pr-kogito-examples.yml | 5 +++-
.../dmn-embedded-mode-example}/.gitignore | 0
.../dmn-embedded-mode-example/README.md | 6 +++++
.../dmn-embedded-mode-example}/pom.xml | 13 +++-------
.../kie/kogito/decisions/embedded/Applicant.java | 0
.../embedded/DecisionsEmbeddedModeExample.java | 0
.../kogito/decisions/embedded/LoanApplication.java | 0
.../src/main/resources/META-INF/MANIFEST.MF | 0
.../src/main/resources/META-INF/kmodule.xml | 0
.../embedded/loan-application-age-limit.dmn | 0
kogito-java-examples/pom.xml | 29 ++++++++++++++++++++++
.../rules-embedded-mode-example/.gitignore | 0
.../rules-embedded-mode-example/README.md | 0
.../rules-embedded-mode-example/pom.xml | 8 ------
.../org/kie/kogito/rules/embedded/Applicant.java | 0
.../kie/kogito/rules/embedded/LoanApplication.java | 0
.../rules/embedded/RulesEmbeddedModeExample.java | 0
.../src/main/resources/META-INF/MANIFEST.MF | 0
.../src/main/resources/META-INF/kmodule.xml | 0
.../rules/embedded/loan-application-age-limit.drl | 0
.../decisions-embedded-mode-example/README.md | 6 -----
kogito-quarkus-examples/pom.xml | 2 --
pom.xml | 1 +
25 files changed, 53 insertions(+), 28 deletions(-)
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index 17f5aa52b..1f64eac57 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -162,7 +162,7 @@ pipeline {
getMavenCommand()
.withOptions(env.BUILD_MVN_OPTS_CURRENT ? [
env.BUILD_MVN_OPTS_CURRENT ] : [])
.withOptions(env.KOGITO_EXAMPLES_BUILD_MVN_OPTS ? [
env.KOGITO_EXAMPLES_BUILD_MVN_OPTS ] : [])
- .withOptions("-pl
.,kogito-quarkus-examples,kogito-springboot-examples,serverless-workflow-examples")
+ .withOptions("-pl
.,kogito-java-examples,kogito-quarkus-examples,kogito-springboot-examples,serverless-workflow-examples")
.skipTests(true)
.withSettingsXmlFile(MAVEN_SETTINGS_FILE)
.run("deploy -DdeployAtEnd
-Dapache.repository.username=${REPOSITORY_USER}
-Dapache.repository.password=${REPOSITORY_TOKEN}
-DretryFailedDeploymentCount=5")
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index ff19cc892..78895e6f7 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -46,6 +46,15 @@ Map getMultijobPRConfig(JenkinsFolder jobFolder) {
parallel: true,
buildchain: true,
jobs : [
+ [
+ id: 'kogito-java-examples',
+ primary: true,
+ env : [
+ // Sonarcloud analysis is disabled for examples
+ KOGITO_EXAMPLES_SUBFOLDER_POM: 'kogito-java-examples/',
+ BUILD_MVN_OPTS_CURRENT: "${defaultBuildMvnOptsCurrent}
${getExamplesBuildMvnOptions(jobFolder).join(' ')}",
+ ]
+ ],
[
id: 'kogito-quarkus-examples',
primary: true,
diff --git a/.github/workflows/pr-kogito-examples.yml
b/.github/workflows/pr-kogito-examples.yml
index b186957f8..4089fd8b6 100644
--- a/.github/workflows/pr-kogito-examples.yml
+++ b/.github/workflows/pr-kogito-examples.yml
@@ -20,11 +20,14 @@ jobs:
timeout-minutes: 180
strategy:
matrix:
- job_name: [ kogito-quarkus-examples, kogito-springboot-examples,
serverless-workflow-examples ]
+ job_name: [ kogito-java-examples, kogito-quarkus-examples,
kogito-springboot-examples, serverless-workflow-examples ]
os: [ubuntu-latest]
java-version: [17]
maven-version: ['3.9.6']
include:
+ - job_name: kogito-java-examples
+ repository: incubator-kie-kogito-examples
+ env_KOGITO_EXAMPLES_SUBFOLDER_POM: kogito-java-examples/
- job_name: kogito-quarkus-examples
repository: incubator-kie-kogito-examples
env_KOGITO_EXAMPLES_SUBFOLDER_POM: kogito-quarkus-examples/
diff --git a/kogito-quarkus-examples/decisions-embedded-mode-example/.gitignore
b/kogito-java-examples/dmn-embedded-mode-example/.gitignore
similarity index 100%
rename from kogito-quarkus-examples/decisions-embedded-mode-example/.gitignore
rename to kogito-java-examples/dmn-embedded-mode-example/.gitignore
diff --git a/kogito-java-examples/dmn-embedded-mode-example/README.md
b/kogito-java-examples/dmn-embedded-mode-example/README.md
new file mode 100644
index 000000000..cda00cda4
--- /dev/null
+++ b/kogito-java-examples/dmn-embedded-mode-example/README.md
@@ -0,0 +1,6 @@
+# decisions-embedded-mode-example
+
+Is an example of running DMN decisions using plain java. This is an example
decision for approving and declining the loan application. Please notice, the
decision is only example that do not cover all cases from the banking domain.
+
+## Execute
+Simply run the main class
`org.kie.kogito.decisions.embedded.DecisionsEmbeddedModeExample` either from
the IDE or your command line.
\ No newline at end of file
diff --git a/kogito-quarkus-examples/decisions-embedded-mode-example/pom.xml
b/kogito-java-examples/dmn-embedded-mode-example/pom.xml
similarity index 89%
rename from kogito-quarkus-examples/decisions-embedded-mode-example/pom.xml
rename to kogito-java-examples/dmn-embedded-mode-example/pom.xml
index 75a6778bb..7c54fe637 100644
--- a/kogito-quarkus-examples/decisions-embedded-mode-example/pom.xml
+++ b/kogito-java-examples/dmn-embedded-mode-example/pom.xml
@@ -22,10 +22,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<groupId>org.kie.kogito.decisions.embedded</groupId>
- <artifactId>decisions-embedded-mode-example</artifactId>
- <name>Kogito Example :: Decision Embedded Mode</name>
+ <artifactId>dmn-embedded-mode-example</artifactId>
+ <name>Kogito Example :: DMN Embedded Mode</name>
<version>999-SNAPSHOT</version>
<packaging>kjar</packaging>
+
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>17</maven.compiler.source>
@@ -38,19 +39,11 @@
<version.kogito.bom>999-SNAPSHOT</version.kogito.bom>
<version.org.kie>999-SNAPSHOT</version.org.kie>
- <version.quarkus.platform>3.8.6</version.quarkus.platform>
<version.org.slf4j>2.0.13</version.org.slf4j>
</properties>
<dependencyManagement>
<dependencies>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-bom</artifactId>
- <version>${version.quarkus.platform}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-bom</artifactId>
diff --git
a/kogito-quarkus-examples/decisions-embedded-mode-example/src/main/java/org/kie/kogito/decisions/embedded/Applicant.java
b/kogito-java-examples/dmn-embedded-mode-example/src/main/java/org/kie/kogito/decisions/embedded/Applicant.java
similarity index 100%
rename from
kogito-quarkus-examples/decisions-embedded-mode-example/src/main/java/org/kie/kogito/decisions/embedded/Applicant.java
rename to
kogito-java-examples/dmn-embedded-mode-example/src/main/java/org/kie/kogito/decisions/embedded/Applicant.java
diff --git
a/kogito-quarkus-examples/decisions-embedded-mode-example/src/main/java/org/kie/kogito/decisions/embedded/DecisionsEmbeddedModeExample.java
b/kogito-java-examples/dmn-embedded-mode-example/src/main/java/org/kie/kogito/decisions/embedded/DecisionsEmbeddedModeExample.java
similarity index 100%
rename from
kogito-quarkus-examples/decisions-embedded-mode-example/src/main/java/org/kie/kogito/decisions/embedded/DecisionsEmbeddedModeExample.java
rename to
kogito-java-examples/dmn-embedded-mode-example/src/main/java/org/kie/kogito/decisions/embedded/DecisionsEmbeddedModeExample.java
diff --git
a/kogito-quarkus-examples/decisions-embedded-mode-example/src/main/java/org/kie/kogito/decisions/embedded/LoanApplication.java
b/kogito-java-examples/dmn-embedded-mode-example/src/main/java/org/kie/kogito/decisions/embedded/LoanApplication.java
similarity index 100%
rename from
kogito-quarkus-examples/decisions-embedded-mode-example/src/main/java/org/kie/kogito/decisions/embedded/LoanApplication.java
rename to
kogito-java-examples/dmn-embedded-mode-example/src/main/java/org/kie/kogito/decisions/embedded/LoanApplication.java
diff --git
a/kogito-quarkus-examples/decisions-embedded-mode-example/src/main/resources/META-INF/MANIFEST.MF
b/kogito-java-examples/dmn-embedded-mode-example/src/main/resources/META-INF/MANIFEST.MF
similarity index 100%
rename from
kogito-quarkus-examples/decisions-embedded-mode-example/src/main/resources/META-INF/MANIFEST.MF
rename to
kogito-java-examples/dmn-embedded-mode-example/src/main/resources/META-INF/MANIFEST.MF
diff --git
a/kogito-quarkus-examples/decisions-embedded-mode-example/src/main/resources/META-INF/kmodule.xml
b/kogito-java-examples/dmn-embedded-mode-example/src/main/resources/META-INF/kmodule.xml
similarity index 100%
rename from
kogito-quarkus-examples/decisions-embedded-mode-example/src/main/resources/META-INF/kmodule.xml
rename to
kogito-java-examples/dmn-embedded-mode-example/src/main/resources/META-INF/kmodule.xml
diff --git
a/kogito-quarkus-examples/decisions-embedded-mode-example/src/main/resources/org/kie/kogito/decisions/embedded/loan-application-age-limit.dmn
b/kogito-java-examples/dmn-embedded-mode-example/src/main/resources/org/kie/kogito/decisions/embedded/loan-application-age-limit.dmn
similarity index 100%
rename from
kogito-quarkus-examples/decisions-embedded-mode-example/src/main/resources/org/kie/kogito/decisions/embedded/loan-application-age-limit.dmn
rename to
kogito-java-examples/dmn-embedded-mode-example/src/main/resources/org/kie/kogito/decisions/embedded/loan-application-age-limit.dmn
diff --git a/kogito-java-examples/pom.xml b/kogito-java-examples/pom.xml
new file mode 100644
index 000000000..c21967f2c
--- /dev/null
+++ b/kogito-java-examples/pom.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.kie.kogito.examples</groupId>
+ <artifactId>kogito-examples</artifactId>
+ <version>999-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>kogito-java-examples</artifactId>
+ <packaging>pom</packaging>
+ <name>Kogito Example :: Java</name>
+
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>dmn-embedded-mode-example</module>
+ <module>rules-embedded-mode-example</module>
+ </modules>
+ </profile>
+ </profiles>
+
+</project>
\ No newline at end of file
diff --git a/kogito-quarkus-examples/rules-embedded-mode-example/.gitignore
b/kogito-java-examples/rules-embedded-mode-example/.gitignore
similarity index 100%
rename from kogito-quarkus-examples/rules-embedded-mode-example/.gitignore
rename to kogito-java-examples/rules-embedded-mode-example/.gitignore
diff --git a/kogito-quarkus-examples/rules-embedded-mode-example/README.md
b/kogito-java-examples/rules-embedded-mode-example/README.md
similarity index 100%
rename from kogito-quarkus-examples/rules-embedded-mode-example/README.md
rename to kogito-java-examples/rules-embedded-mode-example/README.md
diff --git a/kogito-quarkus-examples/rules-embedded-mode-example/pom.xml
b/kogito-java-examples/rules-embedded-mode-example/pom.xml
similarity index 91%
rename from kogito-quarkus-examples/rules-embedded-mode-example/pom.xml
rename to kogito-java-examples/rules-embedded-mode-example/pom.xml
index ca6a7d687..2a5eb7693 100644
--- a/kogito-quarkus-examples/rules-embedded-mode-example/pom.xml
+++ b/kogito-java-examples/rules-embedded-mode-example/pom.xml
@@ -38,19 +38,11 @@
<version.kogito.bom>999-SNAPSHOT</version.kogito.bom>
<version.org.kie>999-SNAPSHOT</version.org.kie>
- <version.quarkus.platform>3.8.6</version.quarkus.platform>
<version.org.slf4j>2.0.13</version.org.slf4j>
</properties>
<dependencyManagement>
<dependencies>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-bom</artifactId>
- <version>${version.quarkus.platform}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-bom</artifactId>
diff --git
a/kogito-quarkus-examples/rules-embedded-mode-example/src/main/java/org/kie/kogito/rules/embedded/Applicant.java
b/kogito-java-examples/rules-embedded-mode-example/src/main/java/org/kie/kogito/rules/embedded/Applicant.java
similarity index 100%
rename from
kogito-quarkus-examples/rules-embedded-mode-example/src/main/java/org/kie/kogito/rules/embedded/Applicant.java
rename to
kogito-java-examples/rules-embedded-mode-example/src/main/java/org/kie/kogito/rules/embedded/Applicant.java
diff --git
a/kogito-quarkus-examples/rules-embedded-mode-example/src/main/java/org/kie/kogito/rules/embedded/LoanApplication.java
b/kogito-java-examples/rules-embedded-mode-example/src/main/java/org/kie/kogito/rules/embedded/LoanApplication.java
similarity index 100%
rename from
kogito-quarkus-examples/rules-embedded-mode-example/src/main/java/org/kie/kogito/rules/embedded/LoanApplication.java
rename to
kogito-java-examples/rules-embedded-mode-example/src/main/java/org/kie/kogito/rules/embedded/LoanApplication.java
diff --git
a/kogito-quarkus-examples/rules-embedded-mode-example/src/main/java/org/kie/kogito/rules/embedded/RulesEmbeddedModeExample.java
b/kogito-java-examples/rules-embedded-mode-example/src/main/java/org/kie/kogito/rules/embedded/RulesEmbeddedModeExample.java
similarity index 100%
rename from
kogito-quarkus-examples/rules-embedded-mode-example/src/main/java/org/kie/kogito/rules/embedded/RulesEmbeddedModeExample.java
rename to
kogito-java-examples/rules-embedded-mode-example/src/main/java/org/kie/kogito/rules/embedded/RulesEmbeddedModeExample.java
diff --git
a/kogito-quarkus-examples/rules-embedded-mode-example/src/main/resources/META-INF/MANIFEST.MF
b/kogito-java-examples/rules-embedded-mode-example/src/main/resources/META-INF/MANIFEST.MF
similarity index 100%
rename from
kogito-quarkus-examples/rules-embedded-mode-example/src/main/resources/META-INF/MANIFEST.MF
rename to
kogito-java-examples/rules-embedded-mode-example/src/main/resources/META-INF/MANIFEST.MF
diff --git
a/kogito-quarkus-examples/rules-embedded-mode-example/src/main/resources/META-INF/kmodule.xml
b/kogito-java-examples/rules-embedded-mode-example/src/main/resources/META-INF/kmodule.xml
similarity index 100%
rename from
kogito-quarkus-examples/rules-embedded-mode-example/src/main/resources/META-INF/kmodule.xml
rename to
kogito-java-examples/rules-embedded-mode-example/src/main/resources/META-INF/kmodule.xml
diff --git
a/kogito-quarkus-examples/rules-embedded-mode-example/src/main/resources/org/kie/kogito/rules/embedded/loan-application-age-limit.drl
b/kogito-java-examples/rules-embedded-mode-example/src/main/resources/org/kie/kogito/rules/embedded/loan-application-age-limit.drl
similarity index 100%
rename from
kogito-quarkus-examples/rules-embedded-mode-example/src/main/resources/org/kie/kogito/rules/embedded/loan-application-age-limit.drl
rename to
kogito-java-examples/rules-embedded-mode-example/src/main/resources/org/kie/kogito/rules/embedded/loan-application-age-limit.drl
diff --git a/kogito-quarkus-examples/decisions-embedded-mode-example/README.md
b/kogito-quarkus-examples/decisions-embedded-mode-example/README.md
deleted file mode 100644
index 1a6f797d0..000000000
--- a/kogito-quarkus-examples/decisions-embedded-mode-example/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# decisions-embedded-mode-example
-
-Is an example of runing DMN decisions using plain java. This is an example
decision for approving and declining the loan application. Please notice, the
decision is only example that do not cover all cases from the banking domain.
-
-## Execute
-Simply run the main class
`org.kie.kogito.decisions.embedded.DecisionsEmbeddedModeExample` either from
the IDE or your command line.
\ No newline at end of file
diff --git a/kogito-quarkus-examples/pom.xml b/kogito-quarkus-examples/pom.xml
index bfc912b7c..1b555b56d 100644
--- a/kogito-quarkus-examples/pom.xml
+++ b/kogito-quarkus-examples/pom.xml
@@ -50,7 +50,6 @@
</activation>
<modules>
<module>decisiontable-quarkus-example</module>
- <module>decisions-embedded-mode-example</module>
<module>dmn-15-quarkus-example</module>
<module>dmn-drools-quarkus-metrics</module>
<module>dmn-event-driven-quarkus</module>
@@ -100,7 +99,6 @@
<module>process-usertasks-timer-quarkus-with-console</module>
<module>process-usertasks-with-security-oidc-quarkus</module>
<module>process-usertasks-with-security-quarkus</module>
- <module>rules-embedded-mode-example</module>
<module>rules-incubation-api-quarkus</module>
<module>rules-legacy-quarkus-example</module>
<module>rules-legacy-scesim-quarkus-example</module>
diff --git a/pom.xml b/pom.xml
index 4f796475d..162627986 100755
--- a/pom.xml
+++ b/pom.xml
@@ -137,6 +137,7 @@
<activeByDefault>true</activeByDefault>
</activation>
<modules>
+ <module>kogito-java-examples</module>
<module>kogito-quarkus-examples</module>
<module>kogito-springboot-examples</module>
<module>serverless-workflow-examples</module>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
