Skip to content

FORGE-593 Upgrade Document Commenting to BrXM v17 / Java 21 #13

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-593 Upgrade Document Commenting to BrXM v17 / Java 21 #13

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
4 changes: 2 additions & 2 deletions cms/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
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>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>
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>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>
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>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>
Expand Down
43 changes: 18 additions & 25 deletions demo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down Expand Up @@ -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>

Expand Down Expand Up @@ -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>
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>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>
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>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>
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>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>
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>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>
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>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>
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>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>
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>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>
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>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>
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>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>
Expand Down
14 changes: 7 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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>


Expand Down Expand Up @@ -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>

Expand All @@ -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>
Expand All @@ -192,7 +192,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<version>${junit4.version}</version>
<scope>test</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions repository/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down