mirror of
https://github.com/scm-manager/scm-manager.git
synced 2025-11-17 18:51:10 +01:00
Fix JavaDoc builds for java > 8
Sadly, therefor we have to remove the APIviz lib. It seems this is dead.
This commit is contained in:
37
pom.xml
37
pom.xml
@@ -434,7 +434,7 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<version>3.0.1</version>
|
||||
<version>3.1.1</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
@@ -625,6 +625,7 @@
|
||||
<encoding>${project.build.sourceEncoding}</encoding>
|
||||
<docencoding>${project.build.sourceEncoding}</docencoding>
|
||||
<breakiterator>true</breakiterator>
|
||||
<source>${project.build.javaLevel}</source>
|
||||
<version>true</version>
|
||||
<author>true</author>
|
||||
<keywords>true</keywords>
|
||||
@@ -664,11 +665,11 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-release-plugin</artifactId>
|
||||
<version>2.3.2</version>
|
||||
<version>2.5.3</version>
|
||||
<configuration>
|
||||
<pushChanges>false</pushChanges>
|
||||
<localCheckout>true</localCheckout>
|
||||
<releaseProfiles>release,APIviz,doc,nativepkg</releaseProfiles>
|
||||
<releaseProfiles>release,doc,nativepkg</releaseProfiles>
|
||||
<tagNameFormat>@{project.version}</tagNameFormat>
|
||||
<autoVersionSubmodules>true</autoVersionSubmodules>
|
||||
</configuration>
|
||||
@@ -798,32 +799,6 @@
|
||||
|
||||
</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>
|
||||
|
||||
<distributionManagement>
|
||||
@@ -885,8 +860,8 @@
|
||||
<yarn.version>1.16.0</yarn.version>
|
||||
|
||||
<!-- build properties -->
|
||||
<project.build.javaLevel>1.8</project.build.javaLevel>
|
||||
<project.test.javaLevel>1.8</project.test.javaLevel>
|
||||
<project.build.javaLevel>8</project.build.javaLevel>
|
||||
<project.test.javaLevel>8</project.test.javaLevel>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<netbeans.hint.license>SCM-BSD</netbeans.hint.license>
|
||||
<jdk.classifier />
|
||||
|
||||
@@ -40,7 +40,7 @@ import java.lang.annotation.RetentionPolicy;
|
||||
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.
|
||||
*
|
||||
* @author Sebastian Sdorra
|
||||
@@ -53,7 +53,7 @@ public @interface I18n
|
||||
{
|
||||
/**
|
||||
* Returns the key for the resource bundle.
|
||||
*
|
||||
*
|
||||
* @return resource bundle key
|
||||
*/
|
||||
String value();
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<parent>
|
||||
@@ -15,7 +15,7 @@
|
||||
<name>scm-core</name>
|
||||
|
||||
<dependencies>
|
||||
|
||||
|
||||
<!-- servlet api -->
|
||||
|
||||
<dependency>
|
||||
@@ -55,13 +55,13 @@
|
||||
</dependency>
|
||||
|
||||
<!-- security -->
|
||||
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.shiro</groupId>
|
||||
<artifactId>shiro-core</artifactId>
|
||||
<version>${shiro.version}</version>
|
||||
</dependency>
|
||||
|
||||
|
||||
<!-- injection -->
|
||||
|
||||
<dependency>
|
||||
@@ -230,12 +230,12 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<version>3.0.0</version>
|
||||
<configuration>
|
||||
<useStandardDocletOptions>true</useStandardDocletOptions>
|
||||
<charset>${project.build.sourceEncoding}</charset>
|
||||
<encoding>${project.build.sourceEncoding}</encoding>
|
||||
<docencoding>${project.build.sourceEncoding}</docencoding>
|
||||
<source>${project.build.javaLevel}</source>
|
||||
<breakiterator>true</breakiterator>
|
||||
<version>true</version>
|
||||
<author>true</author>
|
||||
@@ -253,20 +253,6 @@
|
||||
<link>http://www.slf4j.org/api/</link>
|
||||
<link>http://shiro.apache.org/static/${shiro.version}/apidocs/</link>
|
||||
</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>
|
||||
</plugin>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user