diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2025-03-04 15:14:53 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2025-03-04 15:14:53 +0100 |
| commit | 2c90335a9d70d1a7b175b592e3a6582431e827f2 (patch) | |
| tree | 4654d0bfae927e0ab87912b22ed6b4e600cdbef3 /org.eclipse.jgit.http.test | |
| parent | 026d46de13eb2321c18045469f27b065ba107ff5 (diff) | |
| parent | 2a3e1191ea8062038a3d11de99d1549678c35d61 (diff) | |
| download | jgit-next.tar.gz jgit-next.zip | |
Merge branch 'master' into nextnext
* master: (497 commits)
Prepare 7.3.0-SNAPSHOT builds
Prepare 7.2.1-SNAPSHOT builds
JGit v7.2.0.202503040940-r
JGit v7.2.0.202503040805-r
CacheRegion: fix non translatable text warnings
Ensure access to autoRefresh is thread-safe
FileReftableStack: use FileSnapshot to detect modification
FileReftableDatabase: consider ref updates by another process
BlameRegionMerger: report invalid regions with checked exception.
Prepare 7.2.0-SNAPSHOT builds
[ssh known_hosts] Handle unknown keys better
[releng] Remove unused target platform definitions
JGit v7.2.0.202502261823-rc1
[ssh known_hosts] Handle host certificates
[ssh known_hosts] Improve updating modified keys
[ssh known_hosts] Add tests and fix problems
[ssh, releng] Remove net.i2p.crypto.eddsa
AddCommand: Use parenthesis to make the operator precedence explicit
AddCommand: implement --all/--no-all
Do not load bitmap indexes during directory scans
...
Change-Id: I619c89071f5f7a05bcd0218840f7f47bd19b779d
Diffstat (limited to 'org.eclipse.jgit.http.test')
3 files changed, 24 insertions, 23 deletions
diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index edce2d8d27..518afb3286 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.3.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -29,26 +29,26 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.thread;version="[12.0.0,13.0.0)", - org.eclipse.jgit.api;version="[7.0.0,7.1.0)", - org.eclipse.jgit.errors;version="[7.0.0,7.1.0)", - org.eclipse.jgit.http.server;version="[7.0.0,7.1.0)", - org.eclipse.jgit.http.server.glue;version="[7.0.0,7.1.0)", - org.eclipse.jgit.http.server.resolver;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.storage.file;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.0.0,7.1.0)", - org.eclipse.jgit.junit;version="[7.0.0,7.1.0)", - org.eclipse.jgit.junit.http;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.0,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)", - org.eclipse.jgit.storage.file;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport.http;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport.http.apache;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport.resolver;version="[7.0.0,7.1.0)", - org.eclipse.jgit.util;version="[7.0.0,7.1.0)", + org.eclipse.jgit.api;version="[7.3.0,7.4.0)", + org.eclipse.jgit.errors;version="[7.3.0,7.4.0)", + org.eclipse.jgit.http.server;version="[7.3.0,7.4.0)", + org.eclipse.jgit.http.server.glue;version="[7.3.0,7.4.0)", + org.eclipse.jgit.http.server.resolver;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.storage.file;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.3.0,7.4.0)", + org.eclipse.jgit.junit;version="[7.3.0,7.4.0)", + org.eclipse.jgit.junit.http;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lib;version="[7.3.0,7.4.0)", + org.eclipse.jgit.nls;version="[7.3.0,7.4.0)", + org.eclipse.jgit.revwalk;version="[7.3.0,7.4.0)", + org.eclipse.jgit.storage.file;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport.http;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport.http.apache;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport.resolver;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util;version="[7.3.0,7.4.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 01ee7824ca..8ed3017c9c 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.3.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.http.test</artifactId> diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java index 850e895790..b0d17adb3a 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java @@ -1728,7 +1728,8 @@ public class SmartClientSmartServerTest extends AllProtocolsHttpTestCase { assertEquals(Q, remoteRepository.exactRef(dstName).getObjectId()); fsck(remoteRepository, Q); - final ReflogReader log = remoteRepository.getReflogReader(dstName); + final ReflogReader log = remoteRepository.getRefDatabase() + .getReflogReader(dstName); assertNotNull("has log for " + dstName, log); final ReflogEntry last = log.getLastEntry(); |