diff --git a/cms/pom.xml b/cms/pom.xml
index 579b4ff..d9455a6 100644
--- a/cms/pom.xml
+++ b/cms/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.bloomreach.forge.doc-commenting</groupId>
     <artifactId>doc-commenting</artifactId>
-    <version>7.0.2-SNAPSHOT</version>
+    <version>8.0.0-SNAPSHOT</version>
   </parent>
 
   <name>Bloomreach XM Document Commenting Plugin - CMS</name>
@@ -88,7 +88,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j-impl</artifactId>
+      <artifactId>log4j-slf4j2-impl</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/demo/cms-dependencies/pom.xml b/demo/cms-dependencies/pom.xml
index ed81676..a829c31 100644
--- a/demo/cms-dependencies/pom.xml
+++ b/demo/cms-dependencies/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.bloomreach.forge.doc-commenting</groupId>
     <artifactId>doccommentingdemo</artifactId>
-    <version>7.0.2-SNAPSHOT</version>
+    <version>8.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>doccommentingdemo-cms-dependencies</artifactId>
   <packaging>pom</packaging>
diff --git a/demo/cms/pom.xml b/demo/cms/pom.xml
index 2620659..14faa75 100644
--- a/demo/cms/pom.xml
+++ b/demo/cms/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.bloomreach.forge.doc-commenting</groupId>
     <artifactId>doccommentingdemo</artifactId>
-    <version>7.0.2-SNAPSHOT</version>
+    <version>8.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>doccommentingdemo-cms</artifactId>
   <packaging>war</packaging>
diff --git a/demo/essentials/pom.xml b/demo/essentials/pom.xml
index 48dba23..ce8b43b 100644
--- a/demo/essentials/pom.xml
+++ b/demo/essentials/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.bloomreach.forge.doc-commenting</groupId>
     <artifactId>doccommentingdemo</artifactId>
-    <version>7.0.2-SNAPSHOT</version>
+    <version>8.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>doccommentingdemo-essentials</artifactId>
   <packaging>war</packaging>
diff --git a/demo/pom.xml b/demo/pom.xml
index 4043566..6381475 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -2,26 +2,36 @@
 <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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <parent>
+  <!-- Switch parent to run demo as community project (remove the 'enterprise' profile from ~/.m2/settings.xml) -->
+  <!--parent>
     <groupId>org.onehippo.cms7</groupId>
     <artifactId>hippo-cms7-release</artifactId>
-    <version>16.2.0</version>
-  </parent>
+    <version>17.0.0</version>
+  </parent-->
 
   <!-- Switch parent to run demo as enterprise project (make sure to build with additional profile 'enterprise') -->
-  <!--parent>
+  <parent>
     <groupId>com.onehippo.cms7</groupId>
     <artifactId>hippo-cms7-enterprise-release</artifactId>
-    <version>16.2.0</version>
-  </parent-->
+    <version>17.0.0</version>
+    <relativePath/>
+  </parent>
 
   <name>Bloomreach Document Commenting Plugin Demo</name>
   <description>Bloomreach Document Commenting Plugin Demo</description>
   <groupId>org.bloomreach.forge.doc-commenting</groupId>
   <artifactId>doccommentingdemo</artifactId>
-  <version>7.0.2-SNAPSHOT</version>
+  <version>8.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
+  <modules>
+    <module>cms-dependencies</module>
+    <module>repository-data</module>
+    <module>cms</module>
+    <module>site</module>
+    <module>essentials</module>
+  </modules>
+
   <!--
     The below project elements are emptied/overridden as otherwise their metadata would be
     inherited or merged from the parent hippo-cms7-release pom (or its hippo-cms7-project pom).
@@ -70,7 +80,7 @@
     <!--***START temporary override of versions*** -->
     <!-- ***END temporary override of versions*** -->
 
