Upgrading project to support brXM v15 (#39)

* Upgrading project to support brXM v15 * Upgrading demo to support brXM v15 * Fixing readme and demo pom * Updating copyright year * Updating readme
bloomreach · Apr 20, 2023 · 9338601 · 9338601
1 parent d4a5eae
commit 9338601
Show file tree

Hide file tree

Showing 8 changed files with 100 additions and 63 deletions.
diff --git a/README.md b/README.md
@@ -123,8 +123,9 @@ cd demo && mvn verify && mvn -Pcargo.run
 Start the react-csr project (PORT 3001)
 
 ```bash
-cd react-csr-example
-npm run dev 
+cd react-csr
+yarn
+yarn dev
 ```
 
 ## Configuration Editor Frontend

diff --git a/config-api/pom.xml b/config-api/pom.xml
@@ -10,7 +10,7 @@
  <artifactId>brxm-configuration-editor-api</artifactId>
 
  <properties>
- <lombok.version>1.18.12</lombok.version>
+ <lombok.version>1.18.26</lombok.version>
  </properties>
 
  <dependencies>
@@ -48,20 +48,15 @@
  <artifactId>lombok</artifactId>
  <version>${lombok.version}</version>
  </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>${cxf.version}</version>
- </dependency>
  <dependency>
  <groupId>io.swagger.core.v3</groupId>
  <artifactId>swagger-annotations</artifactId>
  <version>${swagger-annotations.version}</version>
  <scope>compile</scope>
  </dependency>
  <dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
  <version>${validation-api.version}</version>
  </dependency>
  <dependency>
@@ -82,6 +77,12 @@
  <version>${hippo.hst.version}</version>
  <scope>compile</scope>
  </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
  </dependencies>
 
  <build>

diff --git a/demo/conf/context.xml b/demo/conf/context.xml
@@ -2,7 +2,6 @@
 <Context>
  <!-- Disable session persistence across Tomcat restarts -->
  <Manager pathname=""/>
- <Resource name="jdbc/wpmDS" auth="Container" type="javax.sql.DataSource" maxTotal="100" maxIdle="10" initialSize="10" maxWaitMillis="10000" testWhileIdle="true" testOnBorrow="false" validationQuery="SELECT 1" timeBetweenEvictionRunsMillis="10000" minEvictableIdleTimeMillis="60000" username="sa" password="" driverClassName="org.h2.Driver" url="jdbc:h2:${repo.path}/wpm/wpm;AUTO_SERVER=TRUE"/>
 
  <!-- Change the default repository storage location -->
  <!--

diff --git a/demo/pom.xml b/demo/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>com.onehippo.cms7</groupId>
  <artifactId>hippo-cms7-enterprise-release</artifactId>
- <version>14.6.0</version>
+ <version>15.2.2</version>
  </parent>
 
  <name>XM Channel Config Editor Demo</name>
@@ -61,10 +61,10 @@
  <!--***START temporary override of versions*** -->
  <!-- ***END temporary override of versions*** -->
 
- <essentials.version>14.6.0</essentials.version>
+ <essentials.version>15.2.2</essentials.version>
  <jsp-api.version>2.2</jsp-api.version>
  <taglibs.version>1.2.5</taglibs.version>
- <brxm-configuration-editor.version>0.9.7-SNAPSHOT</brxm-configuration-editor.version>
+ <brxm-configuration-editor.version>0.9.7rc2-SNAPSHOT</brxm-configuration-editor.version>
 
  <development-module-deploy-dir>shared/lib</development-module-deploy-dir>
 
@@ -129,12 +129,6 @@
  <artifactId>hippo-enterprise-services</artifactId>
  <scope>provided</scope>
  </dependency>
- <dependency>
- <groupId>com.onehippo.cms7</groupId>
- <artifactId>hippo-addon-wpm-camunda</artifactId>
- <type>war</type>
- <scope>provided</scope>
- </dependency>
  </dependencies>
 
  <build>
@@ -282,6 +276,33 @@
 
  <profile>
  <id>cargo.run</id>
+ <dependencies>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
  <build>
  <plugins>
  <plugin>
@@ -355,7 +376,7 @@
  </deployables>
  <container>
  <systemProperties>
- <log4j.configurationFile>file://${project.basedir}/conf/log4j2-dev.xml</log4j.configurationFile>
+ <log4j.configurationFile>${project.basedir}/conf/log4j2-dev.xml</log4j.configurationFile>
  <!-- enables auto export and web files watch: -->
  <project.basedir>${project.basedir}</project.basedir>
  <send.usage.statistics.to.hippo>true</send.usage.statistics.to.hippo>
@@ -409,6 +430,31 @@
  <artifactId>log4j-core</artifactId>
  <scope>provided</scope>
  </dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <scope>provided</scope>
+ </dependency>
  </dependencies>
  <build>
  <defaultGoal>validate</defaultGoal>

diff --git a/...tion/src/main/resources/hcm-content/content/documents/channelconfigeditordemo/xpages.yaml b/...tion/src/main/resources/hcm-content/content/documents/channelconfigeditordemo/xpages.yaml
@@ -45,7 +45,7 @@
  hippostd:state: unpublished
  hippostdpubwf:createdBy: admin
  hippostdpubwf:creationDate: 2021-03-03T14:35:45.869+01:00
- hippostdpubwf:lastModificationDate: 2021-07-14T09:19:23.378+02:00
+ hippostdpubwf:lastModificationDate: 2023-04-03T14:12:33.871+05:30
  hippostdpubwf:lastModifiedBy: admin
  hippotranslation:id: a5fdec2d-05b8-4330-9ad6-471badf9038d
  hippotranslation:locale: en
@@ -70,33 +70,33 @@
  hst:template: essentials-carousel
  /main:
  jcr:primaryType: hst:component
- jcr:uuid: db9a4f09-4ff3-4893-bddf-cd6ecb9b08b1
+ jcr:uuid: 64a9b23a-6a5e-444a-8d95-86c1d8e3ef05
  /section-white-:
  jcr:primaryType: hst:component
- jcr:uuid: 30721d9b-a4e4-4890-a4b8-324dd6f4f583
+ jcr:uuid: 0ecc3cf4-984d-49a9-86d3-b8357dc8d987
  hst:description: White Section
  hst:parameternames: [background-color]
  hst:parametervalues: [white]
  /row-:
  jcr:primaryType: hst:component
- jcr:uuid: 0699526d-370b-4505-9e2c-8504e6157f98
+ jcr:uuid: d27a70b3-00e0-4684-ab68-a48018c635e4
  hst:description: Row
  hst:parameternames: [background-color]
  hst:parametervalues: [white]
  /85cbfc94-e09e-44b5-92ff-c085c597d139:
  jcr:primaryType: hst:containercomponent
- jcr:uuid: 9508b8f5-bbc2-4fca-a817-401d038045f8
+ jcr:uuid: 7ca0ed69-c175-4508-b143-105d4749dd28
  hippo:identifier: d99444e8-49fd-4252-b27e-1218d9afbe93
  hst:description: Column
  hst:lastmodified: 2020-08-08T06:23:11.158+02:00
  hst:lockedby: admin
- hst:lockedon: 2021-07-14T09:19:23.374+02:00
+ hst:lockedon: 2023-04-03T14:12:33.864+05:30
  hst:parameternames: [background-color]
  hst:parametervalues: [white]
  hst:xtype: hst.vbox
  /simplecontent:
  jcr:primaryType: hst:containeritemcomponent
- jcr:uuid: 8b2b447b-cafb-499d-b8c0-ce3d838fafe0
+ jcr:uuid: 985de5d8-24e9-420b-a07b-328e7a899bbd
  hst:componentclassname: org.onehippo.cms7.essentials.components.EssentialsDocumentComponent
  hst:iconpath: images/essentials/catalog-component-icons/simple-content.svg
  hst:label: Simple Content
@@ -105,41 +105,41 @@
  hst:template: contentpage-main
  /5e59ba27-c8be-4971-b783-86f551e201dc:
  jcr:primaryType: hst:containercomponent
- jcr:uuid: deaf4217-77bc-4c46-a6fa-1eb016c5861c
+ jcr:uuid: 94dcbf5c-a572-4e71-9a3f-5f7e3096a581
  hippo:identifier: d99444e8-49fd-4252-b27e-1218d9afbe93
  hst:description: Column
  hst:lastmodified: 2020-08-08T06:23:11.158+02:00
  hst:lockedby: admin
- hst:lockedon: 2021-07-14T09:19:23.375+02:00
+ hst:lockedon: 2023-04-03T14:12:33.865+05:30
  hst:parameternames: [background-color]
  hst:parametervalues: [white]
  hst:xtype: hst.vbox
  /section-grey-:
  jcr:primaryType: hst:component
- jcr:uuid: 56883aba-231f-4370-b714-d448a6bb9ddb
+ jcr:uuid: 0b061d4c-9c4f-4750-8fea-f888c8670ca8
  hst:description: Grey Section
  hst:parameternames: [background-color, pageType]
  hst:parametervalues: [grey, bar]
  /row-:
  jcr:primaryType: hst:component
- jcr:uuid: 1fb9eae1-eeb2-46fa-ad7b-a9ecf7b4f174
+ jcr:uuid: ba79b070-5633-4b0e-8b8d-76606449e7e5
  hst:description: Row
  hst:parameternames: [background-color, pageType]
  hst:parametervalues: [grey, bar]
  /f502acbc-2c98-48fe-8a7a-45feb427665c:
  jcr:primaryType: hst:containercomponent
- jcr:uuid: 2db063c5-710c-4084-8305-40b832cc7a9a
+ jcr:uuid: 43c8937a-3504-4a83-8c75-41612fc21912
  hippo:identifier: d99444e8-49fd-4252-b27e-1218d9afbe93
  hst:description: Column
  hst:lastmodified: 2020-08-08T06:23:11.158+02:00
  hst:lockedby: admin
- hst:lockedon: 2021-07-14T09:19:23.376+02:00
+ hst:lockedon: 2023-04-03T14:12:33.867+05:30
  hst:parameternames: [background-color, pageType]
  hst:parametervalues: [grey, bar]
  hst:xtype: hst.vbox
  /banner:
  jcr:primaryType: hst:containeritemcomponent
- jcr:uuid: 806f634f-941f-4aa7-8b32-1f82e969e65a
+ jcr:uuid: 273085e7-938e-4fed-96b9-1fc70678eecf
  hst:componentclassname: org.onehippo.cms7.essentials.components.EssentialsBannerComponent
  hst:iconpath: images/essentials/catalog-component-icons/banner.svg
  hst:label: Banner
@@ -148,18 +148,18 @@
  hst:template: essentials-banner
  /10158ba5-99a7-4dec-bbeb-f495c33ca9b5:
  jcr:primaryType: hst:containercomponent
- jcr:uuid: 180415b3-086a-4bab-a551-1606582809b7
+ jcr:uuid: bc582840-33eb-4876-bf8c-97ba39ee9db7
  hippo:identifier: d99444e8-49fd-4252-b27e-1218d9afbe93
  hst:description: Column
  hst:lastmodified: 2020-08-08T06:23:11.158+02:00
  hst:lockedby: admin
- hst:lockedon: 2021-07-14T09:19:23.377+02:00
+ hst:lockedon: 2023-04-03T14:12:33.869+05:30
  hst:parameternames: [background-color, pageType]
  hst:parametervalues: [grey, bar]
  hst:xtype: hst.vbox
  /banner:
  jcr:primaryType: hst:containeritemcomponent
- jcr:uuid: 1899da6a-d9fe-4e5e-a338-5aaed0698ced
+ jcr:uuid: 2e692776-3ed7-4e52-80bb-7616dbc8910b
  hst:componentclassname: org.onehippo.cms7.essentials.components.EssentialsBannerComponent
  hst:iconpath: images/essentials/catalog-component-icons/banner.svg
  hst:label: Banner
@@ -612,13 +612,13 @@
  hst:parameternames: [background-color]
  hst:parametervalues: [white]
  hst:xtype: hst.vbox
- /testunive-sales:
+ /test-sales:
  jcr:primaryType: hippo:handle
  jcr:mixinTypes: ['hippo:named', 'hippo:versionInfo', 'mix:referenceable']
  jcr:uuid: fdbee8ef-b827-4c7a-bcb3-5af42c8824f2
- hippo:name: testunive sales
- hippo:versionHistory: 8736bfe5-92dd-45ec-ae3b-b3741a0aab72
- /testunive-sales[1]:
+ hippo:name: test sales
+ hippo:versionHistory: f4f94333-6611-464b-99e0-ae2a3b351b91
+ /test-sales[1]:
  jcr:primaryType: channelconfigeditordemo:contentdocument
  jcr:mixinTypes: ['hst:xpagemixin', 'mix:referenceable']
  jcr:uuid: 4c30e7fe-4ed1-4491-ad13-43b08e93da4a
@@ -639,7 +639,7 @@
  /channelconfigeditordemo:content:
  jcr:primaryType: hippostd:html
  hippostd:content: ''
- /testunive-sales[2]:
+ /test-sales[2]:
  jcr:primaryType: channelconfigeditordemo:contentdocument
  jcr:mixinTypes: ['hst:xpagemixin', 'mix:referenceable', 'mix:versionable']
  jcr:uuid: eb2e0910-a9ad-4703-a50b-8968e9e7b48a

diff --git a/demo/src/main/assembly/webapps-component.xml b/demo/src/main/assembly/webapps-component.xml
@@ -12,15 +12,4 @@
  <destName>site.war</destName>
  </file>
  </files>
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>webapps</outputDirectory>
- <outputFileNameMapping>bpm.war</outputFileNameMapping>
- <scope>provided</scope>
- <includes>
- <include>com.onehippo.cms7:hippo-addon-wpm-camunda:war</include>
- </includes>
- </dependencySet>
- </dependencySets>
 </component>
diff --git a/demo/src/main/docker/scripts/tomcat/setenv.sh b/demo/src/main/docker/scripts/tomcat/setenv.sh
@@ -31,7 +31,7 @@ L4J_OPTS="-Dlog4j.configurationFile=file://${CATALINA_HOME}/conf/log4j2.xml -DLo
 JVM_OPTS="-server -Xms${JAVA_MINHEAP} -Xmx${JAVA_MAXHEAP} -XX:+UseG1GC -Djava.util.Arrays.useLegacyMergeSort=true"
 
 # JVM garbage Collector options
-VGC_OPTS="-verbosegc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:${CATALINA_HOME}/logs/gc.log -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=2048k"
+VGC_OPTS="-Xlog:gc+ergo*:file=${CATALINA_BASE}/logs/gc.log:time:filecount=5,filesize=2048k"
 
 # JVM heapdump options
 DMP_OPTS="-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${CATALINA_HOME}/temp"

diff --git a/pom.xml b/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright 2020 Bloomreach (http://www.bloomreach.com)
+ Copyright 2023 Bloomreach (http://www.bloomreach.com)
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
  <parent>
  <groupId>org.onehippo.cms7</groupId>
  <artifactId>hippo-cms7-project</artifactId>
- <version>14.6.0</version>
+ <version>15.2.2</version>
  </parent>
 
  <groupId>com.bloomreach.xm</groupId>
@@ -31,12 +31,13 @@
  <packaging>pom</packaging>
 
  <properties>
- <hippo.hst.version>14.6.0</hippo.hst.version>
- <hippo.repository.version>14.6.0</hippo.repository.version>
- <hippo.services.version>14.6.0</hippo.services.version>
- <cxf.version>3.3.5</cxf.version>
- <swagger-annotations.version>2.0.10</swagger-annotations.version>
- <validation-api.version>2.0.1.Final</validation-api.version>
+ <hippo.hst.version>15.2.2</hippo.hst.version>
+ <hippo.repository.version>15.2.2</hippo.repository.version>
+ <hippo.services.version>15.2.2</hippo.services.version>
+ <cxf.version>4.0.0</cxf.version>
+ <swagger-annotations.version>2.2.8</swagger-annotations.version>
+ <validation-api.version>3.0.2</validation-api.version>
+ <junit.version>4.13.2</junit.version>
  </properties>
 
  <developers>