Matthias Sohn
5a232c9509
Add Eclipse code of conduct and security policy
...
This was requested in the 5.12 release review.
Bug: https://gitlab.eclipse.org/eclipsefdn/emo-team/emo/-/issues/58
Change-Id: Ifbfa4c239e8ce0da6d5571362a12c20c399b64e4
2021-06-15 13:44:58 +02:00
Matthias Sohn
6a8afeb9f2
Merge branch 'master' into next
...
* master: (47 commits)
Fix @since from commit 64d0aaa2
Prepare 5.13.0-SNAPSHOT builds
Prepare 5.12.1-SNAPSHOT builds
Teach independent negotiation (no pack file) using an option "wait-for-done"
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
Update Orbit to R20210602031627
Prepare 5.12.0-SNAPSHOT builds
Fixing visibility for HostEntry constructors.
JGit v5.12.0.202106021050-rc1
Prepare 5.12.0-SNAPSHOT builds
JGit v5.12.0.202106011439-rc1
Clarify operator precedence to fix errorprone error
Prepare 5.12.0-SNAPSHOT builds
Update Orbit to S20210518003616 and ant to 1.10.10.v20210426-1926
...
Change-Id: I76a1f155201648a62df11a41a9e02d97f522d00f
2021-06-15 00:05:14 +02:00
Thomas Wolf
01b2c4fc90
Fix @since from commit 64d0aaa2
...
That commit was submitted on master between the 5.12.0 release and
the 5.13.0 version bump.
Change-Id: I679e818bfc5a4695b66548add9a83a22c89a4ffc
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2021-06-14 21:23:29 +02:00
Matthias Sohn
1cbfea9ece
Prepare 5.13.0-SNAPSHOT builds
...
Change-Id: Ie9cfc1eeb0eda7b2bbe744a22a7e4cfe6d59bc37
2021-06-14 01:49:05 +02:00
Matthias Sohn
eb4deda909
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
2021-06-14 01:32:21 +02:00
Matthias Sohn
2533a284c1
Merge branch 'stable-5.11' into stable-5.12
...
* stable-5.11:
Change-Id: Ifdbddcde74dda9895bcdd90f1be201c3ceca2b29
2021-06-14 01:31:16 +02:00
Matthias Sohn
3b300e5ed5
Merge branch 'stable-5.10' into stable-5.11
...
* stable-5.10:
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: I265425194c24fd82cbeff869ce41cbc9b73571a2
2021-06-14 01:13:18 +02:00
Matthias Sohn
b8e57d2745
Merge "Prepare 5.12.1-SNAPSHOT builds" into stable-5.12
2021-06-13 18:52:44 -04:00
Matthias Sohn
527119120f
Merge "Merge branch 'stable-5.10' into stable-5.11" into stable-5.12
2021-06-13 18:48:42 -04:00
Matthias Sohn
a397727e4a
Prepare 5.12.1-SNAPSHOT builds
...
Change-Id: Idf266c34aa9a04cf9c5e0e09bcb415c13d773d4c
2021-06-13 23:59:14 +02:00
Matthias Sohn
21f9d919ed
Merge branch 'stable-5.10' into stable-5.11
...
* stable-5.10:
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: I50dcc037a96f3a4237c09516c82e1c18acbd2e0b
2021-06-13 23:57:08 +02:00
Matthias Sohn
e2dc4b9c64
Merge branch 'stable-5.9' into stable-5.10
...
* stable-5.9:
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: Ib1299564a4cfb9c01f422d7ada05fcfac29700f8
2021-06-13 23:55:46 +02:00
Matthias Sohn
84063386b5
Merge branch 'stable-5.8' into stable-5.9
...
* stable-5.8:
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: I9abf7dd8b8e5eb3199fd6b43a4653c4e4cf4bf1b
2021-06-13 23:55:03 +02:00
Matthias Sohn
0c7b101329
Merge branch 'stable-5.7' into stable-5.8
...
* stable-5.7:
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: I1ee0d01c14fb7dca151b4e7ae1b989da5a3a01e3
2021-06-13 23:54:06 +02:00
Matthias Sohn
e68c381917
Merge branch 'stable-5.6' into stable-5.7
...
* stable-5.6:
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: I4570cce185877cb4c50eee519a1cf9467a766dea
2021-06-13 23:52:46 +02:00
Matthias Sohn
7856402c4b
Merge branch 'stable-5.5' into stable-5.6
...
* stable-5.5:
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: I504483a4dc979c5e7af18bad45dc18675e32afd2
2021-06-13 23:49:25 +02:00
Ronald Bhuleskar
64d0aaa2b6
Teach independent negotiation (no pack file) using an option "wait-for-done"
...
From Git commit 9c1e657a8f:
Currently, the packfile negotiation step within a Git fetch cannot be
done independent of sending the packfile, even though there is at
least one application wherein this is useful - push negotiation.
Therefore, make it possible for this negotiation step to be done
independently.
This feature is for protocol v2 only.
In the protocol, the main hindrance towards independent negotiation is
that the server can unilaterally decide to send the packfile. This is
solved by a "wait-for-done" argument: the server will then wait for
the client to say "done". In practice, the client will never say it;
instead it will cease requests once it is satisfied.
Advertising the server capability option "wait-for-done" is behind the
transport config: uploadpack.advertisewaitfordone, which by default is
false.
Change-Id: I5ebd3e99ad76b8943597216e23ced2ed38eb5224
2021-06-11 12:29:12 -04:00
Matthias Sohn
1f062c64be
JGit v5.12.0.202106070339-r
...
Change-Id: I0fbfea2c83f1ce83f75130cc97591547032f1104
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2021-06-07 09:38:29 +02:00
Matthias Sohn
09fe387cba
[license-check] Update list of project dependencies
...
Change-Id: I94530902bdcc93e160416750742cc2bf63d7c411
2021-06-07 01:20:01 +02:00
Matthias Sohn
ae692779ce
[errorprone] Fix warning InputStreamSlowMultibyteRead
...
Change-Id: I50dace6e310016c04f524eb0cfcce0da05fadd47
2021-06-07 00:28:48 +02:00
Matthias Sohn
c2f9acdc32
[errorprone] Make operator precedence explicit in OpenSshConfigFile
...
This fixes the errorprone warning OperatorPrecedence.
Change-Id: I4c7dafa5ac8e1d58fa15cf91fe1b3cf3f182d536
2021-06-07 00:25:32 +02:00
Matthias Sohn
d79b6b665f
Update jetty to 9.4.41.v20210516
...
Change-Id: I98d569ce9a69c48c3c99b9b5f500d6419c943094
2021-06-07 00:23:30 +02:00
Matthias Sohn
5977260af6
Merge branch 'stable-5.4' into stable-5.5
...
* stable-5.4:
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: If5232b68d3e25df7b71e417cbcbb39476e925f22
2021-06-05 22:49:56 +02:00
Matthias Sohn
c14cb5c0ed
Merge branch 'stable-5.3' into stable-5.4
...
* stable-5.3:
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: I1338fc79a7be6b77fb28df511dd7504fb19b6d1a
2021-06-05 22:49:07 +02:00
Matthias Sohn
8e52e30b92
Merge branch 'stable-5.2' into stable-5.3
...
* stable-5.2:
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: I7838f7d237a3598bf55995426d7ba1de146cb6ad
2021-06-05 22:48:01 +02:00
Matthias Sohn
87c42c1b3c
Merge branch 'stable-5.1' into stable-5.2
...
* stable-5.1:
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: If1b5a2b380cf155e66bf5d5c6d216f86c919bb37
2021-06-05 22:20:46 +02:00
Matthias Sohn
e7b4af0d95
Prepare 5.1.17-SNAPSHOT builds
...
Change-Id: I20c69728465f956a5744a75eb548ef18962286dd
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2021-06-05 00:45:08 +02:00
Matthias Sohn
f3d07f6649
JGit v5.1.16.202106041830-r
...
Change-Id: I526ed2a08553bc0b2678aaefaff9e0c6529baefc
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2021-06-05 00:31:03 +02:00
Matthias Sohn
f6b8589c2b
Merge changes I853ac6c7,I01878116,Ie994fc18 into stable-5.1
...
* changes:
BatchRefUpdate: Skip saving conflicting ref names and prefixes in memory
BatchRefUpdateTest: Accurately assert RefsChangedEvent(s) fired
Optimize RefDirectory.isNameConflicting()
2021-06-04 18:21:31 -04:00
Matthias Sohn
91a9591253
Merge branch 'stable-5.12'
...
* stable-5.12:
Update Orbit to R20210602031627
Prepare 5.12.0-SNAPSHOT builds
JGit v5.12.0.202106021050-rc1
Prepare 5.12.0-SNAPSHOT builds
JGit v5.12.0.202106011439-rc1
Prepare 5.12.0-SNAPSHOT builds
JGit v5.12.0.202105261145-m3
Change-Id: Iaf5d65a6e23c4d262fcb3dd3eda42bd634a38aad
2021-06-03 23:50:51 +02:00
Matthias Sohn
48c0bae849
Update Orbit to R20210602031627
...
Change-Id: I480093d9da393dae0c3b608762d38cba3db2f2b9
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2021-06-03 21:35:32 +02:00
Matthias Sohn
044c5f215c
Prepare 5.12.0-SNAPSHOT builds
...
Change-Id: Ifc72d3f3ac84b9c4055b95ec0093d877ffb09ab0
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2021-06-03 20:04:28 +02:00
Demetr Starshov
f6b9b392e7
Fixing visibility for HostEntry constructors.
...
HostEntry class was public with empty constructor, so adding
constructors with default visibility actually reduced visibility of
constructor.
Change-Id: I4c996c0559102084946ba49a71afe10dda5e0f95
2021-06-02 16:19:39 -07:00
Matthias Sohn
45a4c131ae
JGit v5.12.0.202106021050-rc1
...
Change-Id: I622ee049f14f37504ff4a062f03d6fc25465d0ec
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2021-06-02 16:49:17 +02:00
Matthias Sohn
1f733663bf
Prepare 5.12.0-SNAPSHOT builds
...
Change-Id: I25e4efc9b40ae4e7168b37385445c73992c5beb0
2021-06-02 08:47:28 +02:00
Matthias Sohn
94aa245023
JGit v5.12.0.202106011439-rc1
...
Change-Id: Ieac1d02879defe0f4791062448d4efc328a2f652
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2021-06-01 20:38:31 +02:00
Matthias Sohn
a14bc9bb69
Clarify operator precedence to fix errorprone error
...
Errorprone raised error OperatorPrecedence in bazel build.
Change-Id: Ibab601e67d4d5cafe9a7d900c78b0d432181a073
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2021-06-01 11:16:59 -04:00
Matthias Sohn
3171c26244
Merge branch 'master' into stable-5.12
...
* master:
Update Orbit to S20210518003616 and ant to 1.10.10.v20210426-1926
Skip detecting content renames for binary files
RepoCommand: Retry commit on LockFailure
Finish upgrading eclipse-jarsigner-plugin to 1.3.1
Upgrade maven-javadoc-plugin to 3.3.0
Update maven-project-info-reports-plugin to 3.1.2
Update spotbugs-maven-plugin to 4.2.3
Change-Id: I3b77b0ef21bdf69a3009fb64af0d23d79b518009
2021-06-01 16:36:43 +02:00
Matthias Sohn
677d7794cc
Prepare 5.12.0-SNAPSHOT builds
...
Change-Id: If563be77aab768ac1f31ae2211fb0892d0205a2a
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2021-06-01 16:13:41 +02:00
Matthias Sohn
4760628d73
Update Orbit to S20210518003616 and ant to 1.10.10.v20210426-1926
...
Change-Id: I87df882d4434c4fb107b8bd662ce63749078f1bd
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2021-06-01 08:50:09 +02:00
Han-Wen NIenhuys
6dc3506b52
Merge "Skip detecting content renames for binary files"
2021-05-31 08:57:13 -04:00
Youssef Elghareeb
1788b72d1a
Skip detecting content renames for binary files
...
This is similar to change Idbc2c29bd that skipped detecting content
renames for large files. With this change, we added a new option in
RenameDetector called "skipContentRenamesForBinaryFiles", that when set,
causes binary files with any slight modification to be identified as
added/deleted. The default for this boolean is false, so preserving
current behaviour.
Change-Id: I4770b1f69c60b1037025ddd0940ba86df6047299
2021-05-31 13:48:37 +02:00
Matthias Sohn
ea02639d3e
Merge changes I34319d70,I43fad374,Ie531a253,Id0dfcfd0
...
* changes:
Finish upgrading eclipse-jarsigner-plugin to 1.3.1
Upgrade maven-javadoc-plugin to 3.3.0
Update maven-project-info-reports-plugin to 3.1.2
Update spotbugs-maven-plugin to 4.2.3
2021-05-28 18:33:52 -04:00
Ivan Frade
c59626ad7a
RepoCommand: Retry commit on LockFailure
...
When the target repository is receiving commits from other sources,
the repo command commit can fail with a LOCK_FAILURE. We could let
callers retry, but then the command needs to redo all the work (opening
all subrepos to recreate the tree).
Retry the commit in LOCK_FAILURE inside the command. The commit
rewrites the whole tree, so it shouldn't have merge errors. Use an
exponential delay with jitter for the retries.
Change-Id: I517b6f2afd16a4b695e6cf471b5d6cf492024ec4
Signed-off-by: Ivan Frade <ifrade@google.com>
2021-05-26 14:07:28 -07:00
Marco Miller
22dcb6f56d
Finish upgrading eclipse-jarsigner-plugin to 1.3.1
...
Commit 46b0f8a04
started that upgrade while missing this additional
change.
Change-Id: I34319d7006be13534497499e97536a8278906b1f
Signed-off-by: Marco Miller <marco.miller@ericsson.com>
2021-05-26 15:58:11 -04:00
Marco Miller
f718df45ac
Upgrade maven-javadoc-plugin to 3.3.0
...
Change-Id: I43fad374b6af1700c078b29f5ff45e2fd0b4cd00
Signed-off-by: Marco Miller <marco.miller@ericsson.com>
2021-05-26 15:47:12 -04:00
Marco Miller
74cd3d4f75
Update maven-project-info-reports-plugin to 3.1.2
...
Change-Id: Ie531a253a37459ee55ddb7f5ed7bad414fe6b67e
Signed-off-by: Marco Miller <marco.miller@ericsson.com>
2021-05-26 15:45:49 -04:00
Marco Miller
85f3531d4b
Update spotbugs-maven-plugin to 4.2.3
...
Change-Id: Id0dfcfd060e19fb84fd5ec0cb7bafc9d13153660
Signed-off-by: Marco Miller <marco.miller@ericsson.com>
2021-05-26 15:38:49 -04:00
Matthias Sohn
ff4c10bf90
JGit v5.12.0.202105261145-m3
...
Change-Id: I3b1af2032227900e6e0c6189f47bace1df67f0ab
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2021-05-26 17:43:55 +02:00
Matthias Sohn
2f2f6e51b9
Merge branch 'master' into stable-5.12
...
* master:
RepoCommand: Do not set 'branch' if the revision is a tag
pgm: rewrite parents when --parents flag is passed
ApplyCommand: fix "no newline at end" detection
ApplyCommand: handle completely empty context lines in text patches
ApplyCommand: use byte arrays for text patches, not strings
ApplyCommand: support binary patches
ApplyCommand: add a stream to apply a delta patch
ApplyCommand: add streams to read/write binary patch hunks
ApplyCommand: add a base-85 codec
ApplyCommand: convert to git internal format before applying patch
SSH config: fix whitespace handling
SSH config: fix negated patterns
Fix @since tag for introduction of PUBKEY_ACCEPTED_ALGORITHMS
Prepare 5.11.2-SNAPSHOT builds
JGit v5.11.1.202105131744-r
Add a cgit interoperability test for LockFile
Add TemporaryBuffer.toString(int limit)
LockFile: create OutputStream only when needed
Add git config for conflict style merge/diff3
Change-Id: If7751ff99079eaea31ed1fce811d141ecf209727
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2021-05-26 17:21:30 +02:00