Skip to content

Commit 26d6c32

Browse files
committed
benchmarks: use org.eclipse.jgit-parent as parent pom
Change-Id: I2248c12072adccaf2ba525da5dec4fb5b35ca383
1 parent 8ca649c commit 26d6c32

File tree

3 files changed

+34
-17
lines changed

3 files changed

+34
-17
lines changed
+2-13
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" output="target/classes" path="src">
3+
<classpathentry including="**/*.java" kind="src" output="target/classes" path="src">
44
<attributes>
55
<attribute name="optional" value="true"/>
66
<attribute name="maven.pomderived" value="true"/>
@@ -19,18 +19,7 @@
1919
<classpathentry kind="src" path=".apt_generated">
2020
<attributes>
2121
<attribute name="optional" value="true"/>
22-
<attribute name="maven.pomderived" value="true"/>
23-
<attribute name="ignore_optional_problems" value="true"/>
24-
<attribute name="m2e-apt" value="true"/>
25-
</attributes>
26-
</classpathentry>
27-
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
28-
<attributes>
29-
<attribute name="optional" value="true"/>
30-
<attribute name="maven.pomderived" value="true"/>
31-
<attribute name="ignore_optional_problems" value="true"/>
32-
<attribute name="m2e-apt" value="true"/>
3322
</attributes>
3423
</classpathentry>
3524
<classpathentry kind="output" path="target/classes"/>
36-
</classpath>
25+
</classpath>

org.eclipse.jgit.benchmarks/.settings/org.eclipse.jdt.core.prefs

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
4242
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
4343
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
4444
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
45-
org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
45+
org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
4646
org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
4747
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
4848
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
@@ -57,7 +57,7 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
5757
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
5858
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected
5959
org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
60-
org.eclipse.jdt.core.compiler.problem.missingJavadocTags=error
60+
org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
6161
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
6262
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
6363
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private

org.eclipse.jgit.benchmarks/pom.xml

+30-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,12 @@
1313
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1414
<modelVersion>4.0.0</modelVersion>
1515

16-
<groupId>org.eclipse.jgit</groupId>
17-
<version>6.8.0-SNAPSHOT</version>
16+
<parent>
17+
<groupId>org.eclipse.jgit</groupId>
18+
<artifactId>org.eclipse.jgit-parent</artifactId>
19+
<version>6.8.0-SNAPSHOT</version>
20+
</parent>
21+
1822
<artifactId>org.eclipse.jgit.benchmarks</artifactId>
1923
<packaging>jar</packaging>
2024

@@ -143,6 +147,30 @@
143147
</execution>
144148
</executions>
145149
</plugin>
150+
<plugin>
151+
<groupId>org.apache.maven.plugins</groupId>
152+
<artifactId>maven-javadoc-plugin</artifactId>
153+
<configuration>
154+
<!-- We check javadoc when compiling with ecj (option -Pecj) and configurations
155+
set in .settings/org.eclipse.jdt.core.prefs. This allows more fine grained
156+
configuration and fails the build on missing javadoc for protected and
157+
public but not for private classes, methods and fields. We don't want
158+
to check javadoc on tests. We can reconsider to configure this on javadoc
159+
when it starts supporting access specifiers so that we can set
160+
-Xdoclint:all,-missing/private -->
161+
<additionalJOption>-Xdoclint:none</additionalJOption>
162+
<encoding>${project.build.sourceEncoding}</encoding>
163+
<quiet>true</quiet>
164+
<failOnWarnings>false</failOnWarnings>
165+
</configuration>
166+
<executions>
167+
<execution>
168+
<goals>
169+
<goal>jar</goal>
170+
</goals>
171+
</execution>
172+
</executions>
173+
</plugin>
146174
</plugins>
147175
<pluginManagement>
148176
<plugins>

0 commit comments

Comments
 (0)