syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject [2/3] syncope git commit: Upgrading ApacheDS
Date Mon, 20 Aug 2018 09:03:18 GMT
Upgrading ApacheDS


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/22877e98
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/22877e98
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/22877e98

Branch: refs/heads/2_1_X
Commit: 22877e980b6ec0f3b5102f48d5b832af01fb8da7
Parents: a3d0f09
Author: Francesco Chicchiriccò <ilgrosso@apache.org>
Authored: Mon Aug 20 11:02:22 2018 +0200
Committer: Francesco Chicchiriccò <ilgrosso@apache.org>
Committed: Mon Aug 20 11:02:32 2018 +0200

----------------------------------------------------------------------
 fit/build-tools/pom.xml                         | 20 +---------
 fit/build-tools/src/main/resources/log4j2.xml   | 39 --------------------
 .../src/main/resources/simplelogger.properties  | 20 ++++++++++
 pom.xml                                         |  4 +-
 4 files changed, 24 insertions(+), 59 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/22877e98/fit/build-tools/pom.xml
----------------------------------------------------------------------
diff --git a/fit/build-tools/pom.xml b/fit/build-tools/pom.xml
index fda3418..efcc5ff 100644
--- a/fit/build-tools/pom.xml
+++ b/fit/build-tools/pom.xml
@@ -51,7 +51,7 @@ under the License.
 
     <dependency>
       <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-all</artifactId>
+      <artifactId>apacheds-service</artifactId>
     </dependency>
 
     <dependency>
@@ -196,23 +196,7 @@ under the License.
       <version>${connid.rest.version}</version>
       <scope>runtime</scope>
     </dependency>
-        
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.lmax</groupId>
-      <artifactId>disruptor</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j-impl</artifactId>
-    </dependency>
+    
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>

http://git-wip-us.apache.org/repos/asf/syncope/blob/22877e98/fit/build-tools/src/main/resources/log4j2.xml
----------------------------------------------------------------------
diff --git a/fit/build-tools/src/main/resources/log4j2.xml b/fit/build-tools/src/main/resources/log4j2.xml
deleted file mode 100644
index ffe88f6..0000000
--- a/fit/build-tools/src/main/resources/log4j2.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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 status="WARN">
-
-  <appenders>
-    
-    <Console name="main" target="SYSTEM_OUT">
-      <PatternLayout>
-        <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
-      </PatternLayout>
-    </Console>
-
-  </appenders>
-  
-  <loggers>
-        
-    <root level="INFO">
-      <appender-ref ref="main"/>
-    </root>
-    
-  </loggers>
-</configuration>

http://git-wip-us.apache.org/repos/asf/syncope/blob/22877e98/fit/build-tools/src/main/resources/simplelogger.properties
----------------------------------------------------------------------
diff --git a/fit/build-tools/src/main/resources/simplelogger.properties b/fit/build-tools/src/main/resources/simplelogger.properties
new file mode 100644
index 0000000..aefa3dd
--- /dev/null
+++ b/fit/build-tools/src/main/resources/simplelogger.properties
@@ -0,0 +1,20 @@
+# 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.
+
+# See http://www.slf4j.org/api/org/slf4j/impl/SimpleLogger.html
+# Possible values: "trace", "debug", "info", "warn", or "error"
+org.slf4j.simpleLogger.defaultLogLevel=error

http://git-wip-us.apache.org/repos/asf/syncope/blob/22877e98/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 42f460f..02710d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1051,8 +1051,8 @@ under the License.
 
       <dependency>
         <groupId>org.apache.directory.server</groupId>
-        <artifactId>apacheds-all</artifactId>
-        <version>2.0.0-M24</version>
+        <artifactId>apacheds-service</artifactId>
+        <version>2.0.0.AM25</version>
       </dependency>
       
       <dependency>


Mime
View raw message