diff --git a/parent_toplevel/changes.xml b/parent_toplevel/changes.xml index 43ca195..a604ae8 100644 --- a/parent_toplevel/changes.xml +++ b/parent_toplevel/changes.xml @@ -23,12 +23,12 @@ xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd"> - + - Update to global-parent 60. + Switch to latest maven-site-plugin and update to reflow-maven-skin 1.3.2. - Update to reflow-maven-skin 1.2.0. + Update to global-parent 60. Update testing dependencies. diff --git a/parent_toplevel/pom.xml b/parent_toplevel/pom.xml index 0423eaf..a8553c9 100644 --- a/parent_toplevel/pom.xml +++ b/parent_toplevel/pom.xml @@ -31,7 +31,7 @@ io.wcm.devops io.wcm.devops.parent_toplevel - 1.4.7-SNAPSHOT + 1.5.0-SNAPSHOT pom Toplevel Parent @@ -222,13 +222,7 @@ io.wcm.maven.skins reflow-velocity-tools - 1.0.2 - - - - org.apache.velocity - velocity - 1.7 + 1.1.0 @@ -304,18 +298,6 @@ - - - org.apache.maven.plugins - maven-site-plugin - 3.12.1 - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 3.5.0 - - diff --git a/parent_toplevel/src/site/site.xml b/parent_toplevel/src/site/site.xml index 5e8b227..742a70b 100644 --- a/parent_toplevel/src/site/site.xml +++ b/parent_toplevel/src/site/site.xml @@ -19,15 +19,12 @@ #L% --> - + xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"> - - wcm.io DevOps]]> - https://devops.wcm.io - + @@ -35,7 +32,7 @@ io.wcm.maven.skins reflow-maven-skin - 1.2.0 + 1.3.2 @@ -134,4 +131,4 @@ - + diff --git a/pom.xml b/pom.xml index b08bafc..f8f4278 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ io.wcm.devops io.wcm.devops.parent_toplevel - 1.4.6 + 1.5.0-SNAPSHOT parent_toplevel/pom.xml diff --git a/public_site/pom.xml b/public_site/pom.xml index ea98472..17729d4 100644 --- a/public_site/pom.xml +++ b/public_site/pom.xml @@ -26,7 +26,7 @@ io.wcm.devops io.wcm.devops.parent_toplevel - 1.4.6 + 1.5.0-SNAPSHOT ../parent_toplevel/pom.xml diff --git a/public_site/src/site/site.xml b/public_site/src/site/site.xml index cc02868..6919070 100644 --- a/public_site/src/site/site.xml +++ b/public_site/src/site/site.xml @@ -19,10 +19,10 @@ #L% --> - + xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"> @@ -58,4 +58,4 @@ - +