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>
