[cxf] branch master updated: Updating Karaf

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[cxf] branch master updated: Updating Karaf

buhhunyx
This is an automated email from the ASF dual-hosted git repository.

buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/master by this push:
     new ec44234  Updating Karaf
ec44234 is described below

commit ec4423437bd7d6b63e3464761394cfafb50cacfa
Author: Alexey Markevich <[hidden email]>
AuthorDate: Wed Oct 9 16:32:26 2019 +0300

    Updating Karaf
---
 .../apache/cxf/osgi/itests/CXFOSGiTestSupport.java |  10 --
 .../test/resources/etc/org.ops4j.pax.logging.cfg   |  60 ------------
 parent/pom.xml                                     |   3 +-
 .../sts/itests/BasicSTSIntegrationTest.java        |   4 +-
 .../test/resources/etc/org.ops4j.pax.logging.cfg   | 105 ---------------------
 .../cxf/xkms/itests/BasicIntegrationTest.java      |   4 +-
 .../test/resources/etc/org.ops4j.pax.logging.cfg   |  25 -----
 7 files changed, 3 insertions(+), 208 deletions(-)

diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
index 0442e5a..47dc108 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
@@ -22,7 +22,6 @@ package org.apache.cxf.osgi.itests;
 
 
 import java.io.File;
-import java.net.URISyntaxException;
 
 import javax.inject.Inject;
 
