Repository: cxf Updated Branches: refs/heads/3.0.x-fixes e063e8c17 -> ce2fd3adf
untabify all pom.xml for 3.0.x Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ce2fd3ad Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ce2fd3ad Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ce2fd3ad Branch: refs/heads/3.0.x-fixes Commit: ce2fd3adf270e587fe5b8694f6c40e7ca29cf256 Parents: e063e8c Author: Akitoshi Yoshida <[email protected]> Authored: Thu Jul 9 16:21:11 2015 +0200 Committer: Akitoshi Yoshida <[email protected]> Committed: Fri Jul 10 11:58:03 2015 +0200 ---------------------------------------------------------------------- core/pom.xml | 2 +- .../samples/jax_rs/description_swagger/pom.xml | 24 +- .../src/main/release/samples/logbrowser/pom.xml | 76 ++--- osgi/itests-felix/pom.xml | 112 +++---- osgi/itests/pom.xml | 28 +- parent/pom.xml | 2 +- rt/features/clustering/pom.xml | 2 +- rt/management-web/pom.xml | 20 +- rt/rs/client/pom.xml | 10 +- rt/rs/extensions/search/pom.xml | 24 +- rt/transports/http-hc/pom.xml | 2 +- rt/transports/http-netty/netty-server/pom.xml | 4 +- rt/transports/jms/pom.xml | 306 +++++++++---------- rt/ws/addr/pom.xml | 2 +- rt/ws/policy/pom.xml | 2 +- rt/ws/rm/pom.xml | 2 +- services/ws-discovery/ws-discovery-api/pom.xml | 10 +- services/xkms/xkms-itests/pom.xml | 12 +- services/xkms/xkms-service/pom.xml | 12 +- services/xkms/xkms-x509-handlers/pom.xml | 12 +- services/xkms/xkms-x509-repo-ldap/pom.xml | 40 +-- systests/jaxrs/pom.xml | 8 +- tools/validator/pom.xml | 18 +- 23 files changed, 365 insertions(+), 365 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2fd3ad/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 3505c9c..53685de 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -355,7 +355,7 @@ ${cxf.osgi.dynamic.import} </DynamicImport-Package> <Export-Service> - ${cxf.export.service} + ${cxf.export.service} </Export-Service> <Bundle-Activator>${cxf.bundle.activator}</Bundle-Activator> </instructions> http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2fd3ad/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml b/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml index 0e60fd4..b511ed3 100644 --- a/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml @@ -108,9 +108,9 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.webjars</groupId> - <artifactId>swagger-ui</artifactId> - <version>2.0.24</version> + <groupId>org.webjars</groupId> + <artifactId>swagger-ui</artifactId> + <version>2.0.24</version> </dependency> <dependency> <groupId>javassist</groupId> @@ -118,15 +118,15 @@ <version>3.12.1.GA</version> </dependency> <dependency> - <groupId>com.fasterxml.jackson.jaxrs</groupId> - <artifactId>jackson-jaxrs-json-provider</artifactId> - <version>2.2.2</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - <version>2.2.2</version> - </dependency> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-json-provider</artifactId> + <version>2.2.2</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <version>2.2.2</version> + </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-http</artifactId> http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2fd3ad/distribution/src/main/release/samples/logbrowser/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/logbrowser/pom.xml b/distribution/src/main/release/samples/logbrowser/pom.xml index b092500..f720ba1 100644 --- a/distribution/src/main/release/samples/logbrowser/pom.xml +++ b/distribution/src/main/release/samples/logbrowser/pom.xml @@ -38,52 +38,52 @@ <target>1.6</target> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <!-- excluding libs and classes/META-INF for OSGi --> - <packagingExcludes>WEB-INF/lib/,WEB-INF/classes/META-INF/</packagingExcludes> - <archive> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <!-- excluding libs and classes/META-INF for OSGi --> + <packagingExcludes>WEB-INF/lib/,WEB-INF/classes/META-INF/</packagingExcludes> + <archive> <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> </archive> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <executions> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <executions> <execution> <id>bundle-manifest</id> <phase>process-classes</phase> <goals> <goal>manifest</goal> </goals> - </execution> + </execution> </executions> - <extensions>true</extensions> - <configuration> - <supportedProjectTypes> - <supportedProjectType>jar</supportedProjectType> - <supportedProjectType>bundle</supportedProjectType> - <supportedProjectType>war</supportedProjectType> - </supportedProjectTypes> - <instructions> - <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> - <Bundle-Description>${project.description}</Bundle-Description> - <Web-ContextPath>/cxf-samples-logbrowser</Web-ContextPath> - <Bundle-ClassPath>.,WEB-INF/classes</Bundle-ClassPath> - <Export-Package /> - <Import-Package> - org.apache.cxf.jaxrs.servlet, - org.apache.abdera.parser.stax, - com.ctc.wstx.stax, - org.apache.abdera, - * - </Import-Package> - </instructions> - </configuration> - </plugin> + <extensions>true</extensions> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>${project.description}</Bundle-Description> + <Web-ContextPath>/cxf-samples-logbrowser</Web-ContextPath> + <Bundle-ClassPath>.,WEB-INF/classes</Bundle-ClassPath> + <Export-Package /> + <Import-Package> + org.apache.cxf.jaxrs.servlet, + org.apache.abdera.parser.stax, + com.ctc.wstx.stax, + org.apache.abdera, + * + </Import-Package> + </instructions> + </configuration> + </plugin> </plugins> </build> <profiles> @@ -150,7 +150,7 @@ <groupId>org.apache.james</groupId> <artifactId>apache-mime4j-core</artifactId> </exclusion> - </exclusions> + </exclusions> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2fd3ad/osgi/itests-felix/pom.xml ---------------------------------------------------------------------- diff --git a/osgi/itests-felix/pom.xml b/osgi/itests-felix/pom.xml index 4884de2..06118ad 100644 --- a/osgi/itests-felix/pom.xml +++ b/osgi/itests-felix/pom.xml @@ -32,64 +32,64 @@ <pax.url.version>1.2.8</pax.url.version> </properties> <dependencies> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.ws.xmlschema</groupId> - <artifactId>xmlschema-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.servicemix.bundles</groupId> - <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId> - <version>${cxf.wsdl4j.bundle.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-wsdl</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-frontend-simple</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-databinding-jaxb</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-bindings-xml</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-bindings-soap</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.ws.xmlschema</groupId> + <artifactId>xmlschema-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.servicemix.bundles</groupId> + <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId> + <version>${cxf.wsdl4j.bundle.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-wsdl</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-frontend-simple</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-databinding-jaxb</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-bindings-xml</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-bindings-soap</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-servlet_3.0_spec</artifactId> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-transports-http</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-frontend-jaxws</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>org.apache.aries.blueprint.core</artifactId> - </dependency> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-transports-http</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-frontend-jaxws</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.aries.blueprint</groupId> + <artifactId>org.apache.aries.blueprint.core</artifactId> + </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2fd3ad/osgi/itests/pom.xml ---------------------------------------------------------------------- diff --git a/osgi/itests/pom.xml b/osgi/itests/pom.xml index 2757c53..91af53a 100644 --- a/osgi/itests/pom.xml +++ b/osgi/itests/pom.xml @@ -63,30 +63,30 @@ <classifier>features</classifier> </dependency> <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-karaf</artifactId> - <type>xml</type> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-karaf</artifactId> + <type>xml</type> <version>${cxf.activemq.version}</version> - <classifier>features</classifier> + <classifier>features</classifier> </dependency> <dependency> - <groupId>org.apache.karaf.features</groupId> - <artifactId>org.apache.karaf.features.core</artifactId> - <version>${cxf.karaf.version}</version> + <groupId>org.apache.karaf.features</groupId> + <artifactId>org.apache.karaf.features.core</artifactId> + <version>${cxf.karaf.version}</version> </dependency> <dependency> - <groupId>org.apache.karaf.shell</groupId> - <artifactId>org.apache.karaf.shell.console</artifactId> - <version>${cxf.karaf.version}</version> + <groupId>org.apache.karaf.shell</groupId> + <artifactId>org.apache.karaf.shell.console</artifactId> + <version>${cxf.karaf.version}</version> </dependency> <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> </dependency> <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2fd3ad/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 6a5922e..cfa0519 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1817,7 +1817,7 @@ <groupId>org.apache.tika</groupId> <artifactId>tika-parsers</artifactId> <version>${cxf.tika.version}</version> - </dependency> + </dependency> </dependencies> </dependencyManagement> <profiles> http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2fd3ad/rt/features/clustering/pom.xml ---------------------------------------------------------------------- diff --git a/rt/features/clustering/pom.xml b/rt/features/clustering/pom.xml index 50181d8..f639dbd 100644 --- a/rt/features/clustering/pom.xml +++ b/rt/features/clustering/pom.xml @@ -31,7 +31,7 @@ <relativePath>../../../parent/pom.xml</relativePath> </parent> <properties> - <cxf.bundle.activator>org.apache.cxf.clustering.blueprint.Activator</cxf.bundle.activator> + <cxf.bundle.activator>org.apache.cxf.clustering.blueprint.Activator</cxf.bundle.activator> <cxf.osgi.import> org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional, org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}" http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2fd3ad/rt/management-web/pom.xml ---------------------------------------------------------------------- diff --git a/rt/management-web/pom.xml b/rt/management-web/pom.xml index 9986694..f51778a 100644 --- a/rt/management-web/pom.xml +++ b/rt/management-web/pom.xml @@ -32,11 +32,11 @@ </parent> <properties> <cxf.osgi.import> - !com.google.*, - org.apache.abdera.parser.stax, - org.apache.abdera, - com.ctc.wstx.stax, - * + !com.google.*, + org.apache.abdera.parser.stax, + org.apache.abdera, + com.ctc.wstx.stax, + * </cxf.osgi.import> <gwt.version>2.6.0</gwt.version> <gwt.inject.version>1.5.0</gwt.inject.version> @@ -178,11 +178,11 @@ {maven-resources}, static-content=${gwt.classes.dir}/static-content </Include-Resource> - <Export-Package> - org.apache.cxf.management.web.browser, - org.apache.cxf.management.web.browser*, - org.apache.cxf.management.web.logging.atom*, - </Export-Package> + <Export-Package> + org.apache.cxf.management.web.browser, + org.apache.cxf.management.web.browser*, + org.apache.cxf.management.web.logging.atom*, + </Export-Package> </instructions> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2fd3ad/rt/rs/client/pom.xml ---------------------------------------------------------------------- diff --git a/rt/rs/client/pom.xml b/rt/rs/client/pom.xml index ae9c9e7..9a89547 100644 --- a/rt/rs/client/pom.xml +++ b/rt/rs/client/pom.xml @@ -85,11 +85,11 @@ </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jcache_1.0_spec</artifactId> - <version>1.0-alpha-1</version> - <scope>provided</scope> - <optional>true</optional> - </dependency> + <artifactId>geronimo-jcache_1.0_spec</artifactId> + <version>1.0-alpha-1</version> + <scope>provided</scope> + <optional>true</optional> + </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2fd3ad/rt/rs/extensions/search/pom.xml ---------------------------------------------------------------------- diff --git a/rt/rs/extensions/search/pom.xml b/rt/rs/extensions/search/pom.xml index 3fa6ea5..72b151c91 100644 --- a/rt/rs/extensions/search/pom.xml +++ b/rt/rs/extensions/search/pom.xml @@ -66,10 +66,10 @@ <optional>true</optional> </dependency> <dependency> - <groupId>org.apache.olingo</groupId> - <artifactId>olingo-odata2-core</artifactId> - <optional>true</optional> - </dependency> + <groupId>org.apache.olingo</groupId> + <artifactId>olingo-odata2-core</artifactId> + <optional>true</optional> + </dependency> <dependency> <groupId>org.apache.tika</groupId> <artifactId>tika-core</artifactId> @@ -86,10 +86,10 @@ <artifactId>tika-parsers</artifactId> <scope>test</scope> <exclusions> - <exclusion> - <groupId>org.apache.poi</groupId> - <artifactId>poi-ooxml</artifactId> - </exclusion> + <exclusion> + <groupId>org.apache.poi</groupId> + <artifactId>poi-ooxml</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -116,10 +116,10 @@ <scope>test</scope> <!-- Conflicts with Apache Tika dependencies --> <exclusions> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> </exclusions> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2fd3ad/rt/transports/http-hc/pom.xml ---------------------------------------------------------------------- diff --git a/rt/transports/http-hc/pom.xml b/rt/transports/http-hc/pom.xml index 6f5123e..a6f5a10 100644 --- a/rt/transports/http-hc/pom.xml +++ b/rt/transports/http-hc/pom.xml @@ -31,7 +31,7 @@ <relativePath>../../../parent/pom.xml</relativePath> </parent> <properties> - <cxf.bundle.activator>org.apache.cxf.transport.http.asyncclient.Activator</cxf.bundle.activator> + <cxf.bundle.activator>org.apache.cxf.transport.http.asyncclient.Activator</cxf.bundle.activator> <cxf.osgi.import> javax.annotation;version="${cxf.osgi.javax.annotation.version}", * http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2fd3ad/rt/transports/http-netty/netty-server/pom.xml ---------------------------------------------------------------------- diff --git a/rt/transports/http-netty/netty-server/pom.xml b/rt/transports/http-netty/netty-server/pom.xml index 03cea80..8537b3b 100644 --- a/rt/transports/http-netty/netty-server/pom.xml +++ b/rt/transports/http-netty/netty-server/pom.xml @@ -31,12 +31,12 @@ <relativePath>../../../../parent/pom.xml</relativePath> </parent> <properties> - <cxf.bundle.activator>org.apache.cxf.transport.http.netty.server.blueprint.Activator</cxf.bundle.activator> + <cxf.bundle.activator>org.apache.cxf.transport.http.netty.server.blueprint.Activator</cxf.bundle.activator> <cxf.osgi.import> io.netty.*;version="${cxf.netty.version.range}", javax.annotation;version="${cxf.osgi.javax.annotation.version}", org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional, - org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}" + org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}" </cxf.osgi.import> <cxf.osgi.export> org.apache.cxf.*, http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2fd3ad/rt/transports/jms/pom.xml ---------------------------------------------------------------------- diff --git a/rt/transports/jms/pom.xml b/rt/transports/jms/pom.xml index cb078f7..f46f48d 100644 --- a/rt/transports/jms/pom.xml +++ b/rt/transports/jms/pom.xml @@ -1,158 +1,158 @@ <?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. --> + 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-transports-jms</artifactId> - <packaging>bundle</packaging> - <name>Apache CXF Runtime JMS Transport</name> - <description>Apache CXF Runtime JMS Transport</description> - <url>http://cxf.apache.org</url> - <parent> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-parent</artifactId> - <version>3.0.6-SNAPSHOT</version> - <relativePath>../../../parent/pom.xml</relativePath> - </parent> - <properties> - <cxf.spi-dir>spi-2.1</cxf.spi-dir> - </properties> - <dependencies> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-wsdl</artifactId> - <version>${project.version}</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jms_1.1_spec</artifactId> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jta_1.1_spec</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId> - <scope>provided</scope> - <optional>true</optional> - </dependency> + <modelVersion>4.0.0</modelVersion> + <artifactId>cxf-rt-transports-jms</artifactId> + <packaging>bundle</packaging> + <name>Apache CXF Runtime JMS Transport</name> + <description>Apache CXF Runtime JMS Transport</description> + <url>http://cxf.apache.org</url> + <parent> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-parent</artifactId> + <version>3.0.6-SNAPSHOT</version> + <relativePath>../../../parent/pom.xml</relativePath> + </parent> + <properties> + <cxf.spi-dir>spi-2.1</cxf.spi-dir> + </properties> + <dependencies> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-wsdl</artifactId> + <version>${project.version}</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_1.1_spec</artifactId> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jta_1.1_spec</artifactId> + <version>1.1.1</version> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId> + <scope>provided</scope> + <optional>true</optional> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-management</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-bindings-soap</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-testutils</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-j2ee-management_1.1_spec</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-broker</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-pool</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-kahadb-store</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.xbean</groupId> - <artifactId>xbean-spring</artifactId> - <version>3.5</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jdk14</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.geronimo.components</groupId> - <artifactId>geronimo-transaction</artifactId> - <version>3.1.1</version> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-xjc-plugin</artifactId> - <version>${cxf.xjc-utils.version}</version> - <executions> - <execution> - <id>generate-sources</id> - <phase>generate-sources</phase> - <configuration> - <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot> - <xsdOptions> - <xsdOption> - <xsd>${basedir}/src/main/resources/schemas/wsdl/spec/jms-spec-wsdl.xsd</xsd> - <bindingFile>${basedir}/src/main/resources/schemas/wsdl/spec/jms-spec-wsdl.xjb</bindingFile> - </xsdOption> - </xsdOptions> - </configuration> - <goals> - <goal>xsdtojava</goal> - </goals> - </execution> - </executions> - <configuration> - <extensions> - <extension>org.apache.cxf.xjcplugins:cxf-xjc-dv:${cxf.xjc-utils.version}</extension> - </extensions> - </configuration> - </plugin> - </plugins> - </build> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-management</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-bindings-soap</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-testutils</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-j2ee-management_1.1_spec</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-broker</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-pool</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-kahadb-store</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.xbean</groupId> + <artifactId>xbean-spring</artifactId> + <version>3.5</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.geronimo.components</groupId> + <artifactId>geronimo-transaction</artifactId> + <version>3.1.1</version> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-xjc-plugin</artifactId> + <version>${cxf.xjc-utils.version}</version> + <executions> + <execution> + <id>generate-sources</id> + <phase>generate-sources</phase> + <configuration> + <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot> + <xsdOptions> + <xsdOption> + <xsd>${basedir}/src/main/resources/schemas/wsdl/spec/jms-spec-wsdl.xsd</xsd> + <bindingFile>${basedir}/src/main/resources/schemas/wsdl/spec/jms-spec-wsdl.xjb</bindingFile> + </xsdOption> + </xsdOptions> + </configuration> + <goals> + <goal>xsdtojava</goal> + </goals> + </execution> + </executions> + <configuration> + <extensions> + <extension>org.apache.cxf.xjcplugins:cxf-xjc-dv:${cxf.xjc-utils.version}</extension> + </extensions> + </configuration> + </plugin> + </plugins> + </build> </project> http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2fd3ad/rt/ws/addr/pom.xml ---------------------------------------------------------------------- diff --git a/rt/ws/addr/pom.xml b/rt/ws/addr/pom.xml index f7b557e..a6b4e4a 100644 --- a/rt/ws/addr/pom.xml +++ b/rt/ws/addr/pom.xml @@ -31,7 +31,7 @@ <relativePath>../../../parent/pom.xml</relativePath> </parent> <properties> - <cxf.bundle.activator>org.apache.cxf.ws.addressing.blueprint.Activator</cxf.bundle.activator> + <cxf.bundle.activator>org.apache.cxf.ws.addressing.blueprint.Activator</cxf.bundle.activator> <cxf.osgi.import> org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}", org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2fd3ad/rt/ws/policy/pom.xml ---------------------------------------------------------------------- diff --git a/rt/ws/policy/pom.xml b/rt/ws/policy/pom.xml index 4a827af..a43c018 100644 --- a/rt/ws/policy/pom.xml +++ b/rt/ws/policy/pom.xml @@ -31,7 +31,7 @@ <relativePath>../../../parent/pom.xml</relativePath> </parent> <properties> - <cxf.bundle.activator>org.apache.cxf.ws.policy.blueprint.Activator</cxf.bundle.activator> + <cxf.bundle.activator>org.apache.cxf.ws.policy.blueprint.Activator</cxf.bundle.activator> <cxf.osgi.import> org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}", org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2fd3ad/rt/ws/rm/pom.xml ---------------------------------------------------------------------- diff --git a/rt/ws/rm/pom.xml b/rt/ws/rm/pom.xml index fac2c3e..1142eb6 100644 --- a/rt/ws/rm/pom.xml +++ b/rt/ws/rm/pom.xml @@ -31,7 +31,7 @@ <relativePath>../../../parent/pom.xml</relativePath> </parent> <properties> - <cxf.bundle.activator>org.apache.cxf.ws.rm.blueprint.Activator</cxf.bundle.activator> + <cxf.bundle.activator>org.apache.cxf.ws.rm.blueprint.Activator</cxf.bundle.activator> <cxf.osgi.import> org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional, org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}" http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2fd3ad/services/ws-discovery/ws-discovery-api/pom.xml ---------------------------------------------------------------------- diff --git a/services/ws-discovery/ws-discovery-api/pom.xml b/services/ws-discovery/ws-discovery-api/pom.xml index 2185a01..6702ac6 100644 --- a/services/ws-discovery/ws-discovery-api/pom.xml +++ b/services/ws-discovery/ws-discovery-api/pom.xml @@ -31,12 +31,12 @@ <version>3.0.6-SNAPSHOT</version> <relativePath>../../../parent/pom.xml</relativePath> </parent> - <properties> + <properties> <cxf.osgi.export> - =org.apache.cxf.ws.discovery.internal, + =org.apache.cxf.ws.discovery.internal, org.apache.cxf.ws.discovery.*, </cxf.osgi.export> - </properties> + </properties> <dependencies> <dependency> <groupId>org.apache.cxf</groupId> @@ -118,7 +118,7 @@ </execution> </executions> </plugin> - <plugin> + <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> <extensions>true</extensions> @@ -127,7 +127,7 @@ <Export-Package>${cxf.osgi.export}</Export-Package> </instructions> </configuration> - </plugin> + </plugin> </plugins> </build> <profiles> http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2fd3ad/services/xkms/xkms-itests/pom.xml ---------------------------------------------------------------------- diff --git a/services/xkms/xkms-itests/pom.xml b/services/xkms/xkms-itests/pom.xml index b2abe89..adadda5 100644 --- a/services/xkms/xkms-itests/pom.xml +++ b/services/xkms/xkms-itests/pom.xml @@ -43,7 +43,7 @@ <version>${project.version}</version> <type>xml</type> </dependency> - <!-- to force the karaf cxf feature to be available before testing --> + <!-- to force the karaf cxf feature to be available before testing --> <dependency> <groupId>org.apache.cxf.karaf</groupId> <artifactId>apache-cxf</artifactId> @@ -92,20 +92,20 @@ <artifactId>slf4j-api</artifactId> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jcl</artifactId> - <version>1.7.7</version> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jcl</artifactId> + <version>1.7.7</version> </dependency> </dependencies> <build> <plugins> - <!-- generate dependency versions --> + <!-- generate dependency versions --> <plugin> <groupId>org.apache.servicemix.tooling</groupId> <artifactId>depends-maven-plugin</artifactId> <executions> <execution> - <phase>generate-resources</phase> + <phase>generate-resources</phase> <id>generate-depends-file</id> <goals> <goal>generate-depends-file</goal> http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2fd3ad/services/xkms/xkms-service/pom.xml ---------------------------------------------------------------------- diff --git a/services/xkms/xkms-service/pom.xml b/services/xkms/xkms-service/pom.xml index 85d599a..667a751 100644 --- a/services/xkms/xkms-service/pom.xml +++ b/services/xkms/xkms-service/pom.xml @@ -42,14 +42,14 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - <scope>provided</scope> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <scope>provided</scope> </dependency> <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> - <scope>provided</scope> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2fd3ad/services/xkms/xkms-x509-handlers/pom.xml ---------------------------------------------------------------------- diff --git a/services/xkms/xkms-x509-handlers/pom.xml b/services/xkms/xkms-x509-handlers/pom.xml index fb893aa..9198485 100644 --- a/services/xkms/xkms-x509-handlers/pom.xml +++ b/services/xkms/xkms-x509-handlers/pom.xml @@ -46,14 +46,14 @@ <artifactId>slf4j-api</artifactId> </dependency> <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - <scope>provided</scope> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <scope>provided</scope> </dependency> <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> - <scope>provided</scope> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2fd3ad/services/xkms/xkms-x509-repo-ldap/pom.xml ---------------------------------------------------------------------- diff --git a/services/xkms/xkms-x509-repo-ldap/pom.xml b/services/xkms/xkms-x509-repo-ldap/pom.xml index 882aa6f..5acb53e 100644 --- a/services/xkms/xkms-x509-repo-ldap/pom.xml +++ b/services/xkms/xkms-x509-repo-ldap/pom.xml @@ -1,5 +1,5 @@ <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/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.cxf</groupId> <artifactId>cxf-parent</artifactId> @@ -7,28 +7,28 @@ <relativePath>../../../parent/pom.xml</relativePath> </parent> <groupId>org.apache.cxf.services.xkms</groupId> - <artifactId>cxf-services-xkms-x509-repo-ldap</artifactId> + <artifactId>cxf-services-xkms-x509-repo-ldap</artifactId> <packaging>bundle</packaging> <name>Apache CXF XKMS LDAP repository</name> <url>http://cxf.apache.org</url> - <dependencies> - <dependency> - <groupId>org.apache.cxf.services.xkms</groupId> - <artifactId>cxf-services-xkms-common</artifactId> - <version>${project.version}</version> - </dependency> + <dependencies> + <dependency> + <groupId>org.apache.cxf.services.xkms</groupId> + <artifactId>cxf-services-xkms-common</artifactId> + <version>${project.version}</version> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2fd3ad/systests/jaxrs/pom.xml ---------------------------------------------------------------------- diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml index 808ee0e..35918df 100644 --- a/systests/jaxrs/pom.xml +++ b/systests/jaxrs/pom.xml @@ -490,10 +490,10 @@ <artifactId>tika-parsers</artifactId> <scope>test</scope> <exclusions> - <exclusion> - <groupId>org.apache.poi</groupId> - <artifactId>poi-ooxml</artifactId> - </exclusion> + <exclusion> + <groupId>org.apache.poi</groupId> + <artifactId>poi-ooxml</artifactId> + </exclusion> </exclusions> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2fd3ad/tools/validator/pom.xml ---------------------------------------------------------------------- diff --git a/tools/validator/pom.xml b/tools/validator/pom.xml index 618addc..7db00de 100644 --- a/tools/validator/pom.xml +++ b/tools/validator/pom.xml @@ -30,12 +30,12 @@ <version>3.0.6-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> - <properties> + <properties> <cxf.osgi.export> - =org.apache.cxf.tools.validator.internal, + =org.apache.cxf.tools.validator.internal, org.apache.cxf.tools.validator.*, </cxf.osgi.export> - </properties> + </properties> <dependencies> <dependency> <groupId>org.apache.cxf</groupId> @@ -87,9 +87,9 @@ <version>${project.version}</version> </dependency> </dependencies> - <build> - <plugins> - <plugin> + <build> + <plugins> + <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> <extensions>true</extensions> @@ -98,7 +98,7 @@ <Export-Package>${cxf.osgi.export}</Export-Package> </instructions> </configuration> - </plugin> - </plugins> - </build> + </plugin> + </plugins> + </build> </project>
