ignite-242 Assembly fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/75087747 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/75087747 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/75087747 Branch: refs/heads/ignite-sql-old Commit: 7508774774d156d39a5ddc9d32566a26b0528585 Parents: 6758f73 Author: Anton Vinogradov <avinogra...@gridgain.com> Authored: Sat Feb 14 17:36:24 2015 +0300 Committer: Anton Vinogradov <avinogra...@gridgain.com> Committed: Sat Feb 14 17:36:24 2015 +0300 ---------------------------------------------------------------------- assembly/core-jar.xml | 25 ++++++++++++++++++++++--- assembly/dependencies-fabric.xml | 13 +------------ pom.xml | 2 +- 3 files changed, 24 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/75087747/assembly/core-jar.xml ---------------------------------------------------------------------- diff --git a/assembly/core-jar.xml b/assembly/core-jar.xml index 343fe64..451f689 100644 --- a/assembly/core-jar.xml +++ b/assembly/core-jar.xml @@ -21,10 +21,10 @@ 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>jar-with-dependencies</id> + <id>core-jar-with-dependencies</id> <formats> - <format>jar</format> + <format>dir</format> </formats> <includeBaseDirectory>false</includeBaseDirectory> @@ -38,8 +38,27 @@ <includeModuleDirectory>false</includeModuleDirectory> <fileSets> <fileSet> - <directory>target/classes</directory> + <directory>${basedir}</directory> <outputDirectory>/</outputDirectory> + <includes> + <include>licenses/**</include> + </includes> + </fileSet> + <fileSet> + <directory>target/libs</directory> + <outputDirectory>/</outputDirectory> + </fileSet> + <fileSet> + <directory>target</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>*.jar</include> + </includes> + <excludes> + <exclude>*-tests.jar</exclude> + <exclude>*-javadoc.jar</exclude> + <exclude>*-sources.jar</exclude> + </excludes> </fileSet> </fileSets> </sources> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/75087747/assembly/dependencies-fabric.xml ---------------------------------------------------------------------- diff --git a/assembly/dependencies-fabric.xml b/assembly/dependencies-fabric.xml index 6222aa2..ee13ace 100644 --- a/assembly/dependencies-fabric.xml +++ b/assembly/dependencies-fabric.xml @@ -69,19 +69,8 @@ <fileSets> <fileSet> - <directory>modules/core/licenses</directory> - <outputDirectory>/licenses</outputDirectory> - </fileSet> - <fileSet> - <directory>modules/core/target/libs</directory> + <directory>target/core</directory> <outputDirectory>/</outputDirectory> </fileSet> </fileSets> - - <files> - <file> - <source>target/ignite-core-${ignite.version}.jar</source> - <outputDirectory>/</outputDirectory> - </file> - </files> </assembly> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/75087747/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 63e7fe7..ec0cf61 100644 --- a/pom.xml +++ b/pom.xml @@ -402,8 +402,8 @@ <descriptors> <descriptor>${basedir}/assembly/core-jar.xml</descriptor> </descriptors> + <finalName>core</finalName> <appendAssemblyId>false</appendAssemblyId> - <finalName>ignite-core-${ignite.version}</finalName> </configuration> </execution>
