Skip to content

Commit 17d146e

Browse files
author
Build Jenkins
committed
JGit with Cirata replication - RELEASE_6.10.1-WDv2_OpenSource
Known Issues ------------ - Support for replicated RefTable based repositories is temporarily disabled. This will be re-enabled in an upcoming release. v6.6.0-WDv1-SNAPSHOT Prelude ------- JGit with WANdisco replication New Features ------------ - Add reno - Upgrade log4j2 from 2.14.0 -> 2.17.2 - Upgrade commons-compress 1.20 -> 1.21 - Upgrade junit from 4.12 -> 4.13.2
1 parent e328d20 commit 17d146e

File tree

184 files changed

+6710
-540
lines changed

Some content is hidden

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

184 files changed

+6710
-540
lines changed

‎.gitignore‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@ target/
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

‎.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
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+
wrapperVersion=3.3.2
18+
distributionType=only-script
19+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.8/apache-maven-3.8.8-bin.zip

‎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-2024 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: 56 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,13 @@ load_bazlets(commit = "f9c119e45d9a241bee720b7fbd6c7fdbc952da5f")
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 = "rules_java",
@@ -92,6 +97,23 @@ maven_jar(
9297
sha1 = "c01428efa717624f7aabf4df319939dda9646b2d",
9398
)
9499

