Merge branch 'stable-4.5'

* stable-4.5:
  Turn off doclint also during Maven site generation
  Prepare 4.5.1-SNAPSHOT builds
  JGit v4.5.0.201609210915-r
  Unconditionally close repository in unregisterAndCloseRepository

Change-Id: Ibfd11669cd74d2e62b014c18fd39b646b200c8c5
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
Matthias Sohn 2016-09-21 18:08:00 +02:00
commit 1b11f4fdda
2 changed files with 14 additions and 5 deletions

View File

@ -305,11 +305,9 @@ private boolean isExpired(Repository db) {
private void unregisterAndCloseRepository(final Key location,
Repository db) {
synchronized (lockFor(location)) {
if (isExpired(db)) {
Repository oldDb = unregisterRepository(location);
if (oldDb != null) {
oldDb.close();
}
Repository oldDb = unregisterRepository(location);
if (oldDb != null) {
oldDb.doClose();
}
}
}

11
pom.xml
View File

@ -683,6 +683,17 @@
</plugin>
</plugins>
</build>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<additionalparam>-Xdoclint:-missing</additionalparam>
</configuration>
</plugin>
</plugins>
</reporting>
</profile>
<profile>
<id>static-checks</id>