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.

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

Sync main branch with Apache main branch #4

Merged
merged 3 commits into from
Jan 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions kogito-quarkus-examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -107,21 +107,6 @@
</modules>
</profile>

<!--
https://issues.redhat.com/browse/KOGITO-8341
Prod profile defined here with empty modules
So the check does still run on that subproject
but no module is checked
-->
<profile>
<id>productized</id>
<activation>
<property>
<name>productized</name>
</property>
</activation>
</profile>

<profile>
<id>native</id>
<properties>
Expand Down
15 changes: 0 additions & 15 deletions kogito-springboot-examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -95,21 +95,6 @@
</modules>
</profile>

<!--
https://issues.redhat.com/browse/KOGITO-8341
Prod profile defined here with empty modules
So the check does still run on that subproject
but no module is checked
-->
<profile>
<id>productized</id>
<activation>
<property>
<name>productized</name>
</property>
</activation>
</profile>

<profile>
<id>springboot</id>
<activation>
Expand Down
22 changes: 11 additions & 11 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@
<version.org.webjars>4.5.3</version.org.webjars>

<version.jib.plugin>3.3.1</version.jib.plugin>
<!-- Reproducible builds -->
<project.build.outputTimestamp>2024-01-16T00:00:00Z</project.build.outputTimestamp>
<version.maven.artifact.plugin>3.4.1</version.maven.artifact.plugin>
</properties>

<!-- distributionManagement section -->
Expand Down Expand Up @@ -159,17 +162,6 @@
<module>serverless-workflow-examples</module>
</modules>
</profile>
<profile>
<id>productized</id>
<activation>
<property>
<name>productized</name>
</property>
</activation>
<modules>
<module>serverless-workflow-examples</module>
</modules>
</profile>
</profiles>

<dependencyManagement>
Expand Down Expand Up @@ -411,6 +403,14 @@
<artifactId>openshift-maven-plugin</artifactId>
<version>${version.org.eclipse.jkube}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-artifact-plugin</artifactId>
<version>${version.maven.artifact.plugin}</version>
<configuration>
<outputTimestamp>${project.build.outputTimestamp}</outputTimestamp>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
Expand Down
40 changes: 0 additions & 40 deletions serverless-workflow-examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -120,46 +120,6 @@
</modules>
</profile>

<profile>
<id>productized</id>
<activation>
<property>
<name>productized</name>
</property>
</activation>
<modules>
<module>serverless-workflow-annotations-description</module>
<module>serverless-workflow-callback-events-over-http-quarkus</module>
<module>serverless-workflow-callback-quarkus</module>
<module>serverless-workflow-compensation-quarkus</module>
<module>serverless-workflow-consuming-events-over-http-quarkus</module>
<module>serverless-workflow-correlation-quarkus</module>
<module>serverless-workflow-custom-function-knative</module>
<module>serverless-workflow-custom-type</module>
<module>serverless-workflow-data-index-quarkus</module>
<module>serverless-workflow-error-quarkus</module>
<module>serverless-workflow-expression-quarkus</module>
<module>serverless-workflow-foreach-quarkus</module>
<module>serverless-workflow-functions-quarkus</module>
<module>serverless-workflow-funqy</module>
<module>serverless-workflow-greeting-quarkus</module>
<module>serverless-workflow-greeting-rpc-quarkus</module>
<module>serverless-workflow-hello-world</module>
<module>serverless-workflow-loanbroker-showcase</module>
<module>serverless-workflow-newsletter-subscription</module>
<module>serverless-workflow-order-processing</module>
<module>serverless-workflow-parallel-execution</module>
<module>serverless-workflow-qas-service-showcase</module>
<module>serverless-workflow-saga-quarkus</module>
<module>serverless-workflow-service-calls-quarkus</module>
<module>serverless-workflow-stock-profit</module>
<module>serverless-workflow-temperature-conversion</module>
<module>serverless-workflow-testing-with-rest-assured</module>
<module>serverless-workflow-timeouts-showcase-embedded</module>
<module>serverless-workflow-timeouts-showcase-extended</module>
<module>serverless-workflow-timeouts-showcase-operator-devprofile</module>
</modules>
</profile>
<profile>
<id>openvino</id>
<activation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,26 @@

