Repository: ignite Updated Branches: refs/heads/ignite-1653 0bd558e25 -> c24277c9b
IGNITE-1653 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c24277c9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c24277c9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c24277c9 Branch: refs/heads/ignite-1653 Commit: c24277c9b981ccf93e42102b7a61261a801e0201 Parents: 0bd558e Author: Anton Vinogradov <[email protected]> Authored: Wed Oct 21 10:32:11 2015 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Wed Oct 21 10:32:11 2015 +0300 ---------------------------------------------------------------------- assembly/release-fabric-lgpl.xml | 6 +++++- assembly/release-hadoop-lgpl.xml | 39 ----------------------------------- pom.xml | 31 ---------------------------- 3 files changed, 5 insertions(+), 71 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c24277c9/assembly/release-fabric-lgpl.xml ---------------------------------------------------------------------- diff --git a/assembly/release-fabric-lgpl.xml b/assembly/release-fabric-lgpl.xml index bd77eaf..7411b02 100644 --- a/assembly/release-fabric-lgpl.xml +++ b/assembly/release-fabric-lgpl.xml @@ -21,7 +21,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd";> - <id>fabric</id> + <id>fabric-lgpl</id> <includeBaseDirectory>false</includeBaseDirectory> @@ -29,6 +29,10 @@ <format>dir</format> </formats> + <componentDescriptors> + <componentDescriptor>release-fabric.xml</componentDescriptor> + </componentDescriptors> + <fileSets> <fileSet> <directory>examples</directory> http://git-wip-us.apache.org/repos/asf/ignite/blob/c24277c9/assembly/release-hadoop-lgpl.xml ---------------------------------------------------------------------- diff --git a/assembly/release-hadoop-lgpl.xml b/assembly/release-hadoop-lgpl.xml deleted file mode 100644 index ac2fc31..0000000 --- a/assembly/release-hadoop-lgpl.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?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 xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 - http://maven.apache.org/xsd/assembly-1.1.2.xsd";> - <id>fabric</id> - - <includeBaseDirectory>false</includeBaseDirectory> - - <formats> - <format>dir</format> - </formats> - - <files> - <file> - <source>assembly/LICENSE_HADOOP</source><!--assembly should contain at least one file. copied from release-hadoop.xml --> - <destName>LICENSE</destName> - <outputDirectory>/</outputDirectory> - </file> - </files> -</assembly> http://git-wip-us.apache.org/repos/asf/ignite/blob/c24277c9/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8fa4674..5f06555 100644 --- a/pom.xml +++ b/pom.xml @@ -153,37 +153,6 @@ <module>modules/geospatial</module> <module>modules/schedule</module> </modules> - - <build> - <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> - <id>release-lgpl</id> - <phase>prepare-package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>assembly/release-${ignite.edition}-lgpl.xml</descriptor> - </descriptors> - <finalName>release-package</finalName> - <appendAssemblyId>false</appendAssemblyId> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> </profile> <profile>