-    <essentials.version>16.0.0</essentials.version>
+    <essentials.version>17.0.0</essentials.version>
 
     <development-module-deploy-dir>shared/lib</development-module-deploy-dir>
 
@@ -198,23 +208,6 @@
       </repositories>
     </profile>
 
-    <profile>
-      <id>default</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-        <property>
-          <name>jrebel</name>
-        </property>
-      </activation>
-      <modules>
-        <module>cms-dependencies</module>
-        <module>repository-data</module>
-        <module>cms</module>
-        <module>site</module>
-        <module>essentials</module>
-      </modules>
-    </profile>
-
     <profile>
       <id>docker.build</id>
       <dependencies>
diff --git a/demo/repository-data/application/pom.xml b/demo/repository-data/application/pom.xml
index 0944dce..5ca3d4f 100644
--- a/demo/repository-data/application/pom.xml
+++ b/demo/repository-data/application/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.bloomreach.forge.doc-commenting</groupId>
     <artifactId>doccommentingdemo-repository-data</artifactId>
-    <version>7.0.2-SNAPSHOT</version>
+    <version>8.0.0-SNAPSHOT</version>
   </parent>
 
   <name>Bloomreach Document Commenting Plugin Demo Repository Data For Application</name>
diff --git a/demo/repository-data/development/pom.xml b/demo/repository-data/development/pom.xml
index e1af1e6..88cfd7d 100644
--- a/demo/repository-data/development/pom.xml
+++ b/demo/repository-data/development/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.bloomreach.forge.doc-commenting</groupId>
     <artifactId>doccommentingdemo-repository-data</artifactId>
-    <version>7.0.2-SNAPSHOT</version>
+    <version>8.0.0-SNAPSHOT</version>
   </parent>
 
   <name>Bloomreach Document Commenting Plugin Demo Repository Data For Development</name>
diff --git a/demo/repository-data/pom.xml b/demo/repository-data/pom.xml
index 6c15346..53000c2 100644
--- a/demo/repository-data/pom.xml
+++ b/demo/repository-data/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.bloomreach.forge.doc-commenting</groupId>
     <artifactId>doccommentingdemo</artifactId>
-    <version>7.0.2-SNAPSHOT</version>
+    <version>8.0.0-SNAPSHOT</version>
   </parent>
 
   <name>Bloomreach Document Commenting Plugin Demo Repository Data</name>
diff --git a/demo/repository-data/site-development/pom.xml b/demo/repository-data/site-development/pom.xml
index a6b0d74..db22c18 100644
--- a/demo/repository-data/site-development/pom.xml
+++ b/demo/repository-data/site-development/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.bloomreach.forge.doc-commenting</groupId>
     <artifactId>doccommentingdemo-repository-data</artifactId>
-    <version>7.0.2-SNAPSHOT</version>
+    <version>8.0.0-SNAPSHOT</version>
   </parent>
 
   <name>Bloomreach Document Commenting Plugin Demo Repository Data For Site Development</name>
diff --git a/demo/repository-data/site/pom.xml b/demo/repository-data/site/pom.xml
index 60e4fad..bcf5816 100644
--- a/demo/repository-data/site/pom.xml
+++ b/demo/repository-data/site/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.bloomreach.forge.doc-commenting</groupId>
     <artifactId>doccommentingdemo-repository-data</artifactId>
-    <version>7.0.2-SNAPSHOT</version>
+    <version>8.0.0-SNAPSHOT</version>
   </parent>
 
   <name>Bloomreach Document Commenting Plugin Demo Repository Data For Site</name>
diff --git a/demo/repository-data/webfiles/pom.xml b/demo/repository-data/webfiles/pom.xml
index 9bae11d..6065651 100644
--- a/demo/repository-data/webfiles/pom.xml
+++ b/demo/repository-data/webfiles/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.bloomreach.forge.doc-commenting</groupId>
     <artifactId>doccommentingdemo-repository-data</artifactId>
