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.gpg.bc | |
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.gpg.bc')
-rw-r--r-- | org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 14 | ||||
-rw-r--r-- | org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF | 4 | ||||
-rw-r--r-- | org.eclipse.jgit.gpg.bc/pom.xml | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 11aa3fdf54..f1854b0b10 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -3,10 +3,10 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true -Fragment-Host: org.eclipse.jgit;bundle-version="[5.12.0,5.13.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[5.12.1,5.13.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin -Bundle-Version: 5.12.0.qualifier +Bundle-Version: 5.12.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.bouncycastle.asn1;version="[1.65.0,2.0.0)", org.bouncycastle.asn1.cryptlib;version="[1.65.0,2.0.0)", @@ -29,9 +29,9 @@ Import-Package: org.bouncycastle.asn1;version="[1.65.0,2.0.0)", org.bouncycastle.util;version="[1.65.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.65.0,2.0.0)", org.bouncycastle.util.io;version="[1.65.0,2.0.0)", - org.eclipse.jgit.annotations;version="[5.12.0,5.13.0)", - org.eclipse.jgit.api.errors;version="[5.12.0,5.13.0)", + org.eclipse.jgit.annotations;version="[5.12.1,5.13.0)", + org.eclipse.jgit.api.errors;version="[5.12.1,5.13.0)", org.slf4j;version="[1.7.0,2.0.0)" -Export-Package: org.eclipse.jgit.gpg.bc;version="5.12.0", - org.eclipse.jgit.gpg.bc.internal;version="5.12.0";x-friends:="org.eclipse.jgit.gpg.bc.test", - org.eclipse.jgit.gpg.bc.internal.keys;version="5.12.0";x-friends:="org.eclipse.jgit.gpg.bc.test" +Export-Package: org.eclipse.jgit.gpg.bc;version="5.12.1", + org.eclipse.jgit.gpg.bc.internal;version="5.12.1";x-friends:="org.eclipse.jgit.gpg.bc.test", + org.eclipse.jgit.gpg.bc.internal.keys;version="5.12.1";x-friends:="org.eclipse.jgit.gpg.bc.test" diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 7851004bf4..cd000ba9fa 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.12.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="5.12.0.qualifier";roots="." +Bundle-Version: 5.12.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="5.12.1.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index d5b7962579..8c78f6e55f 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/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.gpg.bc</artifactId> |