Flip to using javadoc generated from the javadoc module. Remove the "all" bundle as it's not a bundle and not needed. Was only used for javadoc.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e083b4d5 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e083b4d5 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e083b4d5 Branch: refs/heads/master Commit: e083b4d532f2b5e747a152faca5dfaf73d55cfa8 Parents: c28f034 Author: Daniel Kulp <[email protected]> Authored: Wed Apr 2 13:44:59 2014 -0400 Committer: Daniel Kulp <[email protected]> Committed: Wed Apr 2 13:46:09 2014 -0400 ---------------------------------------------------------------------- core/pom.xml | 29 -- distribution/pom.xml | 1 + distribution/src/main/assembly/bin.xml | 2 +- osgi/bundle/all/pom.xml | 457 ---------------------------- osgi/bundle/pom.xml | 1 - 5 files changed, 2 insertions(+), 488 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/e083b4d5/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 2d731ed..7ec7609 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -353,33 +353,4 @@ </plugins> </pluginManagement> </build> - <profiles> - <profile> - <id>fastinstall</id> - </profile> - <profile> - <!-- default profile enables javadoc stuff --> - <id>everything</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <executions> - <execution> - <id>package</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> http://git-wip-us.apache.org/repos/asf/cxf/blob/e083b4d5/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/pom.xml b/distribution/pom.xml index 6b5fdb7..9caba0b 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -40,6 +40,7 @@ </properties> <modules> <module>manifest</module> + <module>javadoc</module> </modules> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/cxf/blob/e083b4d5/distribution/src/main/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/distribution/src/main/assembly/bin.xml b/distribution/src/main/assembly/bin.xml index ad845c6..7243859 100644 --- a/distribution/src/main/assembly/bin.xml +++ b/distribution/src/main/assembly/bin.xml @@ -87,7 +87,7 @@ </excludes> </fileSet> <fileSet> - <directory>target/javadoc</directory> + <directory>javadoc/target/apidocs</directory> <outputDirectory>apache-cxf-${cxf.version}/docs/api</outputDirectory> <includes> <include>**/*</include> http://git-wip-us.apache.org/repos/asf/cxf/blob/e083b4d5/osgi/bundle/all/pom.xml ---------------------------------------------------------------------- diff --git a/osgi/bundle/all/pom.xml b/osgi/bundle/all/pom.xml deleted file mode 100644 index c59aeb0..0000000 --- a/osgi/bundle/all/pom.xml +++ /dev/null @@ -1,457 +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-bundle</artifactId> - <packaging>jar</packaging> - <name>Apache CXF Bundle Jar</name> - <description>Apache CXF Bundle Jar</description> - <url>http://cxf.apache.org</url> - <parent> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> - <relativePath>../../../parent</relativePath> - </parent> - <properties> - <bundle.symbolic.name>${project.groupId}.bundle</bundle.symbolic.name> - </properties> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-tools-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-tools-validator</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-tools-wsdlto-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-tools-misctools</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-tools-wsdlto-databinding-jaxb</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-tools-corba</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-rt-databinding-xmlbeans</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-rt-databinding-jibx</artifactId> - <version>${project.version}</version> - <optional>true</optional> - <exclusions> - <exclusion> - <groupId>org.jibx</groupId> - <artifactId>jibx-bind</artifactId> - </exclusion> - <exclusion> - <groupId>org.jibx</groupId> - <artifactId>jibx-run</artifactId> - </exclusion> - <exclusion> - <groupId>org.jibx</groupId> - <artifactId>jibx-schema</artifactId> - </exclusion> - <exclusion> - <groupId>org.jibx</groupId> - <artifactId>jibx-tools</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-rt-databinding-sdo</artifactId> - <version>${project.version}</version> - <optional>true</optional> - <exclusions> - <exclusion> - <groupId>org.apache.tuscany.sdo</groupId> - <artifactId>tuscany-sdo-tools</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.tuscany.sdo</groupId> - <artifactId>tuscany-sdo-impl</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-tools-wsdlto-frontend-jaxws</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-tools-wadlto-jaxrs</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-tools-wsdlto-frontend-javascript</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-tools-java2ws</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-rt-features-clustering</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-rt-management</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-rt-transports-local</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-rt-transports-http</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-rt-transports-http-jetty</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-rt-transports-jms</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-rt-transports-http-hc</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-rt-transports-udp</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-rt-bindings-soap</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-rt-bindings-corba</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-rt-bindings-coloc</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-rt-bindings-object</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-rt-bindings-xml</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-rt-databinding-aegis</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-rt-databinding-jaxb</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-rt-frontend-jaxws</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-rt-frontend-js</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-rt-frontend-simple</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-rt-frontend-jaxrs</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-rt-rs-extension-providers</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-rt-rs-extension-search</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-rt-rs-security-cors</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-rt-rs-security-oauth</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-rt-rs-security-oauth2</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-rt-rs-security-xml</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-rt-ws-mex</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-rt-ws-security</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-rt-security</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-rt-ws-policy</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-rt-ws-addr</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-rt-ws-rm</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cxf-rt-javascript</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>com.sun.xml.fastinfoset</groupId> - <artifactId>FastInfoset</artifactId> - <optional>true</optional> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <shadedGroupFilter>org.apache.cxf</shadedGroupFilter> - <shadedArtifactAttached>false</shadedArtifactAttached> - <createSourcesJar>${createSourcesJar}</createSourcesJar> - <promoteTransitiveDependencies>true</promoteTransitiveDependencies> - <createDependencyReducedPom>true</createDependencyReducedPom> - <dependencyReducedPomLocation>${basedir}/target/dependency-reduced-pom.xml</dependencyReducedPomLocation> - <filters> - <filter> - <artifact>${project.groupId}:${project.artifactId}</artifact> - <excludes> - <exclude>org/**</exclude> - </excludes> - </filter> - </filters> - <transformers> - <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"> - <projectName>Apache CXF</projectName> - </transformer> - <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> - <resource>META-INF/spring.handlers</resource> - </transformer> - <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> - <resource>META-INF/services/com.sun.tools.xjc.Plugin</resource> - </transformer> - <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> - <resource>META-INF/spring.schemas</resource> - </transformer> - <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> - <resource>META-INF/cxf/cxf.extension</resource> - </transformer> - <transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer"> - <resource>META-INF/extensions.xml</resource> - </transformer> - <transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer"> - <resource>META-INF/cxf/extensions.xml</resource> - </transformer> - <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> - <resource>META-INF/cxf/bus-extensions.txt</resource> - </transformer> - <transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer"> - <resource>META-INF/cxf/bus-extensions.xml</resource> - </transformer> - <transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer"> - <resource>META-INF/wsdl.plugin.xml</resource> - </transformer> - <transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer"> - <resource>META-INF/tools.service.validator.xml</resource> - </transformer> - <transformer implementation="org.apache.cxf.maven.PluginTransformer"> - <resource>META-INF/tools-plugin.xml</resource> - </transformer> - <transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer"> - <resource>META-INF/cxf/java2wsbeans.xml</resource> - </transformer> - <transformer implementation="org.apache.cxf.maven.CXFAllTransformer" /> - </transformers> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - <profiles> - <profile> - <id>deploy</id> - <properties> - <createSourcesJar>true</createSourcesJar> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>unpack-sources</id> - <phase>generate-sources</phase> - <goals> - <goal>unpack-dependencies</goal> - </goals> - <configuration> - <includeGroupIds>org.apache.cxf</includeGroupIds> - <classifier>sources</classifier> - <outputDirectory>${project.build.directory}/sources</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>unpack-plugin-sources</id> - <phase>generate-sources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-codegen-plugin</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </artifactItem> - </artifactItems> - <outputDirectory>${project.build.directory}/sources</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <executions> - <execution> - <id>package</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - <configuration> - <minmemory>128m</minmemory> - <maxmemory>512m</maxmemory> - <header>Apache CXF API</header> - <footer>Apache CXF API</footer> - <sourcepath>${project.build.directory}/sources</sourcepath> - <notimestamp>true</notimestamp> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> -</project> http://git-wip-us.apache.org/repos/asf/cxf/blob/e083b4d5/osgi/bundle/pom.xml ---------------------------------------------------------------------- diff --git a/osgi/bundle/pom.xml b/osgi/bundle/pom.xml index 76be989..2f5441c 100644 --- a/osgi/bundle/pom.xml +++ b/osgi/bundle/pom.xml @@ -127,7 +127,6 @@ cxf.schema.version = ${os} </resources> </build> <modules> - <module>all</module> <module>compatible</module> </modules> </project>