<properties>
<java.module.name>org.kie.kogito.examples.serverless.workflow</java.module.name>
<!-- Reproducible builds -->
<project.build.outputTimestamp>2024-01-16T00:00:00Z</project.build.outputTimestamp>
<version.maven.artifact.plugin>3.4.1</version.maven.artifact.plugin>
</properties>


<build>
<pluginManagement>
<plugins>
<!-- Reproducible builds -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-artifact-plugin</artifactId>
<version>${version.maven.artifact.plugin}</version>
<configuration>
<outputTimestamp>${project.build.outputTimestamp}</outputTimestamp>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,12 @@ kubectl apply -f kubernetes/data-index-service-postgresql.yml -n timeouts-showca

service/data-index-service-postgresql created
deployment.apps/data-index-service-postgresql created
trigger.eventing.knative.dev/data-index-service-postgresql-processes-trigger created
trigger.eventing.knative.dev/data-index-service-postgresql-process-definition-trigger created
trigger.eventing.knative.dev/data-index-service-postgresql-process-error-trigger created
trigger.eventing.knative.dev/data-index-service-postgresql-process-node-trigger created
trigger.eventing.knative.dev/data-index-service-postgresql-process-sla-trigger created
trigger.eventing.knative.dev/data-index-service-postgresql-process-state-trigger created
trigger.eventing.knative.dev/data-index-service-postgresql-process-variable-trigger created
trigger.eventing.knative.dev/data-index-service-postgresql-jobs-trigger created
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ spec:
name: http
protocol: TCP
env:
- name: KOGITO_SERVICE_URL
value: http://data-index-service-postgresql
- name: KUBERNETES_NAMESPACE
valueFrom:
fieldRef:
Expand All @@ -76,7 +78,7 @@ spec:
value: postgresql
- name: QUARKUS_HIBERNATE_ORM_DATABASE_GENERATION
value: update
- name: QUARKUS_KAFKA_HEALTH_ENABLE
- name: QUARKUS_SMALLRYE_HEALTH_CHECK__IO_QUARKUS_KAFKA_CLIENT_HEALTH_KAFKAHEALTHCHECK__ENABLED
value: "false"
- name: QUARKUS_HTTP_CORS
value: "true"
Expand All @@ -92,12 +94,92 @@ spec:
apiVersion: eventing.knative.dev/v1
kind: Trigger
metadata:
name: data-index-service-postgresql-processes-trigger
name: data-index-service-postgresql-process-definition-trigger
spec:
broker: default
filter:
attributes:
type: ProcessInstanceEvent
type: ProcessDefinitionEvent
subscriber:
ref:
apiVersion: v1
kind: Service
name: data-index-service-postgresql
uri: /definitions
---
apiVersion: eventing.knative.dev/v1
kind: Trigger
metadata:
name: data-index-service-postgresql-process-error-trigger
spec:
broker: default
filter:
attributes:
type: ProcessInstanceErrorDataEvent
subscriber:
ref:
apiVersion: v1
kind: Service
name: data-index-service-postgresql
uri: /processes
---
apiVersion: eventing.knative.dev/v1
kind: Trigger
metadata:
name: data-index-service-postgresql-process-node-trigger
spec:
broker: default
filter:
attributes:
type: ProcessInstanceNodeDataEvent
subscriber:
ref:
apiVersion: v1
kind: Service
name: data-index-service-postgresql
uri: /processes
---
apiVersion: eventing.knative.dev/v1
kind: Trigger
metadata:
name: data-index-service-postgresql-process-sla-trigger
spec:
broker: default
filter:
attributes:
type: ProcessInstanceSLADataEvent
subscriber:
ref:
apiVersion: v1
kind: Service
name: data-index-service-postgresql
uri: /processes
---
apiVersion: eventing.knative.dev/v1
kind: Trigger
metadata:
name: data-index-service-postgresql-process-state-trigger
spec:
broker: default
filter:
attributes:
type: ProcessInstanceStateDataEvent
subscriber:
ref:
apiVersion: v1
kind: Service
name: data-index-service-postgresql
uri: /processes
---
apiVersion: eventing.knative.dev/v1
kind: Trigger
metadata:
name: data-index-service-postgresql-process-variable-trigger
spec:
broker: default
filter:
attributes:
type: ProcessInstanceVariableDataEvent
subscriber:
ref:
apiVersion: v1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: KOGITO_SERVICE_URL
value: http://jobs-service-postgresql
- name: KOGITO_JOBS_SERVICE_HTTP_JOB_STATUS_CHANGE_EVENTS
value: "true"
- name: JOBS_SERVICE_PERSISTENCE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<kogito.bom.group-id>org.kie.kogito</kogito.bom.group-id>
<kogito.bom.artifact-id>kogito-bom</kogito.bom.artifact-id>
<kogito.bom.version>999-SNAPSHOT</kogito.bom.version>
<maven.compiler.release>11</maven.compiler.release>
<maven.compiler.release>17</maven.compiler.release>
<version.compiler.plugin>3.8.1</version.compiler.plugin>
<version.surefire.plugin>3.0.0-M7</version.surefire.plugin>
<version.failsafe.plugin>${version.surefire.plugin}</version.failsafe.plugin>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@
# accessed directly. (example: "foo.example.com,bar.example.com")
#
###
FROM registry.access.redhat.com/ubi8/openjdk-11:1.11
FROM registry.access.redhat.com/ubi8/openjdk-17:1.18

ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
ENV LANGUAGE='en_US:en'


