Skip to content

FORGE-599 upgrade camel-events-support to BrXM 17.0.0, Java 21 and Camel 4.20.0 #28

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

Open
joeyliechty wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

FORGE-599 upgrade camel-events-support to BrXM 17.0.0, Java 21 and Camel 4.20.0 #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion demo/cms-dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.bloomreach.forge.camel-hippoevt</groupId>
<artifactId>camel-hippoevt-demo</artifactId>
<version>5.3.1-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>camel-hippoevt-demo-cms-dependencies</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion demo/cms/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.bloomreach.forge.camel-hippoevt</groupId>
<artifactId>camel-hippoevt-demo</artifactId>
<version>5.3.1-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>camel-hippoevt-demo-cms</artifactId>
<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion demo/cms/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ search.engine = solr
routes.mode = file
#routes.mode = queue

camel.springboot.routes-include-pattern=classpath:routes/${routes.mode:file}/*.xml
camel.main.routes-include-pattern=classpath:routes/file/*.xml
12 changes: 11 additions & 1 deletion demo/conf/log4j2-dev.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,17 @@
<Logger name="org.hippoecm.hst.content.beans.dynamic" level="info"/>
<Logger name="org.hippoecm.hst.content.beans.builder" level="info"/>

<!-- project logging -->
<!-- Camel framework: route loading, context startup, component discovery -->
<Logger name="org.apache.camel" level="info"/>
<!-- Camel route loading internals -->
<Logger name="org.apache.camel.impl.engine.DefaultRoutesLoader" level="debug"/>
<Logger name="org.apache.camel.dsl" level="debug"/>
<Logger name="org.apache.camel.spring.boot.CamelAutoConfiguration" level="debug"/>

<!-- forge plugin: consumer registration with HippoEventListenerRegistry -->
<Logger name="org.onehippo.forge.camel" level="info"/>

<!-- project logging: Camel log: endpoint output from the demo routes -->
<Logger name="com.bloomreach.forge.camel.demo" level="debug"/>

<Root level="warn">
Expand Down
2 changes: 1 addition & 1 deletion demo/essentials/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.bloomreach.forge.camel-hippoevt</groupId>
<artifactId>camel-hippoevt-demo</artifactId>
<version>5.3.1-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>camel-hippoevt-demo-essentials</artifactId>
<packaging>war</packaging>
Expand Down
9 changes: 5 additions & 4 deletions demo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@
<parent>
<groupId>org.onehippo.cms7</groupId>
<artifactId>hippo-cms7-release</artifactId>
<version>16.7.0</version>
<version>17.0.0</version>
<relativePath/>
</parent>

<name>Bloomreach Camel Event Bus Demo</name>
<description>Bloomreach Camel Event Bus Demo</description>
<groupId>com.bloomreach.forge.camel-hippoevt</groupId>
<artifactId>camel-hippoevt-demo</artifactId>
<version>5.3.1-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<!--
Expand Down Expand Up @@ -64,15 +65,15 @@
<!-- ***END temporary override of versions*** -->

<forge.camel-hippoevt.version>${project.version}</forge.camel-hippoevt.version>
<camel.version>4.14.4</camel.version>
<camel.version>4.20.0</camel.version>
<activemq.version>6.1.3</activemq.version>

<httpcore4-version>4.4.14</httpcore4-version>
<httpclient4-version>4.5.13</httpclient4-version>

<jcip-annotations.version>1.0</jcip-annotations.version>

<essentials.version>16.7.0</essentials.version>
<essentials.version>17.0.0</essentials.version>

<development-module-deploy-dir>shared/lib</development-module-deploy-dir>

Expand Down
2 changes: 1 addition & 1 deletion demo/repository-data/application/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.bloomreach.forge.camel-hippoevt</groupId>
<artifactId>camel-hippoevt-demo-repository-data</artifactId>
<version>5.3.1-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<name>Bloomreach Camel Event Bus Demo Repository Data For Application</name>
Expand Down
2 changes: 1 addition & 1 deletion demo/repository-data/development/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.bloomreach.forge.camel-hippoevt</groupId>
<artifactId>camel-hippoevt-demo-repository-data</artifactId>
<version>5.3.1-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<name>Bloomreach Camel Event Bus Demo Repository Data For Development</name>
Expand Down
2 changes: 1 addition & 1 deletion demo/repository-data/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.bloomreach.forge.camel-hippoevt</groupId>
<artifactId>camel-hippoevt-demo</artifactId>
<version>5.3.1-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<name>Bloomreach Camel Event Bus Demo Repository Data</name>
Expand Down
2 changes: 1 addition & 1 deletion demo/repository-data/site-development/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.bloomreach.forge.camel-hippoevt</groupId>
<artifactId>camel-hippoevt-demo-repository-data</artifactId>
<version>5.3.1-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<name>Bloomreach Camel Event Bus Demo Repository Data For Site Development</name>
Expand Down
2 changes: 1 addition & 1 deletion demo/repository-data/site/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.bloomreach.forge.camel-hippoevt</groupId>
<artifactId>camel-hippoevt-demo-repository-data</artifactId>
<version>5.3.1-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<name>Bloomreach Camel Event Bus Demo Repository Data For Site</name>
Expand Down
2 changes: 1 addition & 1 deletion demo/repository-data/webfiles/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.bloomreach.forge.camel-hippoevt</groupId>
<artifactId>camel-hippoevt-demo-repository-data</artifactId>
<version>5.3.1-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<name>Bloomreach Camel Event Bus Demo Repository Data Web Files</name>
Expand Down
2 changes: 1 addition & 1 deletion demo/site/components/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.bloomreach.forge.camel-hippoevt</groupId>
<artifactId>camel-hippoevt-demo-site</artifactId>
<version>5.3.1-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>camel-hippoevt-demo-components</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion demo/site/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.bloomreach.forge.camel-hippoevt</groupId>
<artifactId>camel-hippoevt-demo</artifactId>
<version>5.3.1-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>camel-hippoevt-demo-site</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion demo/site/webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.bloomreach.forge.camel-hippoevt</groupId>
<artifactId>camel-hippoevt-demo-site</artifactId>
<version>5.3.1-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>camel-hippoevt-demo-webapp</artifactId>
<packaging>war</packaging>
Expand Down
22 changes: 7 additions & 15 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,21 @@
<parent>
<groupId>org.onehippo.cms7</groupId>
<artifactId>hippo-cms7-project</artifactId>
<version>16.7.0</version>
<version>17.0.0</version>
</parent>

<name>Bloomreach Camel Event Bus Support</name>
<description>Bloomreach Camel Event Bus Support</description>
<groupId>com.bloomreach.forge.camel-hippoevt</groupId>
<artifactId>camel-hippoevt</artifactId>
<version>5.3.1-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
<url>https://github.com/bloomreach-forge/camel-events-support/</url>

<properties>

<project.build.javaVersion>17</project.build.javaVersion>
<project.build.javaVersion>21</project.build.javaVersion>

<camel.version>4.14.4</camel.version>
<camel.version>4.20.0</camel.version>

<plugin.jxr.version>3.5.0</plugin.jxr.version>
<plugin.pmd.version>3.25.0</plugin.pmd.version>
Expand Down Expand Up @@ -81,7 +81,7 @@
</distributionManagement>

<issueManagement>
<url>https://issues.onehippo.com/projects/FORGE</url>
<url>https://bloomreach.atlassian.net/jira/software/projects/FORGE</url>
</issueManagement>

<repositories>
Expand Down Expand Up @@ -170,9 +170,8 @@
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j2.version}</version>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
<scope>test</scope>
</dependency>

Expand All @@ -183,13 +182,6 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
Expand Down
Loading