Merge changes I0d4117b1,Ib233ea80,I307b4ddd,I03338c43,Id8641e04, ...

* changes:
  Removed DOS CR characters as per Alixis de Talhouet's code review to patch #18478.
  Removed COPSDebug.java and all remaining references.
  Replaced use of logger abstraction COPSDebug.java to having this class log directly to it's own logger as well as fixing several compiler warnings.
  Replaced use of logger abstraction COPSDebug.java to having this class log directly to it's own logger as well as fixing several compiler warnings.
  Replaced use of logger abstraction COPSDebug.java to having this class log directly to it's own logger as well as fixing several compiler warnings.
  Replaced use of logger abstraction COPSDebug.java to having this class log directly to it's own logger as well as fixing several compiler warnings.
  Replaced use of logger abstraction COPSDebug.java to having this class log directly to it's own logger as well as fixing several compiler warnings.

diff --git a/features-packetcable/pom.xml b/features-packetcable/pom.xml
index 84ee87303b0fb912f490364b2f77d704f83715a8..d1c21eb7e7d248b8e56f6afa8e92fb147b247b49 100644 (file)
--- a/features-packetcable/pom.xml
+++ b/features-packetcable/pom.xml
@@ -28,7 +28,6 @@
             DependencyManagement section of your parent pom -->
       <branding.version>1.1.0-SNAPSHOT</branding.version>
       <karaf.resources.version>1.5.0-SNAPSHOT</karaf.resources.version>
-      <karaf.version>3.0.1</karaf.version>
       <karaf.empty.version>1.5.0-SNAPSHOT</karaf.empty.version>
       <surefire.version>2.16</surefire.version>
    </properties>

diff --git a/packetcable-karaf/pom.xml b/packetcable-karaf/pom.xml
index 28870d6d451a9ee0e9b324ad8c27c530ca99e816..6d7b02397605a9bc0ae1f7d60f3d63bd3e8de75e 100644 (file)
--- a/packetcable-karaf/pom.xml
+++ b/packetcable-karaf/pom.xml
@@ -16,7 +16,6 @@
             DependencyManagement section of your parent pom -->\r
     <branding.version>1.1.0-SNAPSHOT</branding.version>\r
     <karaf.resources.version>1.5.0-SNAPSHOT</karaf.resources.version>\r
-    <karaf.version>3.0.1</karaf.version>\r
   </properties>\r
 \r
   <dependencies>\r