-    <version>7.0.2-SNAPSHOT</version>
+    <version>8.0.0-SNAPSHOT</version>
   </parent>
 
   <name>Bloomreach Document Commenting Plugin Demo Repository Data Web Files</name>
diff --git a/demo/site/components/pom.xml b/demo/site/components/pom.xml
index 5e72ff9..5c10201 100644
--- a/demo/site/components/pom.xml
+++ b/demo/site/components/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.bloomreach.forge.doc-commenting</groupId>
     <artifactId>doccommentingdemo-site</artifactId>
-    <version>7.0.2-SNAPSHOT</version>
+    <version>8.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>doccommentingdemo-components</artifactId>
   <packaging>jar</packaging>
diff --git a/demo/site/pom.xml b/demo/site/pom.xml
index d4db6a6..072098a 100644
--- a/demo/site/pom.xml
+++ b/demo/site/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.bloomreach.forge.doc-commenting</groupId>
     <artifactId>doccommentingdemo</artifactId>
-    <version>7.0.2-SNAPSHOT</version>
+    <version>8.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>doccommentingdemo-site</artifactId>
   <packaging>pom</packaging>
diff --git a/demo/site/webapp/pom.xml b/demo/site/webapp/pom.xml
index ade8970..0e78d88 100644
--- a/demo/site/webapp/pom.xml
+++ b/demo/site/webapp/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.bloomreach.forge.doc-commenting</groupId>
     <artifactId>doccommentingdemo-site</artifactId>
-    <version>7.0.2-SNAPSHOT</version>
+    <version>8.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>doccommentingdemo-webapp</artifactId>
   <packaging>war</packaging>
diff --git a/pom.xml b/pom.xml
index 6de4839..397c047 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,14 +16,14 @@
   <parent>
     <groupId>org.onehippo.cms7</groupId>
     <artifactId>hippo-cms7-project</artifactId>
-    <version>16.2.0</version>
+    <version>17.0.0</version>
   </parent>
 
   <name>Bloomreach XM Document Commenting Plugin</name>
   <description>Bloomreach XM Document Commenting Plugin</description>
   <groupId>org.bloomreach.forge.doc-commenting</groupId>
   <artifactId>doc-commenting</artifactId>
-  <version>7.0.2-SNAPSHOT</version>
+  <version>8.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <url>https://bloomreach-forge.github.io/document-commenting</url>
 
@@ -71,7 +71,7 @@
 
   <issueManagement>
     <system>Jira</system>
-    <url>https://issues.onehippo.com/browse/HIPFORGE</url>
+    <url>https://bloomreach.atlassian.net/browse/FORGE</url>
   </issueManagement>
 
 
@@ -137,7 +137,7 @@
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
-        <version>${slf4j.version}</version>
+        <version>${slf4j2.version}</version>
         <scope>provided</scope>
       </dependency>
 
@@ -160,12 +160,12 @@
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>jcl-over-slf4j</artifactId>
-        <version>${slf4j.version}</version>
+        <version>${slf4j2.version}</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
-        <artifactId>log4j-slf4j-impl</artifactId>
+        <artifactId>log4j-slf4j2-impl</artifactId>
         <version>${log4j2.version}</version>
         <scope>test</scope>
       </dependency>
@@ -192,7 +192,7 @@
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>${junit.version}</version>
+        <version>${junit4.version}</version>
         <scope>test</scope>
       </dependency>
 
diff --git a/repository/pom.xml b/repository/pom.xml
index c747de1..5f06a77 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.bloomreach.forge.doc-commenting</groupId>
     <artifactId>doc-commenting</artifactId>
-    <version>7.0.2-SNAPSHOT</version>
+    <version>8.0.0-SNAPSHOT</version>
   </parent>
 
   <name>Bloomreach XM Document Commenting Plugin - Repository</name>
@@ -64,7 +64,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j-impl</artifactId>
+      <artifactId>log4j-slf4j2-impl</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>