Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[KOGITO-7513] - Replace Kogito-examples group-id from 'org.kie.kogito… #1778

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

[KOGITO-7513] - Replace Kogito-examples group-id from 'org.kie.kogito… #1778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77ec2e8
[KOGITO-7513] - Replace Kogito-examples group-id from 'org.kie.kogito…
spolti Aug 30, 2023
6a7b736
update IT tests
spolti Sep 1, 2023
a42a320
remove parent poms
spolti Sep 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
118 changes: 59 additions & 59 deletions .ci/environments/quarkus-3/patches/0001_before_sh.patch
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .ci/environments/quarkus-3/patches/0003_wiremock_update.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ index 130b10318..b4cb6502e 100644
+++ b/serverless-workflow-examples/serverless-workflow-stock-profit/pom.xml
@@ -25,7 +25,7 @@
<maven.compiler.release>11</maven.compiler.release>
<version.surefire.plugin>3.0.0-M7</version.surefire.plugin>
<version.surefire.plugin>3.1.2</version.surefire.plugin>
<version.failsafe.plugin>${version.surefire.plugin}</version.failsafe.plugin>
- <version.com.github.tomakehurst.wiremock>2.33.2</version.com.github.tomakehurst.wiremock>
+ <version.com.github.tomakehurst.wiremock>3.0.0-beta-8</version.com.github.tomakehurst.wiremock>
Expand Down
2 changes: 1 addition & 1 deletion .ci/environments/quarkus-lts/patches/0001_align-protobuf-and-grpc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ index c2ca6f930..a50429305 100644
@@ -15,8 +15,9 @@
<version.compiler.plugin>3.8.1</version.compiler.plugin>
<maven.compiler.release>11</maven.compiler.release>
<version.surefire.plugin>3.0.0-M7</version.surefire.plugin>
<version.surefire.plugin>3.1.2</version.surefire.plugin>
- <version.com.google.protobuf>3.22.0</version.com.google.protobuf>
- <version.io.grpc>1.51.1</version.io.grpc>
+ <!-- Quarkus 2.13.x is using protobuf 3.19.6, but the correct version should be 3.21.1 to work properly with current io.grpc version -->
Expand Down
78 changes: 60 additions & 18 deletions kogito-quarkus-examples/decisiontable-quarkus-example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.kie.kogito.examples</groupId>
<artifactId>kogito-quarkus-examples</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

<artifactId>decisiontable-quarkus-example</artifactId>
<groupId>org.acme.examples</groupId>
<version>2.0.0-SNAPSHOT</version>

<name>Kogito Example :: Decision Table - Quarkus</name>

<properties>
<quarkus-plugin.version>2.16.10.Final</quarkus-plugin.version>
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
Expand All @@ -19,7 +20,19 @@
<kogito.bom.version>2.0.0-SNAPSHOT</kogito.bom.version>
<version.org.kie.kogito>2.0.0-SNAPSHOT</version.org.kie.kogito>
<version.org.drools>8.45.0-SNAPSHOT</version.org.drools>
<version.surefire.plugin>3.1.2</version.surefire.plugin>
<version.failsafe.plugin>${version.surefire.plugin}</version.failsafe.plugin>
<version.compiler.plugin>3.8.1</version.compiler.plugin>
<!-- Port 0 means dynamic port -->
<tests.quarkus.http.port>0</tests.quarkus.http.port>
<!-- override default to fast-jar packaging for forward-compatibility -->
<quarkus.package.type>fast-jar</quarkus.package.type>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
Expand Down Expand Up @@ -90,20 +103,49 @@
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>${quarkus.platform.group-id}</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
<version>${quarkus-plugin.version}</version>
<executions>
<execution>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${version.surefire.plugin}</version>
<configuration>
<systemPropertyVariables>
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
</systemPropertyVariables>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${version.failsafe.plugin}</version>
<configuration>
<systemPropertyVariables>
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
<quarkus.http.test-port>${tests.quarkus.http.port}</quarkus.http.test-port>
<native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
</systemPropertyVariables>
</configuration>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>kogito-apps-downstream-native</id>
<activation>
<property>
<name>kogito-apps-native</name>
</property>
</activation>
<properties>
<failsafe.include>**/Native*IT.java</failsafe.include>
<failsafe.exclude></failsafe.exclude>
<quarkus.package.type>native</quarkus.package.type>
<quarkus.native.native-image-xmx>8g</quarkus.native.native-image-xmx>
<!-- Native building needs a fixed port for tests -->
<tests.quarkus.http.port>8080</tests.quarkus.http.port>
</properties>
</profile>
</profiles>

