This is an automated email from the ASF dual-hosted git repository.
amichai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-dosgi.git
commit 47133d4b479704f17b9657a88e8bbba104994afa
Author: Amichai Rothman <amic...@apache.org>
AuthorDate: Tue May 28 22:52:39 2019 +0300
Fix mixed indentation styles
---
buildtools/cxf-checkstyle.xml | 64 +--
distribution/multi-bundle/pom.xml | 528 ++++++++++-----------
.../multi-bundle/src/main/assembly/assembly.xml | 118 ++---
distribution/repository/pom.xml | 2 +-
itests/multi-bundle/pom.xml | 22 +-
parent/pom.xml | 14 +-
provider-rs/pom.xml | 16 +-
samples/rest/impl-jackson/pom.xml | 36 +-
samples/rest/impl/pom.xml | 6 +-
9 files changed, 403 insertions(+), 403 deletions(-)
diff --git a/buildtools/cxf-checkstyle.xml b/buildtools/cxf-checkstyle.xml
index 9d54896..ce59e05 100644
--- a/buildtools/cxf-checkstyle.xml
+++ b/buildtools/cxf-checkstyle.xml
@@ -18,8 +18,8 @@
under the License.
-->
<!DOCTYPE module PUBLIC
- "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
- "http://www.puppycrawl.com/dtds/configuration_1_2.dtd";>
+ "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+ "http://www.puppycrawl.com/dtds/configuration_1_2.dtd";>
<!--
Checks to make sure the code meets the CXF coding guidelines which
@@ -31,7 +31,7 @@
-->
<module name="Checker">
- <property name="severity" value="error"/>
+ <property name="severity" value="error"/>
<!-- Checks whether files end with a new line.
-->
<!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile
-->
@@ -102,7 +102,7 @@
</module>
<module name="ParameterNumber">
<property name="max" value="7" />
- <property name="ignoreOverriddenMethods" value="true"/>
+ <property name="ignoreOverriddenMethods" value="true"/>
</module>
<!-- Checks for whitespace -->
@@ -258,35 +258,35 @@
<!--<module name="UncommentedMain"/>-->
<!--module name="TrailingComment"/-->
<module name="Indentation">
- <property name="caseIndent" value="0" />
- <property name="lineWrappingIndentation" value="0"/>
+ <property name="caseIndent" value="0" />
+ <property name="lineWrappingIndentation" value="0"/>
</module>
<!--<module name="RequiredRegexp">-->
- <module name="SuppressWarningsHolder" />
+ <module name="SuppressWarningsHolder" />
+ </module>
+ <module name="SuppressionCommentFilter">
+ <property name="offCommentFormat" value="CHECKSTYLE\:OFF"/>
+ <property name="onCommentFormat" value="CHECKSTYLE\:ON"/>
+ </module>
+ <module name="SuppressionCommentFilter">
+ <property name="offCommentFormat"
value="CHECKSTYLE.OFF\:([\w\|]+)"/>
+ <property name="onCommentFormat"
value="CHECKSTYLE.ON\:([\w\|]+)"/>
+ <property name="checkFormat" value="$1"/>
+ </module>
+ <module name="SuppressWarningsFilter"/>
+ <module name="SuppressionFilter">
+ <property name="file" value="${checkstyle.suppressions.file}" />
+ </module>
+ <!-- Header checks -->
+ <module name="Header">
+ <property name="header"
+ value="/**\n * Licensed to the Apache Software
Foundation (ASF) under one\n * or more contributor license agreements. See the
NOTICE file\n * distributed with this work for additional information\n *
regarding copyright ownership. The ASF licenses this file\n * to you under the
Apache License, Version 2.0 (the\n * "License"); you may not use this
file except in compliance\n * with the License. You may obtain a copy of the
License at\n *\n * http://www.apache.org/licenses/LIC [...]
+ </module>
+ <!-- <module name="RegexpHeader"/> -->
+ <module name="FileLength">
+ <property name="max" value="3000" />
+ </module>
+ <module name="FileTabCharacter">
+ <property name="eachLine" value="true"/>
</module>
- <module name="SuppressionCommentFilter">
- <property name="offCommentFormat" value="CHECKSTYLE\:OFF"/>
- <property name="onCommentFormat" value="CHECKSTYLE\:ON"/>
- </module>
- <module name="SuppressionCommentFilter">
- <property name="offCommentFormat" value="CHECKSTYLE.OFF\:([\w\|]+)"/>
- <property name="onCommentFormat" value="CHECKSTYLE.ON\:([\w\|]+)"/>
- <property name="checkFormat" value="$1"/>
- </module>
- <module name="SuppressWarningsFilter"/>
- <module name="SuppressionFilter">
- <property name="file" value="${checkstyle.suppressions.file}" />
- </module>
- <!-- Header checks -->
- <module name="Header">
- <property name="header"
- value="/**\n * Licensed to the Apache Software Foundation
(ASF) under one\n * or more contributor license agreements. See the NOTICE
file\n * distributed with this work for additional information\n * regarding
copyright ownership. The ASF licenses this file\n * to you under the Apache
License, Version 2.0 (the\n * "License"); you may not use this file
except in compliance\n * with the License. You may obtain a copy of the License
at\n *\n * http://www.apache.org [...]
- </module>
- <!-- <module name="RegexpHeader"/> -->
- <module name="FileLength">
- <property name="max" value="3000" />
- </module>
- <module name="FileTabCharacter">
- <property name="eachLine" value="true"/>
- </module>
</module>
diff --git a/distribution/multi-bundle/pom.xml
b/distribution/multi-bundle/pom.xml
index ff35945..550470e 100644
--- a/distribution/multi-bundle/pom.xml
+++ b/distribution/multi-bundle/pom.xml
@@ -1,66 +1,66 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!-- 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. -->
+ 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-dosgi-multibundle-distribution</artifactId>
- <name>CXF DOSGi Multi-Bundle Distribution</name>
- <url>http://cxf.apache.org</url>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>cxf-dosgi-multibundle-distribution</artifactId>
+ <name>CXF DOSGi Multi-Bundle Distribution</name>
+ <url>http://cxf.apache.org</url>
- <parent>
- <groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-distribution-parent</artifactId>
- <version>2.4.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
+ <parent>
+ <groupId>org.apache.cxf.dosgi</groupId>
+ <artifactId>cxf-dosgi-distribution-parent</artifactId>
+ <version>2.4.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
- <properties>
- <dosgi.version>${project.version}</dosgi.version>
- <topDirectoryLocation>../..</topDirectoryLocation>
- <karaf.version>4.1.2</karaf.version>
- </properties>
+ <properties>
+ <dosgi.version>${project.version}</dosgi.version>
+ <topDirectoryLocation>../..</topDirectoryLocation>
+ <karaf.version>4.1.2</karaf.version>
+ </properties>
- <dependencies>
- <!-- Basic Felix bundles -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.eventadmin</artifactId>
- <version>1.4.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.8.8</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.metatype</artifactId>
- <version>1.1.2</version>
- <exclusions>
- <exclusion>
- <artifactId>kxml2</artifactId>
- <groupId>net.sf.kxml</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.fileinstall</artifactId>
- <version>3.5.2</version>
- </dependency>
+ <dependencies>
+ <!-- Basic Felix bundles -->
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.eventadmin</artifactId>
+ <version>1.4.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>1.8.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.metatype</artifactId>
+ <version>1.1.2</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>kxml2</artifactId>
+ <groupId>net.sf.kxml</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.fileinstall</artifactId>
+ <version>3.5.2</version>
+ </dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.command</artifactId>
@@ -81,81 +81,81 @@
<artifactId>jline</artifactId>
<version>3.10.0</version>
</dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr</artifactId>
- <version>2.0.12</version>
- <exclusions>
- <exclusion>
-
<artifactId>animal-sniffer-annotations</artifactId>
- <groupId>org.codehaus.mojo</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <version>3.0.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- </exclusion>
- <exclusion>
-
<groupId>org.eclipse.jetty.websocket</groupId>
-
<artifactId>websocket-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.felix</groupId>
-
<artifactId>org.apache.felix.http.base</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr</artifactId>
+ <version>2.0.12</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>animal-sniffer-annotations</artifactId>
+ <groupId>org.codehaus.mojo</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.jetty</artifactId>
+ <version>3.0.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty.websocket</groupId>
+ <artifactId>websocket-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.base</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
- <dependency>
- <groupId>org.ops4j.pax.logging</groupId>
- <artifactId>pax-logging-service</artifactId>
- <version>1.10.1</version>
- </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-service</artifactId>
+ <version>1.10.1</version>
+ </dependency>
- <!-- rsa -->
- <dependency>
- <groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-repository</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <!-- rsa -->
+ <dependency>
+ <groupId>org.apache.cxf.dosgi</groupId>
+ <artifactId>cxf-dosgi-repository</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <dependency>
- <groupId>org.apache.cxf.dosgi.samples</groupId>
- <artifactId>cxf-dosgi-samples-soap-impl</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.dosgi.samples</groupId>
- <artifactId>cxf-dosgi-samples-soap-client</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.dosgi.samples</groupId>
- <artifactId>cxf-dosgi-samples-rest-impl</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.dosgi.samples</groupId>
- <artifactId>cxf-dosgi-samples-rest-client</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-jaxrs</artifactId>
- <version>1.5.16</version>
- <exclusions>
- <exclusion>
- <groupId>org.reflections</groupId>
- <artifactId>reflections</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.dosgi.samples</groupId>
+ <artifactId>cxf-dosgi-samples-soap-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.dosgi.samples</groupId>
+ <artifactId>cxf-dosgi-samples-soap-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.dosgi.samples</groupId>
+ <artifactId>cxf-dosgi-samples-rest-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.dosgi.samples</groupId>
+ <artifactId>cxf-dosgi-samples-rest-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-jaxrs</artifactId>
+ <version>1.5.16</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.reflections</groupId>
+ <artifactId>reflections</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>javax.xml.soap</groupId>
@@ -163,145 +163,145 @@
<version>1.4.0</version>
</dependency>
- <!-- Swagger dependencies -->
- <dependency>
- <groupId>org.webjars</groupId>
- <artifactId>swagger-ui</artifactId>
- <version>2.2.10-1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
-
<artifactId>org.apache.servicemix.bundles.reflections</artifactId>
- <version>0.9.10_3</version>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>20.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.9</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>2.9.7</version>
- </dependency>
- </dependencies>
+ <!-- Swagger dependencies -->
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>swagger-ui</artifactId>
+ <version>2.2.10-1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.reflections</artifactId>
+ <version>0.9.10_3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>20.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.9</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.9.7</version>
+ </dependency>
+ </dependencies>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy</id>
-
<phase>generate-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
-
<groupId>org.apache.felix</groupId>
-
<artifactId>org.apache.felix.main</artifactId>
-
<version>${felix.version}</version>
-
<type>jar</type>
-
<overWrite>true</overWrite>
-
<outputDirectory>target/bin</outputDirectory>
-
<destFileName>felix.jar</destFileName>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
-
<artifactId>bnd-indexer-maven-plugin</artifactId>
- <version>4.0.0</version>
- <configuration>
- <includeGzip>false</includeGzip>
- <localURLs>REQUIRED</localURLs>
- <addMvnURLs>
- </addMvnURLs>
- </configuration>
- <executions>
- <execution>
- <id>index</id>
- <goals>
- <goal>index</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-export-maven-plugin</artifactId>
- <version>4.2.0</version>
- <configuration>
- <resolve>true</resolve>
- <failOnChanges>false</failOnChanges>
- <bndruns>
- <bndrun>distro.bndrun</bndrun>
- </bndruns>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>export</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.felix</groupId>
+
<artifactId>org.apache.felix.main</artifactId>
+ <version>${felix.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+
<outputDirectory>target/bin</outputDirectory>
+ <destFileName>felix.jar</destFileName>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-indexer-maven-plugin</artifactId>
+ <version>4.0.0</version>
+ <configuration>
+ <includeGzip>false</includeGzip>
+ <localURLs>REQUIRED</localURLs>
+ <addMvnURLs>
+ </addMvnURLs>
+ </configuration>
+ <executions>
+ <execution>
+ <id>index</id>
+ <goals>
+ <goal>index</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-export-maven-plugin</artifactId>
+ <version>4.2.0</version>
+ <configuration>
+ <resolve>true</resolve>
+ <failOnChanges>false</failOnChanges>
+ <bndruns>
+ <bndrun>distro.bndrun</bndrun>
+ </bndruns>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>export</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
- <!-- Unzip the archive created by bnd export plugin. To
then repackage it in the assembly phase -->
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <configuration>
- <target>
- <unzip
src="target/distro.jar" dest="target/distro-unzip" />
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <!-- Unzip the archive created by bnd export plugin. To then
repackage it in the assembly phase -->
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <configuration>
+ <target>
+ <unzip src="target/distro.jar"
dest="target/distro-unzip" />
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
-
<finalName>cxf-dosgi</finalName>
- <descriptors>
-
<descriptor>./src/main/assembly/assembly.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>cxf-dosgi</finalName>
+ <descriptors>
+
<descriptor>./src/main/assembly/assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
- </plugins>
- </build>
+ </plugins>
+ </build>
</project>
diff --git a/distribution/multi-bundle/src/main/assembly/assembly.xml
b/distribution/multi-bundle/src/main/assembly/assembly.xml
index 071928b..bb595e2 100644
--- a/distribution/multi-bundle/src/main/assembly/assembly.xml
+++ b/distribution/multi-bundle/src/main/assembly/assembly.xml
@@ -1,5 +1,5 @@
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0
http://maven.apache.org/xsd/assembly-2.0.0.xsd";>
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0
http://maven.apache.org/xsd/assembly-2.0.0.xsd";>
<!--
Licensed to the Apache Software Foundation (ASF) under one
@@ -19,62 +19,62 @@
specific language governing permissions and limitations
under the License.
-->
- <id>dir</id>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>cxf-dosgi-${project.version}</baseDirectory>
- <dependencySets>
- <dependencySet>
- <includes>
-
<include>org.apache.cxf.dosgi.samples:cxf-dosgi-samples-soap-api</include>
-
<include>org.apache.cxf.dosgi.samples:cxf-dosgi-samples-soap-impl</include>
-
<include>org.apache.cxf.dosgi.samples:cxf-dosgi-samples-soap-client</include>
-
<include>org.apache.cxf.dosgi.samples:cxf-dosgi-samples-rest-api</include>
-
<include>org.apache.cxf.dosgi.samples:cxf-dosgi-samples-rest-impl</include>
-
<include>org.apache.cxf.dosgi.samples:cxf-dosgi-samples-rest-client</include>
- </includes>
- <outputDirectory>
- samples
- </outputDirectory>
- </dependencySet>
- </dependencySets>
- <fileSets>
- <fileSet>
- <directory>../..</directory>
- <includes>
- <include>release_notes.md</include>
- </includes>
- <outputDirectory>.</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/bin</directory>
- <outputDirectory>bin</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/distro-unzip/jar</directory>
- <excludes>
- <exclude>org.apache.felix.framework*</exclude>
- <exclude>biz.aQute.launcher*</exclude>
- </excludes>
- <outputDirectory>bundle</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/maven-shared-archive-resources/META-INF</directory>
- <excludes>
- <exclude>DEPENDENCIES</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>src/main/release</directory>
- <outputDirectory>.</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/maven-shared-archive-resources/META-INF</directory>
- <outputDirectory>.</outputDirectory>
- </fileSet>
- </fileSets>
+ <id>dir</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <baseDirectory>cxf-dosgi-${project.version}</baseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <includes>
+
<include>org.apache.cxf.dosgi.samples:cxf-dosgi-samples-soap-api</include>
+
<include>org.apache.cxf.dosgi.samples:cxf-dosgi-samples-soap-impl</include>
+
<include>org.apache.cxf.dosgi.samples:cxf-dosgi-samples-soap-client</include>
+
<include>org.apache.cxf.dosgi.samples:cxf-dosgi-samples-rest-api</include>
+
<include>org.apache.cxf.dosgi.samples:cxf-dosgi-samples-rest-impl</include>
+
<include>org.apache.cxf.dosgi.samples:cxf-dosgi-samples-rest-client</include>
+ </includes>
+ <outputDirectory>
+ samples
+ </outputDirectory>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>../..</directory>
+ <includes>
+ <include>release_notes.md</include>
+ </includes>
+ <outputDirectory>.</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/distro-unzip/jar</directory>
+ <excludes>
+ <exclude>org.apache.felix.framework*</exclude>
+ <exclude>biz.aQute.launcher*</exclude>
+ </excludes>
+ <outputDirectory>bundle</outputDirectory>
+ </fileSet>
+ <fileSet>
+
<directory>target/maven-shared-archive-resources/META-INF</directory>
+ <excludes>
+ <exclude>DEPENDENCIES</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/release</directory>
+ <outputDirectory>.</outputDirectory>
+ </fileSet>
+ <fileSet>
+
<directory>target/maven-shared-archive-resources/META-INF</directory>
+ <outputDirectory>.</outputDirectory>
+ </fileSet>
+ </fileSets>
</assembly>
diff --git a/distribution/repository/pom.xml b/distribution/repository/pom.xml
index e3e591c..2dcefc5 100644
--- a/distribution/repository/pom.xml
+++ b/distribution/repository/pom.xml
@@ -59,6 +59,6 @@
</dependencies>
<properties>
- <checkstyle.skip>true</checkstyle.skip>
+ <checkstyle.skip>true</checkstyle.skip>
</properties>
</project>
diff --git a/itests/multi-bundle/pom.xml b/itests/multi-bundle/pom.xml
index facde78..55a9b9b 100644
--- a/itests/multi-bundle/pom.xml
+++ b/itests/multi-bundle/pom.xml
@@ -43,17 +43,17 @@
-->
<dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-common</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- Pax Exam -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.cmpn</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.dosgi</groupId>
+ <artifactId>cxf-dosgi-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- Pax Exam -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
diff --git a/parent/pom.xml b/parent/pom.xml
index 7c6d958..a4b6edb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -165,17 +165,17 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.http</artifactId>
- <version>1.2.1</version>
- <scope>provided</scope>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.http</artifactId>
+ <version>1.2.1</version>
+ <scope>provided</scope>
</dependency>
<!-- Just for the remote service admin spec -->
<dependency>
- <groupId>org.apache.aries.rsa</groupId>
- <artifactId>org.apache.aries.rsa.core</artifactId>
- <version>${aries.rsa.version}</version>
+ <groupId>org.apache.aries.rsa</groupId>
+ <artifactId>org.apache.aries.rsa.core</artifactId>
+ <version>${aries.rsa.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.rsa</groupId>
diff --git a/provider-rs/pom.xml b/provider-rs/pom.xml
index 202e229..8359fc5 100644
--- a/provider-rs/pom.xml
+++ b/provider-rs/pom.xml
@@ -47,12 +47,12 @@
<artifactId>cxf-core</artifactId>
<version>${cxf.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>${cxf.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
<version>${cxf.version}</version>
@@ -70,12 +70,12 @@
<version>${cxf.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-extension-search</artifactId>
- <version>${cxf.version}</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-extension-search</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
diff --git a/samples/rest/impl-jackson/pom.xml
b/samples/rest/impl-jackson/pom.xml
index f708adf..bd1b034 100644
--- a/samples/rest/impl-jackson/pom.xml
+++ b/samples/rest/impl-jackson/pom.xml
@@ -45,25 +45,25 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.aries.rsa</groupId>
- <artifactId>org.apache.aries.rsa.spi</artifactId>
- <version>${aries.rsa.version}</version>
+ <groupId>org.apache.aries.rsa</groupId>
+ <artifactId>org.apache.aries.rsa.spi</artifactId>
+ <version>${aries.rsa.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <version>2.9.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-core</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-features-logging</artifactId>
+ <version>${cxf.version}</version>
</dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
- <version>2.9.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-core</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-features-logging</artifactId>
- <version>${cxf.version}</version>
- </dependency>
</dependencies>
</project>
diff --git a/samples/rest/impl/pom.xml b/samples/rest/impl/pom.xml
index 4fa4244..e3a8560 100644
--- a/samples/rest/impl/pom.xml
+++ b/samples/rest/impl/pom.xml
@@ -34,9 +34,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.aries.rsa</groupId>
- <artifactId>org.apache.aries.rsa.spi</artifactId>
- <version>${aries.rsa.version}</version>
+ <groupId>org.apache.aries.rsa</groupId>
+ <artifactId>org.apache.aries.rsa.spi</artifactId>
+ <version>${aries.rsa.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf.dosgi</groupId>
