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/08 09:57:56 UTC
[logging-log4cxx] 02/02: Had an additional look at what is really
necessary for tests and couldn't find a reference to GREP anymore.
Additionally,
GZIP seems to be required at runtime in "gzcompressaction.cpp" as well,
not only in tests or better,
not additionally in tests. So I've refactored the modeled dependencies to
take that into account.
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 9ed755d528b87b409cd445ddce7981a7dcc7a104
Author: Thorsten Schöning <ts...@am-soft.de>
AuthorDate: Sat Aug 8 11:57:47 2020 +0200
Had an additional look at what is really necessary for tests and couldn't find a reference to GREP anymore. Additionally, GZIP seems to be required at runtime in "gzcompressaction.cpp" as well, not only in tests or better, not additionally in tests. So I've refactored the modeled dependencies to take that into account.
---
pom.xml | 17 +++++------------
.../logging/log4cxx/deps}/gzip/1.10.0/gzip-1.10.0.pom | 2 +-
.../logging/log4cxx/deps}/sed/4.8.0/sed-4.8.0.pom | 2 +-
.../logging/log4cxx/test-bins/grep/3.1.0/grep-3.1.0.pom | 10 ----------
4 files changed, 7 insertions(+), 24 deletions(-)
diff --git a/pom.xml b/pom.xml
index 26c0e4b..ee5e1ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,8 +19,8 @@
<!-- Local repos to model non-public dependencies for different purposes. -->
<repository>
- <id>log4cxx_test_bins</id>
- <url>file:///${project.basedir}/src/test/mvn_repo</url>
+ <id>log4cxx_non_public_deps</id>
+ <url>file:///${project.basedir}/src/mvn_repo</url>
</repository>
</repositories>
@@ -385,21 +385,14 @@
</dependency>
<dependency>
- <groupId>org.apache.logging.log4cxx.test-bins</groupId>
- <artifactId>grep</artifactId>
- <version>3.1.0</version>
- <scope>test</scope>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4cxx.test-bins</groupId>
+ <groupId>org.apache.logging.log4cxx.deps</groupId>
<artifactId>gzip</artifactId>
<version>1.10.0</version>
- <scope>test</scope>
+ <scope>runtime</scope>
<type>pom</type>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4cxx.test-bins</groupId>
+ <groupId>org.apache.logging.log4cxx.deps</groupId>
<artifactId>sed</artifactId>
<version>4.8.0</version>
<scope>test</scope>
diff --git a/src/test/mvn_repo/org/apache/logging/log4cxx/test-bins/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
similarity index 87%
rename from src/test/mvn_repo/org/apache/logging/log4cxx/test-bins/gzip/1.10.0/gzip-1.10.0.pom
rename to src/mvn_repo/org/apache/logging/log4cxx/deps/gzip/1.10.0/gzip-1.10.0.pom
index bb7193a..b15e4ca 100644
--- a/src/test/mvn_repo/org/apache/logging/log4cxx/test-bins/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
@@ -3,7 +3,7 @@
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.test-bins</groupId>
+ <groupId>org.apache.logging.log4cxx.deps</groupId>
<artifactId>gzip</artifactId>
<version>1.10.0</version>
<packaging>zip</packaging>
diff --git a/src/test/mvn_repo/org/apache/logging/log4cxx/test-bins/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
similarity index 86%
rename from src/test/mvn_repo/org/apache/logging/log4cxx/test-bins/sed/4.8.0/sed-4.8.0.pom
rename to src/mvn_repo/org/apache/logging/log4cxx/deps/sed/4.8.0/sed-4.8.0.pom
index 3bb3d3a..15eced2 100644
--- a/src/test/mvn_repo/org/apache/logging/log4cxx/test-bins/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
@@ -3,7 +3,7 @@
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.test-bins</groupId>
+ <groupId>org.apache.logging.log4cxx.deps</groupId>
<artifactId>sed</artifactId>
<version>4.8.0</version>
<packaging>zip</packaging>
diff --git a/src/test/mvn_repo/org/apache/logging/log4cxx/test-bins/grep/3.1.0/grep-3.1.0.pom b/src/test/mvn_repo/org/apache/logging/log4cxx/test-bins/grep/3.1.0/grep-3.1.0.pom
deleted file mode 100644
index cb2203b..0000000
--- a/src/test/mvn_repo/org/apache/logging/log4cxx/test-bins/grep/3.1.0/grep-3.1.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.test-bins</groupId>
- <artifactId>grep</artifactId>
- <version>3.1.0</version>
- <packaging>zip</packaging>
-</project>