release-sources & dotnet doc fix
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dd0a8d3a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dd0a8d3a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dd0a8d3a Branch: refs/heads/ignite-1.5.1-2 Commit: dd0a8d3acc2696db3404f7708bf27e34c7456b07 Parents: 939a170 Author: Anton Vinogradov <a...@apache.org> Authored: Mon Dec 28 12:39:04 2015 +0300 Committer: Anton Vinogradov <a...@apache.org> Committed: Mon Dec 28 12:39:04 2015 +0300 ---------------------------------------------------------------------- assembly/release-sources.xml | 79 +++++++++++++++++++++++++++++++++++++++ modules/clients/pom.xml | 2 +- pom.xml | 23 +++++++----- 3 files changed, 93 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/dd0a8d3a/assembly/release-sources.xml ---------------------------------------------------------------------- diff --git a/assembly/release-sources.xml b/assembly/release-sources.xml new file mode 100644 index 0000000..96e54f9 --- /dev/null +++ b/assembly/release-sources.xml @@ -0,0 +1,79 @@ +<?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. +--> + +<assembly> + <id>source-release</id> + <formats> + <format>zip</format> + </formats> + + <fileSets> + <!-- main project directory structure --> + <fileSet> + <directory>.</directory> + <outputDirectory>/</outputDirectory> + <useDefaultExcludes>true</useDefaultExcludes> + <excludes> + <!-- build output --> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*]</exclude> + + <!-- NOTE: Most of the following excludes should not be required + if the standard release process is followed. This is because the + release plugin checks out project sources into a location like + target/checkout, then runs the build from there. The result is + a source-release archive that comes from a pretty clean directory + structure. + + HOWEVER, if the release plugin is configured to run extra goals + or generate a project website, it's definitely possible that some + of these files will be present. So, it's safer to exclude them. + --> + + <!-- IDEs --> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?maven-eclipse\.xml]</exclude> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.project]</exclude> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.classpath]</exclude> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iws]</exclude> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.idea(/.*)?]</exclude> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?out(/.*)?]</exclude> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.ipr]</exclude> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iml]</exclude> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.settings(/.*)?]</exclude> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.externalToolBuilders(/.*)?]</exclude> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.deployables(/.*)?]</exclude> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.wtpmodules(/.*)?]</exclude> + + <!-- misc --> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?cobertura\.ser]</exclude> + + <!-- release-plugin temp files --> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup]</exclude> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]</exclude> + + <!-- dotnet assemblies --> + <exclude>modules/platforms/dotnet/bin/**</exclude> + </excludes> + </fileSet> + <!-- license, readme, etc. calculated at build time --> + <fileSet> + <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory> + <outputDirectory>/</outputDirectory> + </fileSet> + </fileSets> +</assembly> http://git-wip-us.apache.org/repos/asf/ignite/blob/dd0a8d3a/modules/clients/pom.xml ---------------------------------------------------------------------- diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml index 1f4555f..faef4a4 100644 --- a/modules/clients/pom.xml +++ b/modules/clients/pom.xml @@ -142,7 +142,7 @@ <id>docs</id> <activation> <property> - <name>!skipClientDocs</name> + <name>clientDocs</name> </property> </activation> <build> http://git-wip-us.apache.org/repos/asf/ignite/blob/dd0a8d3a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 4bdad1e..3457c30 100644 --- a/pom.xml +++ b/pom.xml @@ -476,25 +476,28 @@ <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.apache.apache.resources</groupId> - <artifactId>apache-source-release-assembly-descriptor</artifactId> - <version>1.0.4</version> - </dependency> - </dependencies> <executions> <execution> + <!-- skip default --> <id>source-release-assembly</id> + <goals> + <goal>single</goal> + </goals> + <configuration> + <skipAssembly>true</skipAssembly> + </configuration> + </execution> + <execution> + <id>source-release-assembly-ignite</id> <phase>package</phase> <goals> <goal>single</goal> </goals> <configuration> <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot> - <descriptorRefs> - <descriptorRef>${sourceReleaseAssemblyDescriptor}</descriptorRef> - </descriptorRefs> + <descriptors> + <descriptor>assembly/release-sources.xml</descriptor> + </descriptors> <tarLongFileMode>gnu</tarLongFileMode> <finalName>${project.artifactId}-${project.version}-src</finalName> <appendAssemblyId>false</appendAssemblyId>