Return-Path: <commits-return-43666-archive-asf-public=cust-asf.ponee.io@cxf.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id A7326200B92
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Wed, 28 Sep 2016 15:44:02 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id A5D94160ADD; Wed, 28 Sep 2016 13:44:02 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id E90E9160AB4
	for <archive-asf-public@cust-asf.ponee.io>; Wed, 28 Sep 2016 15:44:01 +0200 (CEST)
Received: (qmail 98611 invoked by uid 500); 28 Sep 2016 13:44:01 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 98602 invoked by uid 99); 28 Sep 2016 13:44:01 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Sep 2016 13:44:01 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id F103CDFF4E; Wed, 28 Sep 2016 13:44:00 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: gnodet@apache.org
To: commits@cxf.apache.org
Date: Wed, 28 Sep 2016 13:44:00 -0000
Message-Id: <b136089debfc4131b71d6130680340b0@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/3] cxf git commit: [CXF-7060] Drop karaf 3 support
archived-at: Wed, 28 Sep 2016 13:44:02 -0000

Repository: cxf
Updated Branches:
  refs/heads/master 44e59d77c -> 3fbedf139


http://git-wip-us.apache.org/repos/asf/cxf/blob/3fbedf13/osgi/karaf4/pom.xml
----------------------------------------------------------------------
diff --git a/osgi/karaf4/pom.xml b/osgi/karaf4/pom.xml
deleted file mode 100644
index d753c10..0000000
--- a/osgi/karaf4/pom.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <!--
-
-        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.
-    -->
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-parent</artifactId>
-        <version>3.2.0-SNAPSHOT</version>
-        <relativePath>../../parent</relativePath>
-    </parent>
-    <groupId>org.apache.cxf.karaf4</groupId>
-    <artifactId>karaf4-parent</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache CXF Karaf4 Parent</name>
-    <description>Apache CXF Karaf4 Parent</description>
-    <modules>
-        <module>commands</module>
-        <module>features</module>
-    </modules>
-</project>

http://git-wip-us.apache.org/repos/asf/cxf/blob/3fbedf13/osgi/pom.xml
----------------------------------------------------------------------
diff --git a/osgi/pom.xml b/osgi/pom.xml
index 83a0652d..5978de5 100644
--- a/osgi/pom.xml
+++ b/osgi/pom.xml
@@ -34,7 +34,6 @@
         <module>itests</module>
         <module>itests-felix</module>
         <module>karaf</module>
-        <!-- <module>karaf4</module> -->
         <module>repository</module>
     </modules>
 </project>

http://git-wip-us.apache.org/repos/asf/cxf/blob/3fbedf13/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 10795a6..91967a8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -182,8 +182,7 @@
         <cxf.aries.parser.version>1.3.1</cxf.aries.parser.version> 
         <cxf.aries.version.range>[1.0,2)</cxf.aries.version.range>
         <cxf.osgi.version>4.2.0</cxf.osgi.version>
-        <cxf.karaf.version>3.0.6</cxf.karaf.version>
-        <cxf.karaf4.version>4.0.6</cxf.karaf4.version>
+        <cxf.karaf.version>4.0.6</cxf.karaf.version>
         <cxf.pax.logging.version>1.6.0</cxf.pax.logging.version>
         <cxf.pax.exam.version>4.7.0</cxf.pax.exam.version>
         <cxf.felix.framework.version>2.0.5</cxf.felix.framework.version>