diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2022-09-12 10:51:37 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2022-09-12 10:51:37 +0200 |
| commit | c7df1addf63fcacc7352c882ac0ad13f3bc4ca61 (patch) | |
| tree | 8c880488cbfe87a0e507d3eee80cdbf8499176d7 /org.eclipse.jgit.gpg.bc | |
| parent | 834016c3e43a54e638986fd75f1f3543d034d2fc (diff) | |
| parent | fb377b09eb9370e5d43d3f364964dfb139e3ffe5 (diff) | |
| download | jgit-c7df1addf63fcacc7352c882ac0ad13f3bc4ca61.tar.gz jgit-c7df1addf63fcacc7352c882ac0ad13f3bc4ca61.zip | |
Merge branch 'stable-6.3'
* stable-6.3:
Prepare 6.3.1-SNAPSHOT builds
JGit v6.3.0.202209071007-r
JGit v6.3.0.2022009070944-r
[merge] Fix merge conflicts with symlinks
Update DEPENDENCIES for 6.3.0
Update tycho to 2.7.5
Revert "Adds FilteredRevCommit that can overwrites its parents in the DAG."
Revert "Option to pass start RevCommit to be blamed on to the BlameGenerator."
Prepare 6.3.0-SNAPSHOT builds
JGit v6.3.0.202208161710-m3
Change-Id: Ia9430fb516dca795e25064a190704b70689af364
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 c0711f3247..02d9cfe4d4 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="[6.3.0,6.4.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[6.3.1,6.4.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin -Bundle-Version: 6.3.0.qualifier +Bundle-Version: 6.3.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.asn1.cryptlib;version="[1.69.0,2.0.0)", @@ -29,9 +29,9 @@ Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.util;version="[1.69.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.69.0,2.0.0)", org.bouncycastle.util.io;version="[1.69.0,2.0.0)", - org.eclipse.jgit.annotations;version="[6.3.0,6.4.0)", - org.eclipse.jgit.api.errors;version="[6.3.0,6.4.0)", + org.eclipse.jgit.annotations;version="[6.3.1,6.4.0)", + org.eclipse.jgit.api.errors;version="[6.3.1,6.4.0)", org.slf4j;version="[1.7.0,2.0.0)" -Export-Package: org.eclipse.jgit.gpg.bc;version="6.3.0", - org.eclipse.jgit.gpg.bc.internal;version="6.3.0";x-friends:="org.eclipse.jgit.gpg.bc.test", - org.eclipse.jgit.gpg.bc.internal.keys;version="6.3.0";x-friends:="org.eclipse.jgit.gpg.bc.test" +Export-Package: org.eclipse.jgit.gpg.bc;version="6.3.1", + org.eclipse.jgit.gpg.bc.internal;version="6.3.1";x-friends:="org.eclipse.jgit.gpg.bc.test", + org.eclipse.jgit.gpg.bc.internal.keys;version="6.3.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 1622e26fe0..795cbce18e 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: 6.3.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="6.3.0.qualifier";roots="." +Bundle-Version: 6.3.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="6.3.1.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 47387ed17c..3110807a54 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>6.3.0-SNAPSHOT</version> + <version>6.3.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.gpg.bc</artifactId> |