Skip to content

Commit 54dd423

Browse files
author
tony.merrigan
committed
JGit with WANdisco replication - v6.6.0-WDv1
New Features ------------ - JGit v6.6.0 includes additional fixes to support GerritMS 3.7.0 which is based on Gerrit 3.7.6+.
1 parent d3962e0 commit 54dd423

File tree

176 files changed

+5922
-2001
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

176 files changed

+5922
-2001
lines changed

‎.gitignore‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@
44
infer-out
55
bazel-*
66

7+
*.iml
8+
**/.idea
9+
**/.ijwb
10+
*.versionsBackup
11+
nb-configuration\.xml
12+
THIRD-PARTY\.properties
13+
NOTICE
14+
715
# Do not add editor- and OS-specific files like *~ (Emacs) and .DS_Store
816
# (macOS). Instead, add them to $XDG_CONFIG_HOME/git/ignore
917
# (~/.config/git/ignore if $XDG_CONFIG_HOME is not set) or

‎NOTICE.template‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
/********************************************************************************
2+
* Copyright (c) 2014-2018 WANdisco
3+
*
4+
* This program and the accompanying materials are made available under the
5+
* terms of the Eclipse Public License 2.0 which is available at
6+
* http://www.eclipse.org/legal/epl-2.0.
7+
*
8+
* SPDX-License-Identifier: EPL-2.0
9+
*
10+
********************************************************************************/
11+
12+
13+
This project includes:
14+
#GENERATED_NOTICES#
15+
16+
This project also includes code under copywrite of the following entities:
17+
http://code.google.com/p/maven-license-plugin/

‎README.md‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
1-
# Java Git
1+
# Replicated JGit Support
2+
Note this code has been taken as a fork from
3+
https://github.com/eclipse/jgit. The fork then has WANdisco replication
4+
support added to it, and produced to support replicated products such as `Gerrit Multisite`.
25

6+
For more information see: https://wandisco.com/scm
7+
8+
Java Git
9+
========
310
An implementation of the Git version control system in pure Java.
411

