Cleanup pom
- remove duplicated sections with parent
- use newer plugins versions
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 @@
<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 @@
</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 @@
<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 @@
</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 @@
</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 @@
</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 @@
<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>
