This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-components.git
The following commit(s) were added to refs/heads/master by this push:
new a02221d Changing dependencies for apacheds
a02221d is described below
commit a02221d0d1a488b5dadd16acc1078739f13dd132
Author: Martin Stockhammer <[email protected]>
AuthorDate: Fri Nov 15 17:34:46 2019 +0100
Changing dependencies for apacheds
---
spring-apacheds/pom.xml | 27 +++++++++++-----
spring-apacheds/src/test/resources/log4j2-test.xml | 36 ++++++++++++++++++++++
2 files changed, 56 insertions(+), 7 deletions(-)
diff --git a/spring-apacheds/pom.xml b/spring-apacheds/pom.xml
index 10124cf..a841685 100644
--- a/spring-apacheds/pom.xml
+++ b/spring-apacheds/pom.xml
@@ -32,6 +32,7 @@
<properties>
<apacheds.version>1.5.1</apacheds.version>
+ <apacheds.shared.version>0.9.7</apacheds.shared.version>
<site.staging.base>${project.basedir}/..</site.staging.base>
</properties>
<scm>
@@ -47,31 +48,43 @@
<artifactId>apacheds-core</artifactId>
<version>${apacheds.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-core-shared</artifactId>
+ <version>${apacheds.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-core-shared</artifactId>
+ <artifactId>apacheds-server-jndi</artifactId>
<version>${apacheds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-server-jndi</artifactId>
+ <artifactId>apacheds-schema-registries</artifactId>
<version>${apacheds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-bootstrap-partition</artifactId>
+ <artifactId>apacheds-schema-extras</artifactId>
<version>${apacheds.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-schema-registries</artifactId>
- <version>${apacheds.version}</version>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap</artifactId>
+ <version>${apacheds.shared.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-schema-extras</artifactId>
+ <artifactId>apacheds-protocol-ldap</artifactId>
<version>${apacheds.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-bootstrap-partition</artifactId>
+ <version>${apacheds.version}</version>
+ </dependency>
+
+
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/spring-apacheds/src/test/resources/log4j2-test.xml
b/spring-apacheds/src/test/resources/log4j2-test.xml
new file mode 100644
index 0000000..a92f48e
--- /dev/null
+++ b/spring-apacheds/src/test/resources/log4j2-test.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<configuration>
+ <appenders>
+ <Console name="console" target="SYSTEM_OUT">
+ <PatternLayout pattern="[%t] %-5p %c %x - %m%n"/>
+ </Console>
+ </appenders>
+ <loggers>
+ <logger name="org.apache.archiva" level="info"/>
+ <logger name="org.apache.archiva.components.apacheds" level="info" />
+
+ <root level="error" includeLocation="true">
+ <appender-ref ref="console"/>
+ </root>
+ </loggers>
+</configuration>
+
+
