You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ts...@apache.org on 2020/08/10 09:27:49 UTC
[logging-log4cxx] 02/02: Replacing MVN-based dependencies in favour
of a customly maintained markdown-table with those. MVN might be removed in
the not too far future anyway and the approach using a local repo seems
pretty complicated as well. The markdown document as well easily provides
support for arbitrary describing text beyond a table.
This is an automated email from the ASF dual-hosted git repository.
tschoening pushed a commit to branch gphr_30_docs
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit 2a5c157896b26c4c6445b1644de8266d3d0b54b1
Author: Thorsten Schöning <ts...@am-soft.de>
AuthorDate: Mon Aug 10 11:27:34 2020 +0200
Replacing MVN-based dependencies in favour of a customly maintained markdown-table with those. MVN might be removed in the not too far future anyway and the approach using a local repo seems pretty complicated as well. The markdown document as well easily provides support for arbitrary describing text beyond a table.
---
pom.xml | 54 ----------------------
.../log4cxx/deps/gzip/1.10.0/gzip-1.10.0.pom | 10 ----
.../logging/log4cxx/deps/sed/4.8.0/sed-4.8.0.pom | 10 ----
.../markdown/{dependencies2.md => dependencies.md} | 19 ++++----
src/site/site.xml | 3 --
5 files changed, 10 insertions(+), 86 deletions(-)
diff --git a/pom.xml b/pom.xml
index ee5e1ed..615c19a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,21 +9,6 @@
<url>http://logging.apache.org/log4cxx</url>
<inceptionYear>2003</inceptionYear>
- <repositories>
- <!-- Apache APR -->
- <repository>
- <id>mvn_tmatesoft_com</id>
- <name>maven.tmatesoft.com</name>
- <url>https://maven.tmatesoft.com/content/repositories/releases</url>
- </repository>
-
- <!-- Local repos to model non-public dependencies for different purposes. -->
- <repository>
- <id>log4cxx_non_public_deps</id>
- <url>file:///${project.basedir}/src/mvn_repo</url>
- </repository>
- </repositories>
-
<issueManagement>
<system>JIRA</system>
<url>https://issues.apache.org/jira/browse/LOGCXX</url>
@@ -368,45 +353,6 @@
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.apache.apr</groupId>
- <artifactId>apr</artifactId>
- <version>1.5.2</version>
- <scope>compile</scope>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>org.apache.apr</groupId>
- <artifactId>apr-util</artifactId>
- <version>1.5.4</version>
- <scope>compile</scope>
- <type>pom</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4cxx.deps</groupId>
- <artifactId>gzip</artifactId>
- <version>1.10.0</version>
- <scope>runtime</scope>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4cxx.deps</groupId>
- <artifactId>sed</artifactId>
- <version>4.8.0</version>
- <scope>test</scope>
- <type>pom</type>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
<reporting>
<excludeDefaults>true</excludeDefaults>
<plugins>
diff --git a/src/mvn_repo/org/apache/logging/log4cxx/deps/gzip/1.10.0/gzip-1.10.0.pom b/src/mvn_repo/org/apache/logging/log4cxx/deps/gzip/1.10.0/gzip-1.10.0.pom
deleted file mode 100644
index b15e4ca..0000000
--- a/src/mvn_repo/org/apache/logging/log4cxx/deps/gzip/1.10.0/gzip-1.10.0.pom
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.logging.log4cxx.deps</groupId>
- <artifactId>gzip</artifactId>
- <version>1.10.0</version>
- <packaging>zip</packaging>
-</project>
diff --git a/src/mvn_repo/org/apache/logging/log4cxx/deps/sed/4.8.0/sed-4.8.0.pom b/src/mvn_repo/org/apache/logging/log4cxx/deps/sed/4.8.0/sed-4.8.0.pom
deleted file mode 100644
index 15eced2..0000000
--- a/src/mvn_repo/org/apache/logging/log4cxx/deps/sed/4.8.0/sed-4.8.0.pom
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.logging.log4cxx.deps</groupId>
- <artifactId>sed</artifactId>
- <version>4.8.0</version>
- <packaging>zip</packaging>
-</project>
diff --git a/src/site/markdown/dependencies2.md b/src/site/markdown/dependencies.md
similarity index 77%
rename from src/site/markdown/dependencies2.md
rename to src/site/markdown/dependencies.md
index 0cfc835..2e2beae 100644
--- a/src/site/markdown/dependencies2.md
+++ b/src/site/markdown/dependencies.md
@@ -24,28 +24,29 @@ log4cxx requires the following software to build and/or run correctly:
|Apache Portable Runtime(APR)|>=1.5.4|Compile/Runtime|https://apr.apache.org
|APR-Util |>=1.5.4|Compile/Runtime|https://apr.apache.org
|gzip |any |Test/Runtime(optional)|https://gzip.org
+|sed |any |Test|N/A
|zip |any |Test/Runtime(optional)|N/A
|log4j |1.2.14 |Test |https://http://logging.apache.org/log4j/2.x/
-|java |>=6 |Test |https://www.oracle.com/java/technologies/
+|java |>=6 |Test |https://adoptopenjdk.net
-## APR/APR-Util
+## APR+APR-Util
The Apache Portable Runtime(APR) provides the cross-platform backend for log4cxx.
Both APR and APR-util need to be installed and available on your system.
-## zip/gzip
+## sed+gzip+zip
-These applications are needed during test of log4cxx. gzip is generally installed
-by default on Linux. zip may not be installed by default; check your distribution's
+These applications are needed during test of log4cxx. `gzip`and `sed` are generally installed
+by default on Linux. `zip` may not be installed by default; check your distribution's
documentation for information on how to install these applications.
-For Windows, you will have to install gzip and zip through a system such as
+For Windows, you will have to install those tools through a system such as
MinGW, cygwin, or MSYS2.
-These applications are only needed during runtime if you are compressing the log
-files, for example by setting a rollover policy which ends in ".zip" or ".gz".
+`gzip` and `zip` only needed during runtime if you are compressing the log
+files, for example by setting a rollover policy which ends in `.gz` or `.zip`.
-## log4j / Java
+## log4j+Java
Log4j and Java are needed to run tests to ensure that log4cxx has binary
compatability with log4j.
diff --git a/src/site/site.xml b/src/site/site.xml
index 855ff8c..c19d505 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -106,9 +106,6 @@
<item name="Dependencies"
href="dependencies.html"
/>
- <item name="Dependencies-markdown"
- href="dependencies2.html"
- />
<item name="Building"
href="/building/index.html">
<item name="Apache Maven 2"