100+
# WANdisco maven assets
101+
# TODO: check how to make this provided scope in LFS server same as we do in POM.xml
102+
_GERRIT_GITMS_VERSION = "4.0.0.1"
103+
104+
maven_jar(
105+
name = "gerrit-gitms-shared",
106+
artifact = "com.wandisco:gerrit-gitms-shared:" + _GERRIT_GITMS_VERSION,
107+
repository = WANDISCO_ASSETS,
108+
sha1 = "152aa5b9fad4cfdf1893ac6a2aa6a1154ca63daf"
109+
)
110+
111+
maven_jar(
112+
name = "guava",
113+
artifact = "com.google.guava:guava:33.2.1-jre",
114+
sha1 = "818e780da2c66c63bbb6480fef1f3855eeafa3e4"
115+
)
116+
95117
maven_jar(
96118
name = "javaewah",
97119
artifact = "com.googlecode.javaewah:JavaEWAH:1.2.3",
@@ -129,13 +151,13 @@ JNA_VERS = "5.14.0"
129151
maven_jar(
130152
name = "jna",
131153
artifact = "net.java.dev.jna:jna:" + JNA_VERS,
132-
sha1 = "67bf3eaea4f0718cb376a181a629e5f88fa1c9dd",
154+
#sha1 = "67bf3eaea4f0718cb376a181a629e5f88fa1c9dd",
133155
)
134156

135157
maven_jar(
136158
name = "jna-platform",
137159
artifact = "net.java.dev.jna:jna-platform:" + JNA_VERS,
138-
sha1 = "28934d48aed814f11e4c584da55c49fa7032b31b",
160+
#sha1 = "28934d48aed814f11e4c584da55c49fa7032b31b",
139161
)
140162

141163
maven_jar(
@@ -150,6 +172,38 @@ maven_jar(
150172
sha1 = "3dc966156ef19d23c839715165435e582fafa753",
151173
)
152174

175+
maven_jar(
176+
name = "commons-lang",
177+
artifact = "commons-lang:commons-lang:2.6",
178+
sha1 = "0ce1edb914c94ebc388f086c6827e8bdeec71ac2",
179+
)
180+
181+
maven_jar(
182+
name = "jcl-over-slf4j",
183+
artifact = "org.slf4j:jcl-over-slf4j:1.7.5",
184+
sha1 = "0cd5970bd13fa85f7bed41ca606d6daf7cbf1365",
185+
)
186+
187+
LOG4J_VERSION = "2.17.1"
188+
189+
maven_jar(
190+
name = "log4j-core",
191+
artifact = "org.apache.logging.log4j:log4j-core:" + LOG4J_VERSION,
192+
sha1 = "e257b0562453f73eabac1bc3181ba33e79d193ed",
193+
)
194+
195+
maven_jar(
196+
name = "log4j-api",
197+
artifact = "org.apache.logging.log4j:log4j-api:" + LOG4J_VERSION,
198+
sha1 = "23cdb2c6babad9b2b0dcf47c6a2c29d504e4c7a8",
199+
)
200+
201+
maven_jar(
202+
name = "slf4j-log4j12",
203+
artifact = "org.slf4j:slf4j-log4j12:1.7.30",
204+
sha1 = "6edffc576ce104ec769d954618764f39f0f0f10d",
205+
)
206+
153207
maven_jar(
154208
name = "log-api",
155209
artifact = "org.slf4j:slf4j-api:1.7.36",

‎dependency-management/pom.xml‎

Lines changed: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
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.10.1-WDv2</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.14.0.1-GITMS</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 Maven Dependencies</id>
39+
<phase>validate</phase>
40+
<goals>
41+
<goal>exec</goal>
42+
</goals>
43+
<configuration>
44+
<executable>${project.basedir}/dependency-management.sh</executable>
45+
<arguments>
46+
<argument>--project-version</argument>
47+
<argument>${alm-common-bom-version}</argument>
48+
</arguments>
49+
</configuration>
50+
</execution>
51+
<execution>
52+
<id>Check Bazel Dependencies</id>
53+
<phase>validate</phase>
54+
<goals>
55+
<goal>exec</goal>
56+
</goals>
57+
<configuration>
58+
<executable>${project.parent.basedir}/tools/check_sha.py</executable>
59+
<workingDirectory>${project.parent.basedir}</workingDirectory>
60+
<arguments>
61+
<argument>--check</argument>
62+
<argument>-u</argument>
63+
<argument>${alm-common-bom-version}</argument>
64+
</arguments>
65+
</configuration>
66+
</execution>
67+
</executions>
68+
<configuration>
69+
<skip>${skipDependencyManagement}</skip>
70+
</configuration>
71+
</plugin>
72+
</plugins>
73+
</build>
74+
<!-- This is not strictly required by dependency management, but it is required to update dependency use for updateProperty-->
75+
<dependencyManagement>
76+
<dependencies>
77+
<dependency>
78+
<groupId>com.wandisco</groupId>
79+
<artifactId>alm-common-bom</artifactId>
80+
<version>${alm-common-bom-version}</version>
81+
<type>pom</type>
82+
<scope>import</scope>
83+
<optional>true</optional>
84+
</dependency>
85+
</dependencies>
86+
</dependencyManagement>
87+
</profile>
88+
<profile>
89+
<id>dependency-update</id>
90+
<build>
91+
<plugins>
92+
<plugin>
93+
<groupId>org.codehaus.mojo</groupId>
94+
<artifactId>exec-maven-plugin</artifactId>
95+
<version>1.6.0</version>
96+
<executions>
97+
<execution>
98+
<id>Update Maven Dependencies</id>
99+
<phase>validate</phase>
100+
<goals>
101+
<goal>exec</goal>
102+
</goals>
103+
<configuration>
104+
<executable>${project.basedir}/dependency-management.sh</executable>
105+
<arguments>
106+
<argument>--project-version</argument>
107+
<argument>${alm-common-bom-version}</argument>
108+
<argument>--update</argument>
109+
<argument>--debug</argument>
110+
</arguments>
111+
</configuration>
112+
</execution>
113+
<execution>
114+
<id>Update Bazel Dependencies</id>
115+
<phase>validate</phase>
116+
<goals>
117+
<goal>exec</goal>
118+
</goals>
119+
<configuration>
120+
<executable>${project.parent.basedir}/tools/check_sha.py</executable>
121+
<workingDirectory>${project.parent.basedir}</workingDirectory>
122+
<arguments>
123+
<argument>-u</argument>
124+
<argument>${alm-common-bom-version}</argument>
125+
</arguments>
126+
</configuration>
127+
</execution>
128+
</executions>
129+
<configuration>
130+
<skip>${skipDependencyManagement}</skip>
131+
</configuration>
132+
</plugin>
133+
</plugins>
134+
</build>
135+
</profile>
136+
</profiles>
137+
</project>

‎lib/BUILD‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,14 @@ java_library(
4848
exports = ["@commons-codec//jar"],
4949
)
5050

51+
java_library(
52+
name = "commons-lang",
53+
visibility = [
54+
"//org.eclipse.jgit:__pkg__",
55+
],
56+
exports = ["@commons-lang3//jar"],
57+
)
58+
5159
java_library(
5260
name = "commons-logging",
5361
visibility = ["//visibility:public"],
@@ -64,6 +72,24 @@ java_library(
6472
exports = ["@eddsa//jar"],
6573
)
6674

75+
java_library(
76+
name = "gerrit-gitms-shared",
77+
# TODO: TREV This should be provided dependency... but org.eclipse.jgit.lfs.server depends on it.
78+
visibility = [
79+
"//org.eclipse.jgit:__pkg__",
80+
"//org.eclipse.jgit.lfs.server:__pkg__",
81+
],
82+
exports = ["@gerrit-gitms-shared//jar"],
83+
)
84+
85+
java_library(
86+
name = "guava",
87+
visibility = [
88+
"//org.eclipse.jgit:__pkg__",
89+
],
90+
exports = ["@guava//jar"],
91+
)
92+
6793
java_library(
6894
name = "gson",
6995
visibility = [

0 commit comments

Comments
 (0)