# We make four distinct layers so if there are application changes the library layers can be re-used
Expand All @@ -88,7 +88,8 @@ COPY --chown=185 target/quarkus-app/quarkus/ /deployments/quarkus/

EXPOSE 8080
USER 185
ENV AB_JOLOKIA_OFF=""
ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
ENV JAVA_OPTS_APPEND="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
ENV JAVA_APP_JAR="/deployments/quarkus-run.jar"

ENTRYPOINT [ "/opt/jboss/container/java/run/run-java.sh" ]

Original file line number Diff line number Diff line change
Expand Up @@ -75,16 +75,17 @@
# accessed directly. (example: "foo.example.com,bar.example.com")
#
###
FROM registry.access.redhat.com/ubi8/openjdk-11:1.11
FROM registry.access.redhat.com/ubi8/openjdk-17:1.18

ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
ENV LANGUAGE='en_US:en'


COPY target/lib/* /deployments/lib/
COPY target/*-runner.jar /deployments/quarkus-run.jar

EXPOSE 8080
USER 185
ENV AB_JOLOKIA_OFF=""
ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
ENV JAVA_OPTS_APPEND="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
ENV JAVA_APP_JAR="/deployments/quarkus-run.jar"

ENTRYPOINT [ "/opt/jboss/container/java/run/run-java.sh" ]
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# docker run -i --rm -p 8080:8080 quarkus/serverless-workflow-timeouts-showcase-extended
#
###
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.5
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9
WORKDIR /work/
RUN chown 1001 /work \
&& chmod "g+rwX" /work \
Expand All @@ -24,4 +24,4 @@ COPY --chown=1001:root target/*-runner /work/application
EXPOSE 8080
USER 1001

CMD ["./application", "-Dquarkus.http.host=0.0.0.0"]
ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"]
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# docker run -i --rm -p 8080:8080 quarkus/serverless-workflow-timeouts-showcase-extended
#
###
FROM quay.io/quarkus/quarkus-micro-image:1.0
FROM quay.io/quarkus/quarkus-micro-image:2.0
WORKDIR /work/
RUN chown 1001 /work \
&& chmod "g+rwX" /work \
Expand All @@ -27,4 +27,4 @@ COPY --chown=1001:root target/*-runner /work/application
EXPOSE 8080
USER 1001

CMD ["./application", "-Dquarkus.http.host=0.0.0.0"]
ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"]
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,15 @@ mp.messaging.outgoing.kogito-job-service-job-request-events.connector=quarkus-ht
mp.messaging.outgoing.kogito-job-service-job-request-events.url=${K_SINK:http://localhost:8280/v2/jobs/events}
mp.messaging.outgoing.kogito-job-service-job-request-events.method=POST

# The name of the application. This value will be used for naming Kubernetes resources like: Deployment, Service, etc.
quarkus.knative.name=timeouts-showcase-extended

# This enables Knative to fetch the image information on Minikube.
# You can change this property with -Pknative -Dquarkus.container-image.group from the command line.
quarkus.container-image.build=true
quarkus.container-image.registry=dev.local
quarkus.container-image.group=${USER}
quarkus.container-image.name=timeouts-showcase-extended
quarkus.container-image.name=${quarkus.knative.name}
quarkus.kubernetes.deployment-target=knative
quarkus.knative.image-pull-policy=if-not-present
quarkus.knative.env.vars.postgres_host=timeouts-showcase-database
Expand Down
Loading