You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by vy...@apache.org on 2023/01/09 09:15:17 UTC
[logging-log4j-tools] branch master updated: Merge `SECURITY.adoc` into `README.adoc`
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git
The following commit(s) were added to refs/heads/master by this push:
new 1df7c8c Merge `SECURITY.adoc` into `README.adoc`
1df7c8c is described below
commit 1df7c8c5f81a20d00e134e2a6875d034c1793e14
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Mon Jan 9 10:16:19 2023 +0100
Merge `SECURITY.adoc` into `README.adoc`
---
README.adoc | 9 ++++++---
SECURITY.adoc | 21 ---------------------
2 files changed, 6 insertions(+), 24 deletions(-)
diff --git a/README.adoc b/README.adoc
index 76e39d7..0220f33 100644
--- a/README.adoc
+++ b/README.adoc
@@ -24,15 +24,18 @@ Tooling **internally** used by https://logging.apache.org/log4j/2.x/[the Apache
xref:log4j-changelog/README.adoc[`log4j-changelog`]::
Tooling to export AsciiDoc-formatted changelog files.
-= Support
+== Support
Please keep in mind that this project is intended for internal usage only.
You can use GitHub Issues for feature requests and bug reports – not questions!
For the rest, you can use mailto:security@logging.apache.org[the Log4j development mailing list].
-include::SECURITY.adoc[]
+== Security
-= License
+If you have encountered an unlisted security vulnerability or other unexpected behaviour that has security impact, please report them privately to mailto:security@logging.apache.org[the Log4j security mailing list].
+See https://logging.apache.org/log4j/2.x/security.html[the Log4j Security page] for further details.
+
+== License
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.
diff --git a/SECURITY.adoc b/SECURITY.adoc
deleted file mode 100644
index 0770dbe..0000000
--- a/SECURITY.adoc
+++ /dev/null
@@ -1,21 +0,0 @@
-////
-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
-
- https://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.
-////
-
-= Security
-
-If you have encountered an unlisted security vulnerability or other unexpected behaviour that has security impact, please report them privately to mailto:security@logging.apache.org[the Log4j security mailing list].
-See https://logging.apache.org/log4j/2.x/security.html[the Log4j Security page] for further details.