This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-transform.git
The following commit(s) were added to refs/heads/main by this push:
new be6ff10 Fix versions of integration tests
be6ff10 is described below
commit be6ff10a14e9439d8dce64497885c1266d11df1c
Author: Piotr P. Karwasz <[email protected]>
AuthorDate: Fri Apr 28 21:23:04 2023 +0200
Fix versions of integration tests
These tests should not rely on `${revision}` which will not be
substituted by the Maven Release Plugin.
---
.../src/it/location/pom.xml | 29 ++++++++++++++++++----
.../src/it/pomproject/pom.xml | 10 ++++----
2 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/log4j-transform-maven-plugin/src/it/location/pom.xml
b/log4j-transform-maven-plugin/src/it/location/pom.xml
index f2dce1e..e6a106a 100644
--- a/log4j-transform-maven-plugin/src/it/location/pom.xml
+++ b/log4j-transform-maven-plugin/src/it/location/pom.xml
@@ -18,20 +18,39 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-transform-parent</artifactId>
- <version>${revision}</version>
- <relativePath>../../../../log4j-transform-parent</relativePath>
+ <groupId>org.apache.logging</groupId>
+ <artifactId>logging-parent</artifactId>
+ <version>9</version>
+ <relativePath />
</parent>
<groupId>org.apache.logging.log4j.maven.it</groupId>
<artifactId>log4j-maven-it-location</artifactId>
+ <version>@project.version@</version>
<packaging>jar</packaging>
<name>Apache Log4j Maven plugin test</name>
<description>The Apache Log4j Maven plugin test</description>
<properties>
+ <junit.version>5.9.3</junit.version>
<log4j2.version>2.20.0</log4j2.version>
- <revision>0.1.0-SNAPSHOT</revision>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.junit</groupId>
+ <artifactId>junit-bom</artifactId>
+ <version>${junit.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-bom</artifactId>
+ <version>${log4j2.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
diff --git a/log4j-transform-maven-plugin/src/it/pomproject/pom.xml
b/log4j-transform-maven-plugin/src/it/pomproject/pom.xml
index c67aa84..14ff1a2 100644
--- a/log4j-transform-maven-plugin/src/it/pomproject/pom.xml
+++ b/log4j-transform-maven-plugin/src/it/pomproject/pom.xml
@@ -18,19 +18,19 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-transform-parent</artifactId>
- <version>${revision}</version>
- <relativePath>../../../../log4j-transform-parent</relativePath>
+ <groupId>org.apache.logging</groupId>
+ <artifactId>logging-parent</artifactId>
+ <version>9</version>
+ <relativePath />
</parent>
<groupId>org.apache.logging.log4j.maven.it</groupId>
<artifactId>log4j-maven-it-pomproject</artifactId>
+ <version>@project.version@</version>
<packaging>pom</packaging>
<name>Apache Log4j Maven plugin test</name>
<description>The Apache Log4j Maven plugin test</description>
<properties>
<log4j2.version>2.20.0</log4j2.version>
- <revision>0.1.0-SNAPSHOT</revision>
</properties>
<build>
<plugins>