@@ -45,7 +44,6 @@ import static org.ops4j.pax.exam.CoreOptions.systemProperty;
 import static org.ops4j.pax.exam.CoreOptions.when;
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.replaceConfigurationFile;
 
 /**
  *
@@ -80,12 +78,6 @@ public class CXFOSGiTestSupport {
                 .version(karafVersion).type("xml").classifier("features");
         String localRepo = System.getProperty("localRepository");
         Object urp = System.getProperty("cxf.useRandomFirstPort");
-        final File loggingCfg;
-        try {
-            loggingCfg = new File(getClass().getResource("/etc/org.ops4j.pax.logging.cfg").toURI());
-        } catch (URISyntaxException e) {
-            throw new RuntimeException(e);
-        }
         if (JavaVersionUtil.getMajorVersion() >= 9) {
             return composite(karafDistributionConfiguration()
                              .frameworkUrl(karafUrl)
@@ -98,7 +90,6 @@ public class CXFOSGiTestSupport {
                          //debugConfiguration(), // nor this
                          systemProperty("pax.exam.osgi.unresolved.fail").value("true"),
                          systemProperty("java.awt.headless").value("true"),
-                         replaceConfigurationFile("etc/org.ops4j.pax.logging.cfg", loggingCfg),
                          when(localRepo != null)
                              .useOptions(editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
                                                                   "org.ops4j.pax.url.mvn.localRepository",
@@ -143,7 +134,6 @@ public class CXFOSGiTestSupport {
                          //debugConfiguration(), // nor this
                          systemProperty("pax.exam.osgi.unresolved.fail").value("true"),
                          systemProperty("java.awt.headless").value("true"),
-                         replaceConfigurationFile("etc/org.ops4j.pax.logging.cfg", loggingCfg),
                          when(localRepo != null)
                              .useOptions(editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
                                                                   "org.ops4j.pax.url.mvn.localRepository",
diff --git a/osgi/itests/src/test/resources/etc/org.ops4j.pax.logging.cfg b/osgi/itests/src/test/resources/etc/org.ops4j.pax.logging.cfg
deleted file mode 100644
index 79b8406..0000000
--- a/osgi/itests/src/test/resources/etc/org.ops4j.pax.logging.cfg
+++ /dev/null
@@ -1,60 +0,0 @@
-################################################################################
-#
-#    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.
-#
-################################################################################
-
-# Common pattern layout for appenders
-log4j2.pattern = %d{ISO8601} | %-5p | %-16t | %-32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
-
-# Root logger
-log4j2.rootLogger.level = INFO
-# uncomment to use asynchronous loggers, which require mvn:com.lmax/disruptor/3.3.2 library
-#log4j2.rootLogger.type = asyncRoot
-#log4j2.rootLogger.includeLocation = false
-log4j2.rootLogger.appenderRefs = RollingFile, PaxOsgi${karaf.log.console:+, Console}
-log4j2.rootLogger.appenderRef.RollingFile.ref = RollingFile
-log4j2.rootLogger.appenderRef.PaxOsgi.ref = PaxOsgi
-log4j2.rootLogger.appenderRef.Console.ref = Console
-
-# Appenders configuration
-log4j2.appenders = console, rolling, osgi
-
-# CONSOLE appender not used by default
-log4j2.appender.console.type = Console
-log4j2.appender.console.name = Console
-log4j2.appender.console.layout.type = PatternLayout
-log4j2.appender.console.layout.pattern = ${log4j2.pattern}
-
-# File appender
-log4j2.appender.rolling.type = RollingRandomAccessFile
-log4j2.appender.rolling.name = RollingFile
-log4j2.appender.rolling.fileName = ${karaf.data}/log/karaf.log
-log4j2.appender.rolling.filePattern = ${karaf.data}/log/karaf.log.%i
-# uncomment to not force a disk flush
-#log4j2.appender.rolling.immediateFlush = false
-log4j2.appender.rolling.append = false
-log4j2.appender.rolling.layout.type = PatternLayout
-log4j2.appender.rolling.layout.pattern = ${log4j2.pattern}
-log4j2.appender.rolling.policies.type = Policies
-log4j2.appender.rolling.policies.size.type = SizeBasedTriggeringPolicy
-log4j2.appender.rolling.policies.size.size = 1600MB
-
-# OSGi appender
-log4j2.appender.osgi.type = PaxOsgi
-log4j2.appender.osgi.name = PaxOsgi
-log4j2.appender.osgi.filter = *
-
diff --git a/parent/pom.xml b/parent/pom.xml
index cc956e6..19c6835 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -242,13 +242,12 @@
         <cxf.jaxb.bundle.version>2.3.1_1</cxf.jaxb.bundle.version>
         <cxf.jaxb.context.class.property>none</cxf.jaxb.context.class.property>
         <cxf.jdom.bundle.version>1.1_4</cxf.jdom.bundle.version>
-        <cxf.karaf.version>4.2.6</cxf.karaf.version>
+        <cxf.karaf.version>4.2.7</cxf.karaf.version>
         <cxf.oauth.bundle.version>20100527_1</cxf.oauth.bundle.version>
         <cxf.oro.bundle.version>2.0.8_6</cxf.oro.bundle.version>
         <cxf.osgi.saaj.version>[1.3,2)</cxf.osgi.saaj.version>
         <cxf.osgi.version>5.0.0</cxf.osgi.version>
         <cxf.pax.exam.version>4.13.1</cxf.pax.exam.version>
-        <cxf.pax.logging.version>1.6.0</cxf.pax.logging.version>
         <cxf.reflections.bundle.version>0.9.11_2</cxf.reflections.bundle.version>
         <cxf.rhino.bundle.version>1.7R2_3</cxf.rhino.bundle.version>
         <cxf.saaj-impl.bundle.version>1.3.23_2</cxf.saaj-impl.bundle.version>
diff --git a/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/BasicSTSIntegrationTest.java b/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/BasicSTSIntegrationTest.java
index f6e5856..9064b65 100644
--- a/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/BasicSTSIntegrationTest.java
+++ b/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/BasicSTSIntegrationTest.java
@@ -47,7 +47,7 @@ public class BasicSTSIntegrationTest {
         String port = TestUtil.getPortNumber(BasicSTSIntegrationTest.class);
         System.setProperty("BasicSTSIntegrationTest.PORT", port);
 
-        String karafVersion = System.getProperty("karaf.version", "4.2.5");
+        String karafVersion = System.getProperty("karaf.version", "4.2.7");
         String localRepository = System.getProperty("localRepository");
 
         MavenArtifactUrlReference karafUrl = maven() //
@@ -71,7 +71,6 @@ public class BasicSTSIntegrationTest {
                                  systemProperty("BasicSTSIntegrationTest.PORT").value(port),
 
                 copy("clientKeystore.properties"), copy("clientstore.jks"),
-                                 copy("etc/org.ops4j.pax.logging.cfg"),
                                  editConfigurationFilePut("etc/org.ops4j.pax.web.cfg",
                                                           "org.osgi.service.http.port", port),
                                  when(localRepository != null)
@@ -115,7 +114,6 @@ public class BasicSTSIntegrationTest {
                                  systemProperty("BasicSTSIntegrationTest.PORT").value(port),
 
                 copy("clientKeystore.properties"), copy("clientstore.jks"),
-                                 copy("etc/org.ops4j.pax.logging.cfg"),
                                  editConfigurationFilePut("etc/org.ops4j.pax.web.cfg",
                                                           "org.osgi.service.http.port", port),
                                  when(localRepository != null)
diff --git a/services/sts/systests/sts-itests/src/test/resources/etc/org.ops4j.pax.logging.cfg b/services/sts/systests/sts-itests/src/test/resources/etc/org.ops4j.pax.logging.cfg
deleted file mode 100644
index ec0b773..0000000
--- a/services/sts/systests/sts-itests/src/test/resources/etc/org.ops4j.pax.logging.cfg
+++ /dev/null
@@ -1,105 +0,0 @@
-################################################################################
-#
-#    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.
-#
-################################################################################
-
-# Colors for log level rendering
-color.fatal = bright red
-color.error = bright red
-color.warn = bright yellow
-color.info = bright green
-color.debug = cyan
-color.trace = cyan
-
-# Common pattern layout for appenders
-log4j2.pattern = %d{ISO8601} | %-5p | %-16t | %-32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
-log4j2.out.pattern = \u001b[90m%d{HH:mm:ss\.SSS}\u001b[0m %highlight{%-5level}{FATAL=${color.fatal}, ERROR=${color.error}, WARN=${color.warn}, INFO=${color.info}, DEBUG=${color.debug}, TRACE=${color.trace}} \u001b[90m[%t]\u001b[0m %msg%n%throwable
-
-
-# Root logger
-log4j2.rootLogger.level = INFO
-# uncomment to use asynchronous loggers, which require mvn:com.lmax/disruptor/3.3.2 library
-#log4j2.rootLogger.type = asyncRoot
-#log4j2.rootLogger.includeLocation = false
-log4j2.rootLogger.appenderRef.RollingFile.ref = RollingFile
-log4j2.rootLogger.appenderRef.PaxOsgi.ref = PaxOsgi
-log4j2.rootLogger.appenderRef.Console.ref = Console
-log4j2.rootLogger.appenderRef.Console.filter.threshold.type = ThresholdFilter
-log4j2.rootLogger.appenderRef.Console.filter.threshold.level = ${karaf.log.console:-OFF}
-
-# Loggers configuration
-
-# SSHD logger
-log4j2.logger.sshd.name = org.apache.sshd
-log4j2.logger.sshd.level = INFO
-
-# Spifly logger
-log4j2.logger.spifly.name = org.apache.aries.spifly
-log4j2.logger.spifly.level = WARN
-
-# Security audit logger
-log4j2.logger.audit.name = audit
-log4j2.logger.audit.level = TRACE
-log4j2.logger.audit.additivity = false
-log4j2.logger.audit.appenderRef.AuditRollingFile.ref = AuditRollingFile
-
-# Appenders configuration
-
-# Console appender not used by default (see log4j2.rootLogger.appenderRefs)
-log4j2.appender.console.type = Console
-log4j2.appender.console.name = Console
-log4j2.appender.console.layout.type = PatternLayout
-log4j2.appender.console.layout.pattern = ${log4j2.out.pattern}
-
-# Rolling file appender
-log4j2.appender.rolling.type = RollingRandomAccessFile
-log4j2.appender.rolling.name = RollingFile
-log4j2.appender.rolling.fileName = ${karaf.data}/log/karaf.log
-log4j2.appender.rolling.filePattern = ${karaf.data}/log/karaf.log.%i
-# uncomment to not force a disk flush
-#log4j2.appender.rolling.immediateFlush = false
-log4j2.appender.rolling.append = true
-log4j2.appender.rolling.layout.type = PatternLayout
-log4j2.appender.rolling.layout.pattern = ${log4j2.pattern}
-log4j2.appender.rolling.policies.type = Policies
-log4j2.appender.rolling.policies.size.type = SizeBasedTriggeringPolicy
-log4j2.appender.rolling.policies.size.size = 16MB
-
-# Audit file appender
-log4j2.appender.audit.type = RollingRandomAccessFile
-log4j2.appender.audit.name = AuditRollingFile
-log4j2.appender.audit.fileName = ${karaf.data}/log/security.log
-log4j2.appender.audit.filePattern = ${karaf.data}/log/security-%i.log
-log4j2.appender.audit.append = true
-log4j2.appender.audit.layout.type = PatternLayout
-log4j2.appender.audit.layout.pattern = %m%n
-log4j2.appender.audit.policies.type = Policies
-log4j2.appender.audit.policies.size.type = SizeBasedTriggeringPolicy
-log4j2.appender.audit.policies.size.size = 8MB
-
-# OSGi appender
-log4j2.appender.osgi.type = PaxOsgi
-log4j2.appender.osgi.name = PaxOsgi
-log4j2.appender.osgi.filter = *
-
-# help with identification of maven-related problems with pax-url-aether
-#log4j2.logger.aether.name = shaded.org.eclipse.aether
-#log4j2.logger.aether.level = TRACE
-#log4j2.logger.http-headers.name = shaded.org.apache.http.headers
-#log4j2.logger.http-headers.level = DEBUG
-#log4j2.logger.maven.name = org.ops4j.pax.url.mvn
-#log4j2.logger.maven.level = TRACE
diff --git a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
index 4fc5144..669aead 100644
--- a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
+++ b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
@@ -65,7 +65,7 @@ public class BasicIntegrationTest {
         System.setProperty("BasicIntegrationTest.PORT", port);
         String xkmsEndpoint = "http://localhost:" + port + "/cxf/XKMS";
 
-        String karafVersion = System.getProperty("karaf.version", "4.2.5");
+        String karafVersion = System.getProperty("karaf.version", "4.2.7");
         String localRepository = System.getProperty("localRepository");
         MavenArtifactUrlReference karafUrl = maven() //
             .groupId("org.apache.karaf") //
@@ -91,7 +91,6 @@ public class BasicIntegrationTest {
                                  copy("data/xkms/certificates/cas/alice.cer"),
                                  copy("data/xkms/certificates/dave.cer"),
                                  copy("data/xkms/certificates/http___localhost_8080_services_TestService.cer"),
-                                 copy("etc/org.ops4j.pax.logging.cfg"),
                                  // editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
                                  // "org.ops4j.pax.url.mvn.repositories", REPOS),
                                  editConfigurationFilePut("etc/org.ops4j.pax.web.cfg",
@@ -151,7 +150,6 @@ public class BasicIntegrationTest {
                                  copy("data/xkms/certificates/cas/alice.cer"),
                                  copy("data/xkms/certificates/dave.cer"),
                                  copy("data/xkms/certificates/http___localhost_8080_services_TestService.cer"),
-                                 copy("etc/org.ops4j.pax.logging.cfg"),
                                  // editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
                                  // "org.ops4j.pax.url.mvn.repositories", REPOS),
                                  editConfigurationFilePut("etc/org.ops4j.pax.web.cfg",
diff --git a/services/xkms/xkms-itests/src/test/resources/etc/org.ops4j.pax.logging.cfg b/services/xkms/xkms-itests/src/test/resources/etc/org.ops4j.pax.logging.cfg
deleted file mode 100644
index aa82be2..0000000
--- a/services/xkms/xkms-itests/src/test/resources/etc/org.ops4j.pax.logging.cfg
+++ /dev/null
@@ -1,25 +0,0 @@
-# Root logger
-log4j.rootLogger=WARN, stdout
-log4j.throwableRenderer=org.apache.log4j.OsgiThrowableRenderer
-
-log4j.logger.org.apache.cxf.xkms=INFO
-log4j.logger.org.apache.cxf.xkms.x509.validator=WARN
-
-# Reduce noisy output
-log4j.logger.org.ops4j.pax.swissbox.bnd.BndUtils=ERROR
-
-# CONSOLE appender
-log4j.appender.stdout.threshold=INFO
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} | %-5.5p | %-50.50c | %m%n
-#log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} | %-5.5p | %-40.40c | %-3.3X{bundle.id} - %-20.20X{bundle.name} | %m%n
-
-
-# File appender
-log4j.appender.file.threshold=DEBUG
-log4j.appender.file=org.apache.log4j.FileAppender
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} | %-5.5p | %-50.50c | %m%n
-log4j.appender.file.file=${karaf.data}/log/karaf.log
-log4j.appender.file.append=true