You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@griffin.apache.org by gu...@apache.org on 2020/10/26 03:14:32 UTC
[griffin] branch master updated: compaliancy fix
This is an automated email from the ASF dual-hosted git repository.
guoyp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/griffin.git
The following commit(s) were added to refs/heads/master by this push:
new ef6466d compaliancy fix
ef6466d is described below
commit ef6466def71b154805779c1007a010c633577d78
Author: William Guo <gu...@apache.org>
AuthorDate: Mon Oct 26 11:14:23 2020 +0800
compaliancy fix
Author: William Guo <gu...@apache.org>
Closes #584 from guoyuepeng/compaliancy_fix_before_release_0.7.0.
---
.gitignore | 3 ++-
pom.xml | 1 +
service/src/main/resources/log4j2-spring.xml | 16 ++++++++++++++++
3 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index 5e0ef52..cd6b316 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
*.iml
.idea/
.DS_Store
+.java-version
target/**
# Mobile Tools for Java (J2ME)
@@ -42,4 +43,4 @@ measure/src/test/test_scala/*
.vscode
environment.local.ts
-logs/
\ No newline at end of file
+logs/
diff --git a/pom.xml b/pom.xml
index 7a68625..2c3e021 100644
--- a/pom.xml
+++ b/pom.xml
@@ -196,6 +196,7 @@ under the License.
<exclude>**/src/main/resources/public/**</exclude>
<exclude>**/pom.xml.releaseBackup</exclude>
<exclude>**/pom.xml.tag</exclude>
+ <exclude>**/_SUCCESS</exclude>
</excludes>
</configuration>
<executions>
diff --git a/service/src/main/resources/log4j2-spring.xml b/service/src/main/resources/log4j2-spring.xml
index c021b4a..9cee7a5 100644
--- a/service/src/main/resources/log4j2-spring.xml
+++ b/service/src/main/resources/log4j2-spring.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?><!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<Configuration status="WARN">
<Properties>
<Property name="PID">????</Property>