diff options
Diffstat (limited to 'org.eclipse.jgit.junit')
6 files changed, 26 insertions, 27 deletions
diff --git a/org.eclipse.jgit.junit/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.junit/.settings/org.eclipse.jdt.core.prefs index b6750293dc..530f8f6070 100644 --- a/org.eclipse.jgit.junit/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.junit/.settings/org.eclipse.jdt.core.prefs @@ -103,7 +103,7 @@ org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 4de3e46fdb..e61df3ad5e 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,35 +3,35 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 5.5.2.qualifier +Bundle-Version: 5.6.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.annotations;version="[5.5.2,5.6.0)", - org.eclipse.jgit.api;version="[5.5.2,5.6.0)", - org.eclipse.jgit.api.errors;version="[5.5.2,5.6.0)", - org.eclipse.jgit.dircache;version="[5.5.2,5.6.0)", - org.eclipse.jgit.errors;version="[5.5.2,5.6.0)", - org.eclipse.jgit.internal.storage.file;version="[5.5.2,5.6.0)", - org.eclipse.jgit.internal.storage.pack;version="[5.5.2,5.6.0)", - org.eclipse.jgit.lib;version="[5.5.2,5.6.0)", - org.eclipse.jgit.merge;version="[5.5.2,5.6.0)", - org.eclipse.jgit.revwalk;version="[5.5.2,5.6.0)", - org.eclipse.jgit.storage.file;version="[5.5.2,5.6.0)", - org.eclipse.jgit.transport;version="5.5.2", - org.eclipse.jgit.treewalk;version="[5.5.2,5.6.0)", - org.eclipse.jgit.treewalk.filter;version="[5.5.2,5.6.0)", - org.eclipse.jgit.util;version="[5.5.2,5.6.0)", - org.eclipse.jgit.util.io;version="[5.5.2,5.6.0)", - org.eclipse.jgit.util.time;version="[5.5.2,5.6.0)", +Import-Package: org.eclipse.jgit.annotations;version="[5.6.2,5.7.0)", + org.eclipse.jgit.api;version="[5.6.2,5.7.0)", + org.eclipse.jgit.api.errors;version="[5.6.2,5.7.0)", + org.eclipse.jgit.dircache;version="[5.6.2,5.7.0)", + org.eclipse.jgit.errors;version="[5.6.2,5.7.0)", + org.eclipse.jgit.internal.storage.file;version="[5.6.2,5.7.0)", + org.eclipse.jgit.internal.storage.pack;version="[5.6.2,5.7.0)", + org.eclipse.jgit.lib;version="[5.6.2,5.7.0)", + org.eclipse.jgit.merge;version="[5.6.2,5.7.0)", + org.eclipse.jgit.revwalk;version="[5.6.2,5.7.0)", + org.eclipse.jgit.storage.file;version="[5.6.2,5.7.0)", + org.eclipse.jgit.transport;version="5.6.2", + org.eclipse.jgit.treewalk;version="[5.6.2,5.7.0)", + org.eclipse.jgit.treewalk.filter;version="[5.6.2,5.7.0)", + org.eclipse.jgit.util;version="[5.6.2,5.7.0)", + org.eclipse.jgit.util.io;version="[5.6.2,5.7.0)", + org.eclipse.jgit.util.time;version="[5.6.2,5.7.0)", org.junit;version="[4.12,5.0.0)", org.junit.rules;version="[4.12,5.0.0)", org.junit.runner;version="[4.12,5.0.0)", org.junit.runners;version="[4.12,5.0.0)", org.junit.runners.model;version="[4.12,5.0.0)", org.slf4j;version="[1.7.0,2.0.0)" -Export-Package: org.eclipse.jgit.junit;version="5.5.2"; +Export-Package: org.eclipse.jgit.junit;version="5.6.2"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -44,4 +44,4 @@ Export-Package: org.eclipse.jgit.junit;version="5.5.2"; org.junit.runners.model, org.junit.runner, org.eclipse.jgit.util.time", - org.eclipse.jgit.junit.time;version="5.5.2";uses:="org.eclipse.jgit.util.time" + org.eclipse.jgit.junit.time;version="5.6.2";uses:="org.eclipse.jgit.util.time" diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 9568f93759..de62cbabdb 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.5.2.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="5.5.2.qualifier";roots="." +Bundle-Version: 5.6.2.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="5.6.2.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 1ccc2202d2..691392c612 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -52,7 +52,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.5.2-SNAPSHOT</version> + <version>5.6.2-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.junit</artifactId> diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepeatRule.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepeatRule.java index 5b58f0b01f..d003520491 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepeatRule.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepeatRule.java @@ -78,7 +78,7 @@ import org.junit.runners.model.Statement; */ public class RepeatRule implements TestRule { - private static Logger LOG = Logger + private static final Logger LOG = Logger .getLogger(RepeatRule.class.getName()); /** diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java index 593b960f23..7b476def9f 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java @@ -784,9 +784,8 @@ public class TestRepository<R extends Repository> implements AutoCloseable { } update(Constants.HEAD, result); return pool.parseCommit(result); - } else { - throw new IOException("Merge conflict"); } + throw new IOException("Merge conflict"); } /** |