</project>
2 changes: 1 addition & 1 deletion ...ava/org/kie/kogito/queries/Applicant.java → ...main/java/org/acme/queries/Applicant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.kie.kogito.queries;
package org.acme.queries;

public class Applicant {

Expand Down
2 changes: 1 addition & 1 deletion ...g/kie/kogito/queries/LoanApplication.java → ...ava/org/acme/queries/LoanApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.kie.kogito.queries;
package org.acme.queries;

public class LoanApplication {

Expand Down
2 changes: 1 addition & 1 deletion ...java/org/kie/kogito/queries/LoanUnit.java → .../main/java/org/acme/queries/LoanUnit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.kie.kogito.queries;
package org.acme.queries;

import org.drools.ruleunits.api.DataSource;
import org.drools.ruleunits.api.DataStore;
Expand Down
Binary file renamed ...s/org/kie/kogito/queries/LoanUnit.drl.xls → ...sources/org/acme/queries/LoanUnit.drl.xls
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion ...isiontable/quarkus/NativeRestQueryIT.java → ...isiontable/quarkus/NativeRestQueryIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.kie.kogito.decisiontable.quarkus;
package org.acme.decisiontable.quarkus;

import io.quarkus.test.junit.NativeImageTest;

Expand Down
2 changes: 1 addition & 1 deletion .../decisiontable/quarkus/RestQueryTest.java → .../decisiontable/quarkus/RestQueryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.kie.kogito.decisiontable.quarkus;
package org.acme.decisiontable.quarkus;

import org.junit.jupiter.api.Test;

Expand Down
4 changes: 2 additions & 2 deletions kogito-quarkus-examples/dmn-drools-quarkus-metrics/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version: '2'
version: '2.0'

services:
hello:
image: org.kie.kogito.examples/dmn-drools-quarkus-metrics:1.0
image: org.acme.examples/dmn-drools-quarkus-metrics:1.0
ports:
- 8080:8080

Expand Down
74 changes: 67 additions & 7 deletions kogito-quarkus-examples/dmn-drools-quarkus-metrics/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.kie.kogito.examples</groupId>
<artifactId>kogito-quarkus-examples</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

<artifactId>dmn-drools-quarkus-metrics</artifactId>
<groupId>org.acme.examples</groupId>
<version>2.0.0-SNAPSHOT</version>

<name>Kogito Example :: DMN Metrics Quarkus</name>

<properties>
<quarkus-plugin.version>2.16.10.Final</quarkus-plugin.version>
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
Expand All @@ -18,7 +19,21 @@
<kogito.bom.artifact-id>kogito-bom</kogito.bom.artifact-id>
<kogito.bom.version>2.0.0-SNAPSHOT</kogito.bom.version>
<version.org.kie.kogito>2.0.0-SNAPSHOT</version.org.kie.kogito>
<version.org.testcontainers>1.17.3</version.org.testcontainers>
<version.surefire.plugin>3.1.2</version.surefire.plugin>
<version.failsafe.plugin>${version.surefire.plugin}</version.failsafe.plugin>
<!-- Port 0 means dynamic port -->
<tests.quarkus.http.port>0</tests.quarkus.http.port>
<!-- override default to fast-jar packaging for forward-compatibility -->
<quarkus.package.type>fast-jar</quarkus.package.type>
<version.clean.plugin>3.1.0</version.clean.plugin>
<version.resources.plugin>3.1.0</version.resources.plugin>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
Expand All @@ -37,6 +52,7 @@
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.kie.kogito</groupId>
Expand Down Expand Up @@ -83,6 +99,7 @@
<dependency>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-test-utils</artifactId>
<version>${version.org.kie.kogito}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -96,6 +113,7 @@
<artifactId>quarkus-smallrye-health</artifactId>
</dependency>
</dependencies>

<build>
<finalName>${project.artifactId}</finalName>
<resources>
Expand All @@ -122,6 +140,7 @@
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>${version.clean.plugin}</version>
<configuration>
<filesets>
<fileset>
Expand All @@ -137,6 +156,7 @@
<!-- Keep this after quarkus-maven-plugin, since both are bind to package phase, and this one has to be executed after !-->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>${version.resources.plugin}</version>
<executions>
<execution>
<id>copy-filtered-resources</id>
Expand Down Expand Up @@ -194,6 +214,46 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${version.surefire.plugin}</version>
<configuration>
<systemPropertyVariables>
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
</systemPropertyVariables>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${version.failsafe.plugin}</version>
<configuration>
<systemPropertyVariables>
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
<quarkus.http.test-port>${tests.quarkus.http.port}</quarkus.http.test-port>
</systemPropertyVariables>
</configuration>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>kogito-apps-downstream-native</id>
<activation>
<property>
<name>kogito-apps-native</name>
</property>
</activation>
<properties>
<failsafe.include>**/Native*IT.java</failsafe.include>
<failsafe.exclude></failsafe.exclude>
<quarkus.package.type>native</quarkus.package.type>
<quarkus.native.native-image-xmx>8g</quarkus.native.native-image-xmx>
<!-- Native building needs a fixed port for tests -->
<tests.quarkus.http.port>8080</tests.quarkus.http.port>
</properties>
</profile>
</profiles>
</project>
4 changes: 2 additions & 2 deletions ...to/app/CustomDMNRuntimeEventListener.java → ...me/app/CustomDMNRuntimeEventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.kie.kogito.app;
package org.acme.app;

import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
Expand Down Expand Up @@ -87,7 +87,7 @@ public void afterEvaluateAll(AfterEvaluateAllEvent event) {

private void registerEvent(DMNEvent event) {
logger.debug(event.getClass().getSimpleName());
prometheusMeterRegistry.counter("org.kie.kogito.examples.customdmnruntimeeventlistener", "event",
prometheusMeterRegistry.counter("org.acme.examples.customdmnruntimeeventlistener", "event",
event.getClass().getSimpleName().toLowerCase()).increment();
}

Expand Down
4 changes: 2 additions & 2 deletions ...e/kogito/app/RuleEventListenerConfig.java → ...org/acme/app/RuleEventListenerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.kie.kogito.app;
package org.acme.app;

import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;

import org.acme.examples.CustomRuleEventListener;
import org.kie.kogito.drools.core.config.DefaultRuleEventListenerConfig;
import org.kie.kogito.examples.CustomRuleEventListener;

import io.micrometer.prometheus.PrometheusMeterRegistry;

Expand Down
4 changes: 2 additions & 2 deletions ...ito/examples/CustomRuleEventListener.java → ...cme/examples/CustomRuleEventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.kie.kogito.examples;
package org.acme.examples;

import org.drools.core.event.DefaultAgendaEventListener;
import org.jboss.logging.Logger;
Expand Down Expand Up @@ -101,7 +101,7 @@ public void afterRuleFlowGroupDeactivated(RuleFlowGroupDeactivatedEvent event) {

private void registerEvent(KieRuntimeEvent event) {
logger.debug(event.getClass().getSimpleName());
prometheusMeterRegistry.counter("org.kie.kogito.examples.customruleeventlistener", "event",
prometheusMeterRegistry.counter("org.acme.examples.customruleeventlistener", "event",
event.getClass().getSimpleName().toLowerCase()).increment();
}
}
2 changes: 1 addition & 1 deletion ...n/java/org/kie/kogito/examples/Hello.java → ...rc/main/java/org/acme/examples/Hello.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.kie.kogito.examples;
package org.acme.examples;

import org.drools.ruleunits.api.DataSource;
import org.drools.ruleunits.api.DataStore;
Expand Down
2 changes: 1 addition & 1 deletion kogito-quarkus-examples/dmn-drools-quarkus-metrics/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# Container image
quarkus.container-image.build=true
quarkus.container-image.group=org.kie.kogito.examples
quarkus.container-image.group=org.acme.examples
quarkus.container-image.name=dmn-drools-quarkus-metrics
quarkus.container-image.tag=1.0
kogito.grafana.disabled.operational.dashboards=Traffic Violation
Expand Down
2 changes: 1 addition & 1 deletion ...sources/org/kie/kogito/examples/Hello.drl → ...ain/resources/org/acme/examples/Hello.drl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.kie.kogito.examples;
package org.acme.examples;
unit Hello;

rule helloWorld
Expand Down
0 ...g/kie/kogito/examples/LoanEligibility.dmn → ...ces/org/acme/examples/LoanEligibility.dmn
View file
Open in desktop
File renamed without changes.
0 ...kie/kogito/examples/Traffic Violation.dmn → ...s/org/acme/examples/Traffic Violation.dmn
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...to/examples/quarkus/DashboardsListIT.java → ...me/examples/quarkus/DashboardsListIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.kie.kogito.examples.quarkus;
package org.acme.examples.quarkus;

import java.util.List;

Expand Down
Loading