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 2019/11/13 22:52:18 UTC
[directory-server] branch master updated (faa1249 -> 8242a54)
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 faa1249 Merge branch 'master' of https://gitbox.apache.org/repos/asf/directory-server
new 4d8bc03 Fixed the build, and incendiatlly reinjected Colm's dependencies updates. Pointing to LDAP API 2.0.0
new 8242a54 Removed a merge trace
The 2 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 | 16 +++++++++-------
.../extended/PwdModifyNoPPNoPasswordHashingIT.java | 4 ----
2 files changed, 9 insertions(+), 11 deletions(-)
[directory-server] 02/02: Removed a merge trace
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 8242a54b4967ee986b21c1579a42b4284ac73967
Author: emmanuel lecharny <em...@busit.com>
AuthorDate: Wed Nov 13 23:52:11 2019 +0100
Removed a merge trace
---
.../server/operations/extended/PwdModifyNoPPNoPasswordHashingIT.java | 4 ----
1 file changed, 4 deletions(-)
diff --git a/server-integ/src/test/java/org/apache/directory/server/operations/extended/PwdModifyNoPPNoPasswordHashingIT.java b/server-integ/src/test/java/org/apache/directory/server/operations/extended/PwdModifyNoPPNoPasswordHashingIT.java
index 4e6ea1c..a413c4a 100644
--- a/server-integ/src/test/java/org/apache/directory/server/operations/extended/PwdModifyNoPPNoPasswordHashingIT.java
+++ b/server-integ/src/test/java/org/apache/directory/server/operations/extended/PwdModifyNoPPNoPasswordHashingIT.java
@@ -57,12 +57,8 @@ import org.junit.runner.RunWith;
/**
-<<<<<<< HEAD
- * Test the PwdModify extended operation
-=======
* Test the PwdModify extended operation, when no PasswordPolicy or PasswordHashing interceptor
* are present.
->>>>>>> c42030f59692518133715f0a4753ce24bb63b2d8
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
[directory-server] 01/02: Fixed the build,
and incendiatlly reinjected Colm's dependencies updates. Pointing
to LDAP API 2.0.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 4d8bc0352dfae6c2c6850a5a9f31741b69fd34bb
Author: emmanuel lecharny <em...@busit.com>
AuthorDate: Wed Nov 13 23:51:52 2019 +0100
Fixed the build, and incendiatlly reinjected Colm's dependencies updates. Pointing to LDAP API 2.0.0
---
pom.xml | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 902580d..cf8362f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
<!--additionalparam>-Xdoclint:none</additionalparam-->
<!-- Set versions for depending projects -->
- <org.apache.directory.api.version>2.0.0.AM5-SNAPSHOT</org.apache.directory.api.version>
+ <org.apache.directory.api.version>2.0.0</org.apache.directory.api.version>
<org.apache.directory.mavibot.version>1.0.0-M8</org.apache.directory.mavibot.version>
<org.apache.directory.checkstyle-configuration.version>2.0.1-SNAPSHOT</org.apache.directory.checkstyle-configuration.version>
<org.apache.directory.junit.junit-addons.version>2.0.0</org.apache.directory.junit.junit-addons.version>
@@ -57,12 +57,12 @@
<ant.version>1.10.6</ant.version>
<bcprov.version>1.62</bcprov.version>
<commons.cli.version>1.4</commons.cli.version>
- <commons.codec.version>1.12</commons.codec.version>
- <commons.collections.version>4.3</commons.collections.version>
- <commons.daemon.version>1.1.0</commons.daemon.version>
+ <commons.codec.version>1.13</commons.codec.version>
+ <commons.collections.version>4.4</commons.collections.version>
+ <commons.daemon.version>1.2.0</commons.daemon.version>
<commons.lang.version>3.9</commons.lang.version>
<commons.net.version>3.6</commons.net.version>
- <commons.pool.version>2.6.2</commons.pool.version>
+ <commons.pool.version>2.7.0</commons.pool.version>
<dnsjava.version>2.1.9</dnsjava.version>
<caffeine.version>2.7.0</caffeine.version>
<findbugs.annotations.version>1.0.0</findbugs.annotations.version>
@@ -83,6 +83,8 @@
<slf4j.api.version>1.7.26</slf4j.api.version>
<slf4j.api.bundleversion>"$«range;[==,=+)»"</slf4j.api.bundleversion>
<slf4j.log4j12.version>1.7.26</slf4j.log4j12.version>
+ <wagon.ssh.version>3.3.3</wagon.ssh.version>
+ <wagon.ssh.external.version>3.3.3</wagon.ssh.external.version>
<wrapper.version>3.2.3</wrapper.version>
</properties>
@@ -506,13 +508,13 @@
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
- <version>2.1</version>
+ <version>${wagon.ssh.version}</version>
</dependency>
<!-- Add support for 'scpexe' -->
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh-external</artifactId>
- <version>2.1</version>
+ <version>${wagon.ssh.external.version}</version>
</dependency>
</dependencies>
<executions>