Browse Source

Merge changes I8a37eaf8,Id8a5b591

* changes:
  Remove maven profile jgit.java8
  Reenable failing the build on javadoc errors
stable-4.10
David Pursehouse 7 years ago committed by Gerrit Code Review @ Eclipse.org
parent
commit
5db26bc399
  1. 33
      pom.xml

33
pom.xml

@ -507,6 +507,7 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<configuration> <configuration>
<additionalparam>-Xdoclint:-missing</additionalparam>
<encoding>${project.build.sourceEncoding}</encoding> <encoding>${project.build.sourceEncoding}</encoding>
<quiet>true</quiet> <quiet>true</quiet>
<excludePackageNames>org.eclipse.jgit.http.test</excludePackageNames> <excludePackageNames>org.eclipse.jgit.http.test</excludePackageNames>
@ -571,8 +572,6 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>${maven-javadoc-plugin-version}</version> <version>${maven-javadoc-plugin-version}</version>
<configuration>
</configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -725,36 +724,6 @@
</distributionManagement> </distributionManagement>
<profiles> <profiles>
<profile>
<id>jgit.java8</id>
<activation>
<jdk>[1.8,)</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<additionalparam>-Xdoclint:-missing</additionalparam>
<failOnError>false</failOnError>
</configuration>
</plugin>
</plugins>
</build>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<additionalparam>-Xdoclint:-missing</additionalparam>
<failOnError>false</failOnError>
</configuration>
</plugin>
</plugins>
</reporting>
</profile>
<profile> <profile>
<id>static-checks</id> <id>static-checks</id>
<build> <build>

Loading…
Cancel
Save