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.lfs.server.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.lfs.server.test')
| -rw-r--r-- | org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF | 38 | ||||
| -rw-r--r-- | org.eclipse.jgit.lfs.server.test/pom.xml | 2 |
2 files changed, 20 insertions, 20 deletions
diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 757e0363ff..5962ebb72e 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 6.3.0.qualifier +Bundle-Version: 6.3.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -26,24 +26,24 @@ Import-Package: javax.servlet;version="[3.1.0,5.0.0)", org.eclipse.jetty.util.log;version="[10.0.0,11.0.0)", org.eclipse.jetty.util.security;version="[10.0.0,11.0.0)", org.eclipse.jetty.util.thread;version="[10.0.0,11.0.0)", - 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.internal.storage.file;version="[6.3.0,6.4.0)", - org.eclipse.jgit.junit;version="[6.3.0,6.4.0)", - org.eclipse.jgit.junit.http;version="[6.3.0,6.4.0)", - org.eclipse.jgit.lfs;version="[6.3.0,6.4.0)", - org.eclipse.jgit.lfs.errors;version="[6.3.0,6.4.0)", - org.eclipse.jgit.lfs.lib;version="[6.3.0,6.4.0)", - org.eclipse.jgit.lfs.server;version="[6.3.0,6.4.0)", - org.eclipse.jgit.lfs.server.fs;version="[6.3.0,6.4.0)", - org.eclipse.jgit.lfs.test;version="[6.3.0,6.4.0)", - org.eclipse.jgit.lib;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.treewalk.filter;version="[6.3.0,6.4.0)", - org.eclipse.jgit.util;version="[6.3.0,6.4.0)", + 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.internal.storage.file;version="[6.3.1,6.4.0)", + org.eclipse.jgit.junit;version="[6.3.1,6.4.0)", + org.eclipse.jgit.junit.http;version="[6.3.1,6.4.0)", + org.eclipse.jgit.lfs;version="[6.3.1,6.4.0)", + org.eclipse.jgit.lfs.errors;version="[6.3.1,6.4.0)", + org.eclipse.jgit.lfs.lib;version="[6.3.1,6.4.0)", + org.eclipse.jgit.lfs.server;version="[6.3.1,6.4.0)", + org.eclipse.jgit.lfs.server.fs;version="[6.3.1,6.4.0)", + org.eclipse.jgit.lfs.test;version="[6.3.1,6.4.0)", + org.eclipse.jgit.lib;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.treewalk.filter;version="[6.3.1,6.4.0)", + org.eclipse.jgit.util;version="[6.3.1,6.4.0)", org.hamcrest.core;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.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 77b6ea5378..baa6a9d392 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.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.lfs.server.test</artifactId> |