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:30:25 UTC
(directory-server) branch master updated (1947316059 -> 1aad1452ab)
This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/directory-server.git
from 1947316059 fixed some merge issues
new 306999db7a Bumped up some plugins version
add 64845bad8e Bump org.hamcrest:hamcrest-library from 2.2 to 3.0
new 660d64e6de Merge remote-tracking branch 'origin/dependabot/maven/org.hamcrest-hamcrest-library-3.0'
new 1aad1452ab Merge remote-tracking branch 'origin/master'
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(directory-server) 03/03: Merge remote-tracking branch 'origin/master'
Posted by el...@apache.org.
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
commit 1aad1452abcb9eec7ee65537b3e5c9ee81713c4d
Merge: 660d64e6de 1947316059
Author: emmanuel lecharny <el...@apache.org>
AuthorDate: Wed Aug 14 09:30:05 2024 +0200
Merge remote-tracking branch 'origin/master'
(directory-server) 02/03: Merge remote-tracking branch 'origin/dependabot/maven/org.hamcrest-hamcrest-library-3.0'
Posted by el...@apache.org.
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
commit 660d64e6de39f22074f06ed406c5e384e975f00c
Merge: 306999db7a 64845bad8e
Author: emmanuel lecharny <el...@apache.org>
AuthorDate: Wed Aug 14 09:29:57 2024 +0200
Merge remote-tracking branch 'origin/dependabot/maven/org.hamcrest-hamcrest-library-3.0'
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(directory-server) 01/03: Bumped up some plugins version
Posted by el...@apache.org.
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
commit 306999db7a665276c619989c1f0aae5ce26b1f2b
Author: emmanuel lecharny <el...@apache.org>
AuthorDate: Wed Aug 14 09:26:09 2024 +0200
Bumped up some plugins version
---
pom.xml | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9979e92681..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.0</version>
+ <version>${cyclonedx.version}</version>
<executions>
<execution>
<id>make-bom</id>