diff options
author | Matthias Sohn <matthias.sohn@sap.com> | 2021-06-14 01:32:21 +0200 |
---|---|---|
committer | Matthias Sohn <matthias.sohn@sap.com> | 2021-06-14 01:32:21 +0200 |
commit | eb4deda9098678e460fe2a83cea085764fa0c471 (patch) | |
tree | 1d53d7c01a8de5a5a21169cf34f510587bb765cd /org.eclipse.jgit.pgm.test | |
parent | 64d0aaa2b624e9c011390d817a6d1fef335bf7b6 (diff) | |
parent | 2533a284c1bf30477c4a61f4893929201a1244f3 (diff) | |
download | jgit-eb4deda9098678e460fe2a83cea085764fa0c471.tar.gz jgit-eb4deda9098678e460fe2a83cea085764fa0c471.zip |
Merge branch 'stable-5.12'
* stable-5.12:
Prepare 5.12.1-SNAPSHOT builds
JGit v5.12.0.202106070339-r
[license-check] Update list of project dependencies
[errorprone] Fix warning InputStreamSlowMultibyteRead
[errorprone] Make operator precedence explicit in OpenSshConfigFile
Update jetty to 9.4.41.v20210516
Prepare 5.1.17-SNAPSHOT builds
JGit v5.1.16.202106041830-r
BatchRefUpdate: Skip saving conflicting ref names and prefixes in memory
BatchRefUpdateTest: Accurately assert RefsChangedEvent(s) fired
Optimize RefDirectory.isNameConflicting()
Update bazlets and bazel version
Change-Id: I9bd4dfc3796a5034be7b3e86b35ef591bb516a2c
Diffstat (limited to 'org.eclipse.jgit.pgm.test')
-rw-r--r-- | org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 36 | ||||
-rw-r--r-- | org.eclipse.jgit.pgm.test/pom.xml | 2 |
2 files changed, 19 insertions, 19 deletions
diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 9e18df9f00..704ad7cc6c 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,28 +3,28 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 5.12.0.qualifier +Bundle-Version: 5.12.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.api;version="[5.12.0,5.13.0)", - org.eclipse.jgit.api.errors;version="[5.12.0,5.13.0)", - org.eclipse.jgit.diff;version="[5.12.0,5.13.0)", - org.eclipse.jgit.dircache;version="[5.12.0,5.13.0)", - org.eclipse.jgit.internal.storage.file;version="5.12.0", - org.eclipse.jgit.junit;version="[5.12.0,5.13.0)", - org.eclipse.jgit.lib;version="[5.12.0,5.13.0)", - org.eclipse.jgit.merge;version="[5.12.0,5.13.0)", - org.eclipse.jgit.pgm;version="[5.12.0,5.13.0)", - org.eclipse.jgit.pgm.internal;version="[5.12.0,5.13.0)", - org.eclipse.jgit.pgm.opt;version="[5.12.0,5.13.0)", - org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)", - org.eclipse.jgit.storage.file;version="[5.12.0,5.13.0)", - org.eclipse.jgit.transport;version="[5.12.0,5.13.0)", - org.eclipse.jgit.treewalk;version="[5.12.0,5.13.0)", - org.eclipse.jgit.util;version="[5.12.0,5.13.0)", - org.eclipse.jgit.util.io;version="[5.12.0,5.13.0)", +Import-Package: org.eclipse.jgit.api;version="[5.12.1,5.13.0)", + org.eclipse.jgit.api.errors;version="[5.12.1,5.13.0)", + org.eclipse.jgit.diff;version="[5.12.1,5.13.0)", + org.eclipse.jgit.dircache;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal.storage.file;version="5.12.1", + org.eclipse.jgit.junit;version="[5.12.1,5.13.0)", + org.eclipse.jgit.lib;version="[5.12.1,5.13.0)", + org.eclipse.jgit.merge;version="[5.12.1,5.13.0)", + org.eclipse.jgit.pgm;version="[5.12.1,5.13.0)", + org.eclipse.jgit.pgm.internal;version="[5.12.1,5.13.0)", + org.eclipse.jgit.pgm.opt;version="[5.12.1,5.13.0)", + org.eclipse.jgit.revwalk;version="[5.12.1,5.13.0)", + org.eclipse.jgit.storage.file;version="[5.12.1,5.13.0)", + org.eclipse.jgit.transport;version="[5.12.1,5.13.0)", + org.eclipse.jgit.treewalk;version="[5.12.1,5.13.0)", + org.eclipse.jgit.util;version="[5.12.1,5.13.0)", + org.eclipse.jgit.util.io;version="[5.12.1,5.13.0)", org.hamcrest.core;bundle-version="[1.1.0,2.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 8398d6bfc0..77dd85fd81 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.pgm.test</artifactId> |