Prepare for Doxia 2.0.0

This also fixes JXR-169
apache · Dec 2, 2022 · 2b0ef1d · 2b0ef1d
1 parent 9c334ee
commit 2b0ef1d
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 19 deletions.
diff --git a/maven-jxr-plugin/pom.xml b/maven-jxr-plugin/pom.xml
@@ -25,7 +25,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven.jxr</groupId>
     <artifactId>jxr</artifactId>
-    <version>3.3.1-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.maven.plugins</groupId>
@@ -89,12 +89,12 @@ under the License.
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-api</artifactId>
-      <version>3.1.1</version>
+      <version>4.0.0-M3</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-impl</artifactId>
-      <version>3.2.0</version>
+      <version>4.0.0-M3</version>
     </dependency>
 
     <!-- shared utils -->

diff --git a/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java b/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java
@@ -76,7 +76,7 @@ public abstract class AbstractJxrReport
     /**
      * String used at the bottom of the Xref HTML files.
      */
-    @Parameter( property = "bottom", defaultValue = "Copyright &#169; {inceptionYear}&#x2013;{currentYear} {organizationName}. All rights reserved." )
+    @Parameter( property = "bottom", defaultValue = "&#169; {inceptionYear}&#x2013;{currentYear} {organizationName}" )
     private String bottom;
 
     // CHECKSTYLE_ON: LineLength

diff --git a/maven-jxr/pom.xml b/maven-jxr/pom.xml
@@ -25,7 +25,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven.jxr</groupId>
     <artifactId>jxr</artifactId>
-    <version>3.3.1-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.maven</groupId>
@@ -89,8 +89,8 @@ under the License.
     </dependency>
     <dependency>
       <groupId>org.apache.velocity</groupId>
-      <artifactId>velocity</artifactId>
-      <version>1.7</version>
+      <artifactId>velocity-engine-core</artifactId>
+      <version>2.3</version>
     </dependency>
 
     <dependency>

diff --git a/maven-jxr/src/main/java/org/apache/maven/jxr/DirectoryIndexer.java b/maven-jxr/src/main/java/org/apache/maven/jxr/DirectoryIndexer.java
@@ -257,22 +257,18 @@ private void setProperties( VelocityEngine engine )
         if ( templateDirFile.isAbsolute() )
         {
             // the property has been overridden: need to use a FileResourceLoader
-            engine.setProperty( "resource.loader", "file" );
-            engine.setProperty( "file.resource.loader.class",
+            engine.setProperty( "resource.loaders", "file" );
+            engine.setProperty( "resource.loader.file.class",
                                 "org.apache.velocity.runtime.resource.loader.FileResourceLoader" );
-            engine.setProperty( "file.resource.loader.path", templateDirFile.toString() );
+            engine.setProperty( "resource.loader.file.path", templateDirFile.toString() );
         }
         else
         {
             // use of the default templates
-            engine.setProperty( "resource.loader", "classpath" );
-            engine.setProperty( "classpath.resource.loader.class",
+            engine.setProperty( "resource.loaders", "classpath" );
+            engine.setProperty( "resource.loader.classpath.class",
                                 "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader" );
         }
-        // avoid "unable to find resource 'VM_global_library.vm' in any resource loader."
-        engine.setProperty( "velocimacro.library", "" );
-//        engine.setProperty( Log.class.getName(), log );
-//        engine.setProperty( "runtime.log.logsystem.class", VelocityLogger.class.getName() );
     }
 
     /*

diff --git a/pom.xml b/pom.xml
@@ -31,7 +31,7 @@ under the License.
 
   <groupId>org.apache.maven.jxr</groupId>
   <artifactId>jxr</artifactId>
-  <version>3.3.1-SNAPSHOT</version>
+  <version>4.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Maven JXR Parent</name>
@@ -64,11 +64,12 @@ under the License.
 
   <properties>
     <javaVersion>8</javaVersion>
-    <sitePluginVersion>3.12.1</sitePluginVersion>
+    <slf4jVersion>1.7.36</slf4jVersion>
+    <sitePluginVersion>4.0.0-M4</sitePluginVersion>
     <javadocPluginVersion>3.4.1</javadocPluginVersion>
     <maven.site.path>jxr-archives/jxr-LATEST</maven.site.path>
     <checkstyle.violation.ignore>None</checkstyle.violation.ignore>
-    <project.build.outputTimestamp>2022-08-16T10:28:45Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2022-12-02T21:53:00Z</project.build.outputTimestamp>
   </properties>
 
   <modules>