DRYD-771: Misc config changes and updates to Log4j dependencies.

diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml
index 4e7478dd2bcdf79f319e0a5305f851193689eb93..bc73c7486af74e996680576dfae5415514b3ef60 100644 (file)
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -574,6 +574,12 @@
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
             <artifactId>nuxeo-core</artifactId>
+            <exclusions>
+               <exclusion>
+                       <groupId>log4j</groupId>
+                       <artifactId>log4j</artifactId>
+               </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
@@ -582,6 +588,12 @@
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
             <artifactId>nuxeo-core-convert</artifactId>
+            <exclusions>
+               <exclusion>
+                       <groupId>log4j</groupId>
+                       <artifactId>log4j</artifactId>
+               </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
@@ -635,6 +647,12 @@
                <artifactId>nuxeo-platform-commandline-executor</artifactId>
             <version>${nuxeo.core.version}</version>
             <scope>provided</scope>
+            <exclusions>
+               <exclusion>
+                       <groupId>log4j</groupId>
+                       <artifactId>log4j</artifactId>
+               </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
                        <groupId>org.nuxeo.ecm.platform</groupId>

diff --git a/services/JaxRsServiceProvider/src/main/resources/log4j2.xml b/services/JaxRsServiceProvider/src/main/resources/log4j2.xml
index b0a16b5280208902ecf4c08c18f110e97920cf65..c7a1db4c627be325d896b60942784fb062427473 100644 (file)
--- a/services/JaxRsServiceProvider/src/main/resources/log4j2.xml
+++ b/services/JaxRsServiceProvider/src/main/resources/log4j2.xml
@@ -10,7 +10,7 @@
                        <PatternLayout pattern="${logPattern}" />
                </Console>
 
-               <RollingFile name="LogFileAppender" fileName="cspace-services.log" filePattern="cspace-services.%i.log">
+               <RollingFile name="LogFileAppender" fileName="logs/cspace-services.log" filePattern="logs/cspace-services.%i.log">
                        <PatternLayout pattern="${logPattern}" />
                        <SizeBasedTriggeringPolicy size="5 MB"/>
                        <DefaultRolloverStrategy fileIndex="min" max="10"/>

diff --git a/services/common/lib/slf4j/jcl-over-slf4j-1.7.21.jar b/services/common/lib/slf4j/jcl-over-slf4j-1.7.25.jar
similarity index 52%
rename from services/common/lib/slf4j/jcl-over-slf4j-1.7.21.jar
rename to services/common/lib/slf4j/jcl-over-slf4j-1.7.25.jar
index 12ba1261a2f208f7c1cd137e2d10b0a8fa6b0ba2..8e7fec880f401e6e8f2a979192c1870448ff1ad0 100644 (file)
Binary files a/services/common/lib/slf4j/jcl-over-slf4j-1.7.21.jar and b/services/common/lib/slf4j/jcl-over-slf4j-1.7.25.jar differ

diff --git a/services/common/lib/slf4j/log4j-1.2-api-2.12.0.jar b/services/common/lib/slf4j/log4j-1.2-api-2.12.0.jar
new file mode 100644 (file)
index 0000000..3bb57f8
Binary files /dev/null and b/services/common/lib/slf4j/log4j-1.2-api-2.12.0.jar differ

diff --git a/services/common/lib/slf4j/log4j-api-2.12.0.jar b/services/common/lib/slf4j/log4j-api-2.12.0.jar
new file mode 100644 (file)
index 0000000..93f770d
Binary files /dev/null and b/services/common/lib/slf4j/log4j-api-2.12.0.jar differ

diff --git a/services/common/lib/slf4j/log4j-api-2.7.jar b/services/common/lib/slf4j/log4j-api-2.7.jar
deleted file mode 100644 (file)
index b921631..0000000
Binary files a/services/common/lib/slf4j/log4j-api-2.7.jar and /dev/null differ

diff --git a/services/common/lib/slf4j/log4j-core-2.12.0.jar b/services/common/lib/slf4j/log4j-core-2.12.0.jar
new file mode 100644 (file)
index 0000000..fbab720
Binary files /dev/null and b/services/common/lib/slf4j/log4j-core-2.12.0.jar differ

diff --git a/services/common/lib/slf4j/log4j-core-2.7.jar b/services/common/lib/slf4j/log4j-core-2.7.jar
deleted file mode 100644 (file)
index c0feb23..0000000
Binary files a/services/common/lib/slf4j/log4j-core-2.7.jar and /dev/null differ

diff --git a/services/common/lib/slf4j/log4j-slf4j-impl-2.12.0.jar b/services/common/lib/slf4j/log4j-slf4j-impl-2.12.0.jar
new file mode 100644 (file)
index 0000000..f21f1ee
Binary files /dev/null and b/services/common/lib/slf4j/log4j-slf4j-impl-2.12.0.jar differ

diff --git a/services/common/lib/slf4j/log4j-slf4j-impl-2.7.jar b/services/common/lib/slf4j/log4j-slf4j-impl-2.7.jar
deleted file mode 100644 (file)
index 088263c..0000000
Binary files a/services/common/lib/slf4j/log4j-slf4j-impl-2.7.jar and /dev/null differ

diff --git a/services/common/lib/slf4j/log4j-web-2.12.0.jar b/services/common/lib/slf4j/log4j-web-2.12.0.jar
new file mode 100644 (file)
index 0000000..98536a6
Binary files /dev/null and b/services/common/lib/slf4j/log4j-web-2.12.0.jar differ

diff --git a/services/common/lib/slf4j/log4j-web-2.7.jar b/services/common/lib/slf4j/log4j-web-2.7.jar
deleted file mode 100644 (file)
index d142e6a..0000000
Binary files a/services/common/lib/slf4j/log4j-web-2.7.jar and /dev/null differ

diff --git a/services/common/lib/slf4j/slf4j-api-1.7.21.jar b/services/common/lib/slf4j/slf4j-api-1.7.25.jar
similarity index 52%
rename from services/common/lib/slf4j/slf4j-api-1.7.21.jar
rename to services/common/lib/slf4j/slf4j-api-1.7.25.jar
index 2a5c33ec55491e5b4be53525d8d7242e53e020c0..0143c099699ee843cde6d95c9dbc7751039d2463 100644 (file)
Binary files a/services/common/lib/slf4j/slf4j-api-1.7.21.jar and b/services/common/lib/slf4j/slf4j-api-1.7.25.jar differ