512
This project is licensed under the __EDL__ (Eclipse Distribution
@@ -103,8 +110,19 @@ __org.eclipse.jgit.junit.ssh__: Helpers for unit testing
103110
is installed. Modifying PATH is the recommended option if C Git is
104111
installed.
105112

106-
- We try to use the same notation of `$HOME` as C Git does. On Windows
107-
this is often not the same value as the `user.home` system property.
113+
- We try to use the same notation of $HOME as C Git does. On Windows
114+
this is often not the same value as the user.home system property.
115+
116+
Replicated JGit Configuration Defaults
117+
----------------
118+
This fork of JGit has altered some of the default internal configuration values.
119+
Default configurations have been updated to the following:
120+
* gc.auto = 0
121+
* gc.autopacklimit = 0
122+
* gc.autoDetach = false
123+
* receive.autogc = false
124+
125+
The WindowCacheConfig has also been enhanced to read global git configuration by default.
108126

109127
## Features
110128

‎WORKSPACE‎

Lines changed: 51 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,13 @@ load_bazlets(commit = "f30a992da9fc855dce819875afb59f9dd6f860cd")
77

88
load(
99
"@com_googlesource_gerrit_bazlets//tools:maven_jar.bzl",
10+
"MAVEN_LOCAL",
1011
"maven_jar",
1112
)
13+
load(
14+
"//tools:maven_custom.bzl",
15+
"WANDISCO_ASSETS",
16+
)
1217

1318
http_archive(
1419
name = "rbe_jdk11",
@@ -72,6 +77,17 @@ maven_jar(
7277
sha1 = "c01428efa717624f7aabf4df319939dda9646b2d",
7378
)
7479

80+
# WANdisco maven assets
81+
# TODO: check how to make this provided scope in LFS server same as we do in POM.xml
82+
_GERRIT_GITMS_VERSION = "3.0.0.1"
83+
84+
maven_jar(
85+
name = "gerrit-gitms-shared",
86+
artifact = "com.wandisco:gerrit-gitms-shared:" + _GERRIT_GITMS_VERSION,
87+
repository = WANDISCO_ASSETS,
88+
sha1 = 632c5626df837567c1dd17bd9ebf0a652363b397
89+
)
90+
7591
maven_jar(
7692
name = "javaewah",
7793
artifact = "com.googlecode.javaewah:JavaEWAH:1.2.3",
@@ -95,19 +111,19 @@ SSHD_VERS = "2.10.0"
95111
maven_jar(
96112
name = "sshd-osgi",
97113
artifact = "org.apache.sshd:sshd-osgi:" + SSHD_VERS,
98-
sha1 = "03677ac1da780b7bdb682da50b762d79ea0d940d",
114+
sha1 = "a93e59e8786cb72ecd6300c7a54a038eb930ba20",
99115
)
100116

101117
maven_jar(
102118
name = "sshd-sftp",
103119
artifact = "org.apache.sshd:sshd-sftp:" + SSHD_VERS,
104-
sha1 = "88707339ac0693d48df0ec1bafb84c78d792ed08",
120+
sha1 = "a1bb22888d9a90ed68ce3231946b1904cb3187f5",
105121
)
106122

107123
maven_jar(
108124
name = "jna",
109125
artifact = "net.java.dev.jna:jna:5.13.0",
110-
sha1 = "1200e7ebeedbe0d10062093f32925a912020e747",
126+
sha1 = "7b9e9f231f04897eff97a1a4a89b39b3834e79e7",
111127
)
112128

113129
maven_jar(
@@ -128,6 +144,38 @@ maven_jar(
128144
sha1 = "4bfc12adfe4842bf07b657f0369c4cb522955686",
129145
)
130146

147+
maven_jar(
148+
name = "commons-lang",
149+
artifact = "commons-lang:commons-lang:2.6",
150+
sha1 = "0ce1edb914c94ebc388f086c6827e8bdeec71ac2",
151+
)
152+
153+
maven_jar(
154+
name = "jcl-over-slf4j",
155+
artifact = "org.slf4j:jcl-over-slf4j:1.7.5",
156+
sha1 = "0cd5970bd13fa85f7bed41ca606d6daf7cbf1365",
157+
)
158+
159+
LOG4J_VERSION = "2.17.1"
160+
161+
maven_jar(
162+
name = "log4j-core",
163+
artifact = "org.apache.logging.log4j:log4j-core:" + LOG4J_VERSION,
164+
sha1 = "e257b0562453f73eabac1bc3181ba33e79d193ed",
165+
)
166+
167+
maven_jar(
168+
name = "log4j-api",
169+
artifact = "org.apache.logging.log4j:log4j-api:" + LOG4J_VERSION,
170+
sha1 = "23cdb2c6babad9b2b0dcf47c6a2c29d504e4c7a8",
171+
)
172+
173+
maven_jar(
174+
name = "slf4j-log4j12",
175+
artifact = "org.slf4j:slf4j-log4j12:1.7.30",
176+
sha1 = "6edffc576ce104ec769d954618764f39f0f0f10d",
177+
)
178+
131179
maven_jar(
132180
name = "log-api",
133181
artifact = "org.slf4j:slf4j-api:1.7.36",

‎dependency-management/pom.xml‎

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<parent>
7+
<groupId>org.eclipse.jgit</groupId>
8+
<artifactId>org.eclipse.jgit-parent</artifactId>
9+
<version>6.6.0-WDv1</version>
10+
</parent>
11+
12+
<properties>
13+
<!-- The BOM project is defined in the module that uses it. Otherwise a dependency would need to be added to the aggregator leve to allow update property to work.-->
14+
<alm-common-bom-version>1.12.0.1-GERRITMS</alm-common-bom-version>
15+
</properties>
16+
17+
18+
<artifactId>dependency-management</artifactId>
19+
<packaging>pom</packaging>
20+
21+
<profiles>
22+
<profile>
23+
<id>dependency-check</id>
24+
<activation>
25+
<property>
26+
<name>isOfficialBuild</name>
27+
<value>true</value>
28+
</property>
29+
</activation>
30+
<build>
31+
<plugins>
32+
<plugin>
33+
<groupId>org.codehaus.mojo</groupId>
34+
<artifactId>exec-maven-plugin</artifactId>
35+
<version>1.6.0</version>
36+
<executions>
37+
<execution>
38+
<id>Check Dependencies</id>
39+
<phase>validate</phase>
40+
<goals>
41+
<goal>exec</goal>
42+
</goals>
43+
<configuration>
44+
<arguments>
45+
<argument>--project-version</argument>
46+
<argument>${alm-common-bom-version}</argument>
47+
</arguments>
48+
</configuration>
49+
</execution>
50+
</executions>
51+
<configuration>
52+
<executable>${project.basedir}/dependency-management.sh</executable>
53+
<skip>${skipDependencyManagement}</skip>
54+
</configuration>
55+
</plugin>
56+
</plugins>
57+
</build>
58+
<!-- This is not strictly required by dependency management, but it is required to update dependency use for updateProperty-->
59+
<dependencyManagement>
60+
<dependencies>
61+
<dependency>
62+
<groupId>com.wandisco</groupId>
63+
<artifactId>alm-common-bom</artifactId>
64+
<version>${alm-common-bom-version}</version>
65+
<type>pom</type>
66+
<scope>import</scope>
67+
<optional>true</optional>
68+
</dependency>
69+
</dependencies>
70+
</dependencyManagement>
71+
</profile>
72+
<profile>
73+
<id>dependency-update</id>
74+
<build>
75+
<plugins>
76+
<plugin>
77+
<groupId>org.codehaus.mojo</groupId>
78+
<artifactId>exec-maven-plugin</artifactId>
79+
<version>1.6.0</version>
80+
<executions>
81+
<execution>
82+
<id>Update Dependencies</id>
83+
<phase>validate</phase>
84+
<goals>
85+
<goal>exec</goal>
86+
</goals>
87+
<configuration>
88+
<arguments>
89+
<argument>--project-version</argument>
90+
<argument>${alm-common-bom-version}</argument>
91+
<argument>--update</argument>
92+
<argument>--debug</argument>
93+
</arguments>
94+
</configuration>
95+
</execution>
96+
</executions>
97+
<configuration>
98+
<executable>${project.basedir}/dependency-management.sh</executable>
99+
<skip>${skipDependencyManagement}</skip>
100+
</configuration>
101+
</plugin>
102+
</plugins>
103+
</build>
104+
</profile>
105+
</profiles>
106+
</project>

‎lib/BUILD‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,14 @@ java_library(
2424
exports = ["@commons-codec//jar"],
2525
)
2626

27+
java_library(
28+
name = "commons-lang",
29+
visibility = [
30+
"//org.eclipse.jgit:__pkg__",
31+
],
32+
exports = ["@commons-lang3//jar"],
33+
)
34+
2735
java_library(
2836
name = "commons-logging",
2937
visibility = ["//visibility:public"],
@@ -40,6 +48,16 @@ java_library(
4048
exports = ["@eddsa//jar"],
4149
)
4250

51+
java_library(
52+
name = "gerrit-gitms-shared",
53+
# TODO: TREV This should be provided dependency... but org.eclipse.jgit.lfs.server depends on it.
54+
visibility = [
55+
"//org.eclipse.jgit:__pkg__",
56+
"//org.eclipse.jgit.lfs.server:__pkg__",
57+
],
58+
exports = ["@gerrit-gitms-shared//jar"],
59+
)
60+
4361
java_library(
4462
name = "gson",
4563
visibility = [

‎license-mappings.xml‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2+
<!--
3+
Licensed to Apereo under one or more contributor license
4+
agreements. See the NOTICE file distributed with this work
5+
for additional information regarding copyright ownership.
6+
Apereo licenses this file to you under the Apache License,
7+
Version 2.0 (the "License"); you may not use this file
8+
except in compliance with the License. You may obtain a
9+
copy of the License at the following location:
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
Unless required by applicable law or agreed to in writing,
12+
software distributed under the License is distributed on an
13+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
KIND, either express or implied. See the License for the
15+
specific language governing permissions and limitations
16+
under the License.
17+
-->
18+
<license-lookup xmlns="https://source.jasig.org/schemas/maven-notice-plugin/license-lookup" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://source.jasig.org/schemas/maven-notice-plugin/license-lookup https://source.jasig.org/schemas/maven-notice-plugin/license-lookup/license-lookup-v1.0.xsd">
19+
<artifact>
20+
<groupId>nekohtml</groupId>
21+
<artifactId>xercesMinimal</artifactId>
22+
<license>Apache License, Version 2.0</license>
23+
</artifact>
24+
<artifact>
25+
<groupId>org.slf4j</groupId>
26+
<artifactId>slf4j-nop</artifactId>
27+
<license>MIT License</license>
28+
</artifact>
29+
<artifact>
30+
<groupId>classworlds</groupId>
31+
<artifactId>classworlds</artifactId>
32+
<license>BSD Style License</license>
33+
</artifact>
34+
<artifact>
35+
<groupId>commons-codec</groupId>
36+
<artifactId>commons-codec</artifactId>
37+
<license>Apache License, Version 2.0</license>
38+
</artifact>
39+
<artifact>
40+
<groupId>org.codehaus.plexus</groupId>
41+
<artifactId>plexus-container-default</artifactId>
42+
<license>Apache License, Version 2.0</license>
43+
</artifact>
44+
<artifact>
45+
<groupId>org.codehaus.plexus</groupId>
46+
<artifactId>plexus-interactivity-api</artifactId>
47+
<license>Apache License, Version 2.0</license>
48+
</artifact>
49+
<artifact>
50+
<groupId>org.slf4j</groupId>
51+
<artifactId>jcl-over-slf4j</artifactId>
52+
<license>MIT License</license>
53+
</artifact>
54+
<artifact>
55+
<groupId>org.slf4j</groupId>
56+
<artifactId>slf4j-api</artifactId>
57+
<license>MIT License</license>
58+
</artifact>
59+
<artifact>
60+
<groupId>org.slf4j</groupId>
61+
<artifactId>slf4j-jdk14</artifactId>
62+
<license>MIT License</license>
63+
</artifact>
64+
<artifact>
65+
<groupId>org.eclipse.jgit</groupId>
66+
<artifactId>org.eclipse.jgit-parent</artifactId>
67+
<license>MIT License</license>
68+
</artifact>
69+
<artifact>
70+
<groupId>args4j</groupId>
71+
<artifactId>args4j</artifactId>
72+
<license>Apache License, Version 2.0</license>
73+
</artifact>
74+
<artifact>
75+
<groupId>com.wandisco</groupId>
76+
<artifactId>gerrit-gitms-interface</artifactId>
77+
<license>Apache License, Version 2.0</license>
78+
</artifact>
79+
</license-lookup>

‎local.properties‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# This can be setup to be WD internal artifactory server locally, but use Nexus, for public OpenSource repo.
2+
3+
# Public release assets repository
4+
download.WANDISCO = https://nexus.wandisco.com/repository/wd_releases
5+

‎org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name
55
Automatic-Module-Name: org.eclipse.jgit.ant.test
66
Bundle-SymbolicName: org.eclipse.jgit.ant.test
77
Bundle-Vendor: %Bundle-Vendor
8-
Bundle-Version: 6.6.0.202305301015-r
8+
Bundle-Version: 6.6.0-WDv1
99
Bundle-ActivationPolicy: lazy
1010
Bundle-RequiredExecutionEnvironment: JavaSE-11
1111
Import-Package: org.apache.tools.ant,

0 commit comments

Comments
 (0)