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.pgm.test | |
| 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.pgm.test')
| -rw-r--r-- | org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 40 | ||||
| -rw-r--r-- | org.eclipse.jgit.pgm.test/pom.xml | 2 |
2 files changed, 21 insertions, 21 deletions
diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 602628eb3d..cd947f00f6 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,30 +3,30 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 6.3.0.qualifier +Bundle-Version: 6.3.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: org.eclipse.jgit.api;version="[6.3.0,6.4.0)", - org.eclipse.jgit.api.errors;version="[6.3.0,6.4.0)", - org.eclipse.jgit.diff;version="[6.3.0,6.4.0)", - org.eclipse.jgit.dircache;version="[6.3.0,6.4.0)", - org.eclipse.jgit.internal.diffmergetool;version="6.3.0", - org.eclipse.jgit.internal.storage.file;version="6.3.0", - org.eclipse.jgit.junit;version="[6.3.0,6.4.0)", - org.eclipse.jgit.lib;version="[6.3.0,6.4.0)", - org.eclipse.jgit.lib.internal;version="[6.3.0,6.4.0)", - org.eclipse.jgit.merge;version="[6.3.0,6.4.0)", - org.eclipse.jgit.pgm;version="[6.3.0,6.4.0)", - org.eclipse.jgit.pgm.internal;version="[6.3.0,6.4.0)", - org.eclipse.jgit.pgm.opt;version="[6.3.0,6.4.0)", - org.eclipse.jgit.revwalk;version="[6.3.0,6.4.0)", - org.eclipse.jgit.storage.file;version="[6.3.0,6.4.0)", - org.eclipse.jgit.transport;version="[6.3.0,6.4.0)", - org.eclipse.jgit.treewalk;version="[6.3.0,6.4.0)", - org.eclipse.jgit.util;version="[6.3.0,6.4.0)", - org.eclipse.jgit.util.io;version="[6.3.0,6.4.0)", +Import-Package: org.eclipse.jgit.api;version="[6.3.1,6.4.0)", + org.eclipse.jgit.api.errors;version="[6.3.1,6.4.0)", + org.eclipse.jgit.diff;version="[6.3.1,6.4.0)", + org.eclipse.jgit.dircache;version="[6.3.1,6.4.0)", + org.eclipse.jgit.internal.diffmergetool;version="6.3.1", + org.eclipse.jgit.internal.storage.file;version="6.3.1", + org.eclipse.jgit.junit;version="[6.3.1,6.4.0)", + org.eclipse.jgit.lib;version="[6.3.1,6.4.0)", + org.eclipse.jgit.lib.internal;version="[6.3.1,6.4.0)", + org.eclipse.jgit.merge;version="[6.3.1,6.4.0)", + org.eclipse.jgit.pgm;version="[6.3.1,6.4.0)", + org.eclipse.jgit.pgm.internal;version="[6.3.1,6.4.0)", + org.eclipse.jgit.pgm.opt;version="[6.3.1,6.4.0)", + org.eclipse.jgit.revwalk;version="[6.3.1,6.4.0)", + org.eclipse.jgit.storage.file;version="[6.3.1,6.4.0)", + org.eclipse.jgit.transport;version="[6.3.1,6.4.0)", + org.eclipse.jgit.treewalk;version="[6.3.1,6.4.0)", + org.eclipse.jgit.util;version="[6.3.1,6.4.0)", + org.eclipse.jgit.util.io;version="[6.3.1,6.4.0)", org.hamcrest.core;bundle-version="[1.1.0,3.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 c252068bdd..fd87d922e7 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>6.3.0-SNAPSHOT</version> + <version>6.3.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.pgm.test</artifactId> |