You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2024/08/14 07:28:35 UTC
(directory-server) branch master updated: fixed some merge issues
This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-server.git
The following commit(s) were added to refs/heads/master by this push:
new 1947316059 fixed some merge issues
1947316059 is described below
commit 194731605979e41e6f31b740109def983da41438
Author: emmanuel lecharny <el...@apache.org>
AuthorDate: Wed Aug 14 09:28:23 2024 +0200
fixed some merge issues
---
pom.xml | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index a84b563369..0b98be5720 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,10 +90,12 @@
<!-- properties used in tests -->
<felix.cache.dir>${project.build.directory}/felix-root</felix.cache.dir>
- <!-- properties for the maven compiler plugin -->
+ <!-- Properties for the maven plugins -->
+ <cyclonedx.version>2.8.1</cyclonedx.version>
<maven.compiler.release>8</maven.compiler.release>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
+ <org.eclipse.m2e.version>1.0.0</org.eclipse.m2e.version>
</properties>
<url>https://directory.apache.org/apacheds/1.5</url>
@@ -438,7 +440,7 @@
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
+ <version>${org.eclipse.m2e.version}</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
@@ -490,10 +492,11 @@
</properties>
</configuration>
</plugin>
+
<plugin>
<groupId>org.cyclonedx</groupId>
<artifactId>cyclonedx-maven-plugin</artifactId>
- <version>2.8.1</version>
+ <version>${cyclonedx.version}</version>
<executions>
<execution>
<id>make-bom</id>