Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-17 18:51:10 +01:00
Code Issues Packages Projects Releases Activity

Fix JavaDoc builds for java > 8

Browse Source 
Sadly, therefor we have to remove the APIviz lib. It seems this is dead.
This commit is contained in:
Rene Pfeuffer
2020-02-06 11:52:24 +01:00
parent 94add329eb
commit 6e9524f809
3 changed files with 13 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
pom.xml
View File

@@ -434,7 +434,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.1</version> <version>3.1.1</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@@ -625,6 +625,7 @@
<encoding>${project.build.sourceEncoding}</encoding> <encoding>${project.build.sourceEncoding}</encoding>
<docencoding>${project.build.sourceEncoding}</docencoding> <docencoding>${project.build.sourceEncoding}</docencoding>
<breakiterator>true</breakiterator> <breakiterator>true</breakiterator>
<source>${project.build.javaLevel}</source>
<version>true</version> <version>true</version>
<author>true</author> <author>true</author>
<keywords>true</keywords> <keywords>true</keywords>
@@ -664,11 +665,11 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId> <artifactId>maven-release-plugin</artifactId>
<version>2.3.2</version> <version>2.5.3</version>
<configuration> <configuration>
<pushChanges>false</pushChanges> <pushChanges>false</pushChanges>
<localCheckout>true</localCheckout> <localCheckout>true</localCheckout>
<releaseProfiles>release,APIviz,doc,nativepkg</releaseProfiles> <releaseProfiles>release,doc,nativepkg</releaseProfiles>
<tagNameFormat>@{project.version}</tagNameFormat> <tagNameFormat>@{project.version}</tagNameFormat>
<autoVersionSubmodules>true</autoVersionSubmodules> <autoVersionSubmodules>true</autoVersionSubmodules>
</configuration> </configuration>
@@ -798,32 +799,6 @@
</profile> </profile>
<profile>
<id>APIviz</id>
<activation>
<property>
<name>sonia.apiviz</name>
<value>true</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.0</version>
<configuration>
<failOnError>false</failOnError>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles> </profiles>
<distributionManagement> <distributionManagement>
@@ -885,8 +860,8 @@
<yarn.version>1.16.0</yarn.version> <yarn.version>1.16.0</yarn.version>
<!-- build properties --> <!-- build properties -->
<project.build.javaLevel>1.8</project.build.javaLevel> <project.build.javaLevel>8</project.build.javaLevel>
<project.test.javaLevel>1.8</project.test.javaLevel> <project.test.javaLevel>8</project.test.javaLevel>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<netbeans.hint.license>SCM-BSD</netbeans.hint.license> <netbeans.hint.license>SCM-BSD</netbeans.hint.license>
<jdk.classifier /> <jdk.classifier />

2
scm-annotations/src/main/java/sonia/scm/i18n/I18n.java
View File

@@ -40,7 +40,7 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
/** /**
* The I18n annotation is used by the {@link I18nMessages} class to define the * The I18n annotation is used by the I18nMessages class to define the
* resource bundle key. * resource bundle key.
* *
* @author Sebastian Sdorra * @author Sebastian Sdorra

16
scm-core/pom.xml
View File

@@ -230,12 +230,12 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.0</version>
<configuration> <configuration>
<useStandardDocletOptions>true</useStandardDocletOptions> <useStandardDocletOptions>true</useStandardDocletOptions>
<charset>${project.build.sourceEncoding}</charset> <charset>${project.build.sourceEncoding}</charset>
<encoding>${project.build.sourceEncoding}</encoding> <encoding>${project.build.sourceEncoding}</encoding>
<docencoding>${project.build.sourceEncoding}</docencoding> <docencoding>${project.build.sourceEncoding}</docencoding>
<source>${project.build.javaLevel}</source>
<breakiterator>true</breakiterator> <breakiterator>true</breakiterator>
<version>true</version> <version>true</version>
<author>true</author> <author>true</author>
@@ -253,20 +253,6 @@
<link>http://www.slf4j.org/api/</link> <link>http://www.slf4j.org/api/</link>
<link>http://shiro.apache.org/static/${shiro.version}/apidocs/</link> <link>http://shiro.apache.org/static/${shiro.version}/apidocs/</link>
</links> </links>
<doclet>org.jboss.apiviz.APIviz</doclet>
<docletArtifact>
<groupId>org.jboss.apiviz</groupId>
<artifactId>apiviz</artifactId>
<version>1.3.2.GA</version>
</docletArtifact>
<additionalOptions>
<additionalOption>
-sourceclasspath ${project.build.outputDirectory}
</additionalOption>
<additionalOption>
-nopackagediagram
</additionalOption>
</additionalOptions>
</configuration> </configuration>
</plugin> </plugin>