You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2020/07/05 12:30:11 UTC
[maven-doxia-sitetools] branch master updated (1b301e6 -> ea98c2b)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git.
from 1b301e6 [DOXIASITETOOLS-219] Fix javadoc issues with JDK 8 when generating documentation
new b88de2b [DOXIASITETOOLS-219] Convert Plexus javadoc to annotations
new ea98c2b Cleanup pom
The 2 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:
doxia-doc-renderer/pom.xml | 44 ++++++----------------
.../docrenderer/itext/AbstractITextRender.java | 9 ++---
pom.xml | 42 ++++++---------------
3 files changed, 27 insertions(+), 68 deletions(-)
[maven-doxia-sitetools] 01/02: [DOXIASITETOOLS-219] Convert Plexus
javadoc to annotations
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git
commit b88de2b3b51efe6512ab8a5a2754099e1787fc1a
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Jul 5 13:03:52 2020 +0200
[DOXIASITETOOLS-219] Convert Plexus javadoc to annotations
---
doxia-doc-renderer/pom.xml | 13 -------------
.../maven/doxia/docrenderer/itext/AbstractITextRender.java | 9 +++------
2 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/doxia-doc-renderer/pom.xml b/doxia-doc-renderer/pom.xml
index d3768fa..ce99b22 100644
--- a/doxia-doc-renderer/pom.xml
+++ b/doxia-doc-renderer/pom.xml
@@ -133,19 +133,6 @@ under the License.
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <tags>
- <tag>
- <name>plexus.requirement</name>
- <placement>f</placement>
- </tag>
- </tags>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!-- To be sure that JVM will implement AWT in software -->
diff --git a/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/itext/AbstractITextRender.java b/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/itext/AbstractITextRender.java
index c18545e..50151e0 100644
--- a/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/itext/AbstractITextRender.java
+++ b/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/itext/AbstractITextRender.java
@@ -56,6 +56,7 @@ import org.apache.maven.doxia.parser.module.ParserModuleManager;
import org.apache.maven.doxia.parser.ParseException;
import org.apache.maven.doxia.parser.manager.ParserNotFoundException;
import org.apache.xml.utils.DefaultErrorHandler;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
@@ -87,14 +88,10 @@ public abstract class AbstractITextRender
private static final DocumentBuilderFactory DOCUMENT_BUILDER_FACTORY = DocumentBuilderFactory.newInstance();
- /**
- * @plexus.requirement
- */
+ @Requirement
protected ParserModuleManager parserModuleManager;
- /**
- * @plexus.requirement
- */
+ @Requirement
protected Doxia doxia;
static
[maven-doxia-sitetools] 02/02: Cleanup pom
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git
commit ea98c2ba066f96f00c5442e0e7ddf77a8228885d
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Jul 5 13:13:00 2020 +0200
Cleanup pom
- remove duplicated sections with parent
- use newer plugins versions
---
doxia-doc-renderer/pom.xml | 31 ++++++++++++-------------------
pom.xml | 42 ++++++++++++------------------------------
2 files changed, 24 insertions(+), 49 deletions(-)
diff --git a/doxia-doc-renderer/pom.xml b/doxia-doc-renderer/pom.xml
index ce99b22..da2a5bd 100644
--- a/doxia-doc-renderer/pom.xml
+++ b/doxia-doc-renderer/pom.xml
@@ -57,6 +57,18 @@ under the License.
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-fo</artifactId>
<version>${doxiaVersion}</version>
+ <!-- TODO remove with upgrade to 1.9.2 -->
+ <exclusions>
+ <!-- exclude JAI - missing on Maven Central -->
+ <exclusion>
+ <groupId>javax.media</groupId>
+ <artifactId>jai-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.media</groupId>
+ <artifactId>jai-codec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- The modules are not in doxia core anymore so you have to state a dependency so that
the component descriptor gets picked up. -->
@@ -144,25 +156,6 @@ under the License.
</systemProperties>
</configuration>
</plugin>
- <plugin><!-- TODO remove when minimum Java set to 7 -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-bytecode-version</id>
- <configuration>
- <rules>
- <enforceBytecodeVersion>
- <excludes>
- <exclude>org.apache.maven.doxia:doxia-module-markdown</exclude>
- <exclude>org.nibor.autolink:autolink</exclude>
- </excludes>
- </enforceBytecodeVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
diff --git a/pom.xml b/pom.xml
index f1cf8c0..0c19bae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
<version>34</version>
- <relativePath>../../pom/maven/pom.xml</relativePath>
+ <relativePath />
</parent>
<groupId>org.apache.maven.doxia</groupId>
@@ -69,7 +69,6 @@ under the License.
</distributionManagement>
<properties>
- <javaVersion>7</javaVersion>
<doxiaVersion>1.9.1</doxiaVersion>
<maven.site.path>doxia-sitetools-archives/doxia-sitetools-LATEST</maven.site.path>
<project.build.outputTimestamp>2020-02-19T07:03:09Z</project.build.outputTimestamp>
@@ -241,6 +240,16 @@ under the License.
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.2.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>3.1.0</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -281,33 +290,6 @@ under the License.
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-bytecode-version</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <enforceBytecodeVersion>
- <maxJdkVersion>${maven.compiler.target}</maxJdkVersion>
- </enforceBytecodeVersion>
- </rules>
- <fail>true</fail>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>extra-enforcer-rules</artifactId>
- <version>1.2</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
- </plugin>
</plugins>
</build>
@@ -319,7 +301,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
- <version>2.6</version>
+ <version>2.12.1</version>
<inherited>false</inherited>
<configuration>
<columnNames>Type,Key,Summary,Resolution,Assignee</columnNames>