opendev/gerrit
Code Issues Proposed changes

Merge "Isolate log4j dep"

Browse Source
This commit is contained in:
Joerg Zieren 2020-02-26 10:28:49 +00:00 committed by Gerrit Code Review
commit b4cddf0227
7 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/com/google/gerrit/pgm/http/jetty/BUILD
View File

@ -10,10 +10,10 @@ java_library(
"//java/com/google/gerrit/lifecycle",
"//java/com/google/gerrit/metrics",
"//java/com/google/gerrit/server",
"//java/com/google/gerrit/server/logging",
"//java/com/google/gerrit/server/util/time",
"//java/com/google/gerrit/sshd",
"//java/com/google/gerrit/util/http",
"//java/com/google/gerrit/util/logging",
"//lib:gson",
"//lib:guava",
"//lib:jgit",

4
java/com/google/gerrit/pgm/http/jetty/HttpLogJsonLayout.java
View File

@ -24,8 +24,8 @@ import static com.google.gerrit.pgm.http.jetty.HttpLog.P_STATUS;
import static com.google.gerrit.pgm.http.jetty.HttpLog.P_USER;
import static com.google.gerrit.pgm.http.jetty.HttpLog.P_USER_AGENT;
import com.google.gerrit.server.logging.JsonLayout;
import com.google.gerrit.server.logging.JsonLogEntry;
import com.google.gerrit.util.logging.JsonLayout;
import com.google.gerrit.util.logging.JsonLogEntry;
import java.time.format.DateTimeFormatter;
import org.apache.log4j.spi.LoggingEvent;

1
java/com/google/gerrit/sshd/BUILD
View File

@ -22,6 +22,7 @@ java_library(
"//java/com/google/gerrit/server/restapi",
"//java/com/google/gerrit/server/util/time",
"//java/com/google/gerrit/util/cli",
"//java/com/google/gerrit/util/logging",
"//lib:args4j",
"//lib:gson",
"//lib:guava",

4
java/com/google/gerrit/sshd/SshLogJsonLayout.java
View File

@ -23,8 +23,8 @@ import static com.google.gerrit.sshd.SshLog.P_STATUS;
import static com.google.gerrit.sshd.SshLog.P_USER_NAME;
import static com.google.gerrit.sshd.SshLog.P_WAIT;
import com.google.gerrit.server.logging.JsonLayout;
import com.google.gerrit.server.logging.JsonLogEntry;
import com.google.gerrit.util.logging.JsonLayout;
import com.google.gerrit.util.logging.JsonLogEntry;
import java.time.format.DateTimeFormatter;
import org.apache.log4j.spi.LoggingEvent;

13
java/com/google/gerrit/util/logging/BUILD Normal file
View File

@ -0,0 +1,13 @@
load("@rules_java//java:defs.bzl", "java_library")
java_library(
name = "logging",
srcs = glob(
["*.java"],
),
visibility = ["//visibility:public"],
deps = [
"//lib:gson",
"//lib/log:log4j",
],
)

2
java/com/google/gerrit/server/logging/JsonLayout.java → java/com/google/gerrit/util/logging/JsonLayout.java
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.server.logging;
package com.google.gerrit.util.logging;
import com.google.gson.FieldNamingPolicy;
import com.google.gson.Gson;

2
java/com/google/gerrit/server/logging/JsonLogEntry.java → java/com/google/gerrit/util/logging/JsonLogEntry.java
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.server.logging;
package com.google.gerrit.util.logging;
import org.apache.log4j.spi.LoggingEvent;