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 <[email protected]> Authored: Wed Oct 21 16:12:45 2015 +0100 Committer: Colm O hEigeartaigh <[email protected]> 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>
