Return-Path: 
 <commits-return-38663-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
X-Original-To: apmail-cxf-commits-archive@www.apache.org
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 8371A1843E
	for <apmail-cxf-commits-archive@www.apache.org>;
 Wed, 21 Oct 2015 15:13:04 +0000 (UTC)
Received: (qmail 49041 invoked by uid 500); 21 Oct 2015 15:12:59 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 48714 invoked by uid 500); 21 Oct 2015 15:12:59 -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 47016 invoked by uid 99); 21 Oct 2015 15:12:58 -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, 21 Oct 2015 15:12:58 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id ECFB8E0BAF; Wed, 21 Oct 2015 15:12:57 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: coheigea@apache.org
To: commits@cxf.apache.org
Date: Wed, 21 Oct 2015 15:13:16 -0000
Message-Id: <5dd6b09a20e0484dae4099ca137bc3b4@git.apache.org>
In-Reply-To: <3afc81b2e1134bcfbd2fd1b450a61fee@git.apache.org>
References: <3afc81b2e1134bcfbd2fd1b450a61fee@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [20/20] cxf git commit: Fixing merge

Fixing merge


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2806c0f0
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2806c0f0
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2806c0f0

Branch: refs/heads/3.0.x-fixes
Commit: 2806c0f0d94c3f3f594d47cdc2c1c2bfdac375e7
Parents: 00047e5
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Wed Oct 21 16:12:45 2015 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Wed Oct 21 16:12:45 2015 +0100

----------------------------------------------------------------------
 rt/pom.xml             |  2 +-
 rt/rs/security/pom.xml | 40 ----------------------------------------
 2 files changed, 1 insertion(+), 41 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/2806c0f0/rt/pom.xml
----------------------------------------------------------------------
diff --git a/rt/pom.xml b/rt/pom.xml
index ba07232..3136d58 100644
--- a/rt/pom.xml
+++ b/rt/pom.xml
@@ -64,7 +64,7 @@
         <module>rs/extensions/providers</module>
         <module>rs/extensions/search</module>
         <module>rs/security/xml</module>
-        <module>rs/security/jose</module>
+        <module>rs/security/jose-parent</module>
         <module>rs/security/oauth-parent</module>
         <module>rs/security/sso/saml</module>
         <module>rs/security/sso/oidc</module>

http://git-wip-us.apache.org/repos/asf/cxf/blob/2806c0f0/rt/rs/security/pom.xml
----------------------------------------------------------------------
diff --git a/rt/rs/security/pom.xml b/rt/rs/security/pom.xml
deleted file mode 100644
index 97b5f39..0000000
--- a/rt/rs/security/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.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.
--->
-<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">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>cxf-rt-rs-security</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache CXF Rest Security Runtime</name>
-    <description>Apache CXF Rest Security Runtime</description>
-    <url>http://cxf.apache.org</url>
-    <parent>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-rs</artifactId>
-        <version>3.1.4-SNAPSHOT</version>
-    </parent>
-    <modules>
-        <module>xml</module>
-        <module>jose-parent</module>
-        <module>oauth-parent</module>
-        <module>sso/saml</module>
-        <module>sso/oidc</module>
-        <module>cors</module>
-    </modules>
-</project>