You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/12/02 21:51:42 UTC
[maven-jxr] branch doxia-2.0.0 updated (3af2107 -> 57c8993)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch doxia-2.0.0
in repository https://gitbox.apache.org/repos/asf/maven-jxr.git
omit 3af2107 Prepare for Doxia 2.0.0
add 92a5d69 Add JUnit reports for m-invoker-p
add f2c0657 [JXR-173] Upgrade Maven Reporting API to 3.1.1/Maven Reporting Impl to 3.2.0
add 2313f3a [JXR-174] Revert JXR-157 until next major version
add 15d6b39 [maven-release-plugin] prepare release jxr-3.3.0
add 6f7d872 [maven-release-plugin] prepare for next development iteration
add 3a2e4bf [JXR-175] Support Java 14 record as class type in cross reference
add 05e25ef Fix/update/add Javadoc documentation
add 6e00987 [JXR-176] - Remove dependency org.apache.commons:commons-lang3
add 9c334ee add Reproducible Builds badge
new 57c8993 Prepare for Doxia 2.0.0
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (3af2107)
\
N -- N -- N refs/heads/doxia-2.0.0 (57c8993)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
README.md | 1 +
maven-jxr-plugin/pom.xml | 16 ++-
.../apache/maven/plugin/jxr/AbstractJxrReport.java | 21 ++--
.../apache/maven/plugin/jxr/JxrNoForkReport.java | 1 -
.../org/apache/maven/plugin/jxr/JxrReport.java | 3 +-
.../org/apache/maven/plugin/jxr/JxrReportUtil.java | 26 ++--
.../maven/plugin/jxr/JxrTestNoForkReport.java | 3 +-
.../org/apache/maven/plugin/jxr/JxrTestReport.java | 1 -
.../maven/plugin/jxr/AbstractJxrTestCase.java | 4 +-
.../plugin/jxr/DependencyArtifactStubFactory.java | 4 +-
.../maven/plugin/jxr/stubs/JxrProjectStub.java | 19 +++
maven-jxr/pom.xml | 7 +-
.../org/apache/maven/jxr/DirectoryIndexer.java | 116 +++++++++--------
.../src/main/java/org/apache/maven/jxr/JXR.java | 73 ++++++-----
.../org/apache/maven/jxr/JavaCodeTransform.java | 138 ++++++++++-----------
.../java/org/apache/maven/jxr/JxrException.java | 1 -
.../java/org/apache/maven/jxr/pacman/BaseType.java | 4 +-
.../org/apache/maven/jxr/pacman/ClassType.java | 18 ++-
.../org/apache/maven/jxr/pacman/FileManager.java | 17 ++-
.../org/apache/maven/jxr/pacman/ImportType.java | 18 +--
.../java/org/apache/maven/jxr/pacman/JavaFile.java | 54 +++++---
.../org/apache/maven/jxr/pacman/JavaFileImpl.java | 27 ++--
.../apache/maven/jxr/pacman/PackageManager.java | 21 ++--
.../org/apache/maven/jxr/pacman/PackageType.java | 19 ++-
.../apache/maven/jxr/util/SimpleWordTokenizer.java | 17 +--
.../org/apache/maven/jxr/util/StringEntry.java | 18 ++-
.../org/apache/maven/jxr/IncludeExcludeTest.java | 7 +-
.../apache/maven/jxr/JavaCodeTransformTest.java | 3 -
.../apache/maven/jxr/pacman/JavaFileImplTest.java | 11 ++
.../org/apache/maven/jxr/pacman/Java14Record.java} | 10 ++
pom.xml | 14 +--
31 files changed, 388 insertions(+), 304 deletions(-)
copy maven-jxr/src/test/{java/org/apache/maven/jxr/package-info.java => resources/jxr175/org/apache/maven/jxr/pacman/Java14Record.java} (85%)
[maven-jxr] 01/01: Prepare for Doxia 2.0.0
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch doxia-2.0.0
in repository https://gitbox.apache.org/repos/asf/maven-jxr.git
commit 57c89930ead0a504e0481a1d9ff37ef1cd1c5572
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Fri Dec 2 22:50:59 2022 +0100
Prepare for Doxia 2.0.0
This also fixes JXR-169
---
maven-jxr-plugin/pom.xml | 4 ++--
maven-jxr/pom.xml | 4 ++--
.../main/java/org/apache/maven/jxr/DirectoryIndexer.java | 14 +++++---------
pom.xml | 3 ++-
4 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/maven-jxr-plugin/pom.xml b/maven-jxr-plugin/pom.xml
index 226b9ed..355174c 100644
--- a/maven-jxr-plugin/pom.xml
+++ b/maven-jxr-plugin/pom.xml
@@ -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/pom.xml b/maven-jxr/pom.xml
index 06a921b..0a90a5c 100644
--- a/maven-jxr/pom.xml
+++ b/maven-jxr/pom.xml
@@ -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
index ea2710e..17975c6 100644
--- 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 @@ public class DirectoryIndexer
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
index dfdac2a..eb37e55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,8 @@ 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>