You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2015/11/01 12:48:17 UTC
[06/12] incubator-slider git commit: SLIDER-777 Provide slider
dependencies as a self contained versioned tarball - generate slider.tar.gz
during build
SLIDER-777 Provide slider dependencies as a self contained versioned tarball - generate slider.tar.gz during build
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/4dda8e8e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/4dda8e8e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/4dda8e8e
Branch: refs/heads/feature/SLIDER-82-anti-affinity-attempt-2
Commit: 4dda8e8ed702d3f3b85b14676c3122960cb762de
Parents: 94b2610
Author: Gour Saha <go...@apache.org>
Authored: Mon Oct 26 17:40:25 2015 -0700
Committer: Gour Saha <go...@apache.org>
Committed: Mon Oct 26 17:40:25 2015 -0700
----------------------------------------------------------------------
slider-assembly/pom.xml | 61 +++++++++++++++++---
slider-assembly/src/assembly/slider-bin.xml | 6 ++
.../src/assembly/slider-dependency.xml | 38 ++++++++++++
.../org/apache/slider/client/SliderClient.java | 3 +-
4 files changed, 99 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4dda8e8e/slider-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/slider-assembly/pom.xml b/slider-assembly/pom.xml
index e6a9401..0f7340f 100644
--- a/slider-assembly/pom.xml
+++ b/slider-assembly/pom.xml
@@ -205,13 +205,53 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>${maven-assembly-plugin.version}</version>
- <configuration>
- <tarLongFileMode>gnu</tarLongFileMode>
- <descriptors>
- <descriptor>src/assembly/slider-bin.xml</descriptor>
- </descriptors>
- <finalName>slider-${project.version}</finalName>
- </configuration>
+ <executions>
+ <execution>
+ <id>make-dependency</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <descriptors>
+ <descriptor>src/assembly/slider-dependency.xml</descriptor>
+ </descriptors>
+ <finalName>slider</finalName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>${maven-resources-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>copy-dependency</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/lib</outputDirectory>
+ <overwrite>true</overwrite>
+ <resources>
+ <resource>
+ <directory>${project.build.directory}</directory>
+ <includes>
+ <include>slider-dependency.tar.gz</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven-assembly-plugin.version}</version>
<executions>
<execution>
<id>make-assembly</id>
@@ -219,6 +259,13 @@
<goals>
<goal>single</goal>
</goals>
+ <configuration>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <descriptors>
+ <descriptor>src/assembly/slider-bin.xml</descriptor>
+ </descriptors>
+ <finalName>slider-${project.version}</finalName>
+ </configuration>
</execution>
</executions>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4dda8e8e/slider-assembly/src/assembly/slider-bin.xml
----------------------------------------------------------------------
diff --git a/slider-assembly/src/assembly/slider-bin.xml b/slider-assembly/src/assembly/slider-bin.xml
index 8887ec8..07066b5 100644
--- a/slider-assembly/src/assembly/slider-bin.xml
+++ b/slider-assembly/src/assembly/slider-bin.xml
@@ -86,6 +86,12 @@
</file>
<file>
+ <source>${project.build.directory}/lib/slider-dependency.tar.gz</source>
+ <outputDirectory>lib</outputDirectory>
+ <destName>slider.tar.gz</destName>
+ </file>
+
+ <file>
<source>${project.build.directory}/maven-shared-archive-resources/META-INF/DEPENDENCIES</source>
<outputDirectory>/</outputDirectory>
</file>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4dda8e8e/slider-assembly/src/assembly/slider-dependency.xml
----------------------------------------------------------------------
diff --git a/slider-assembly/src/assembly/slider-dependency.xml b/slider-assembly/src/assembly/slider-dependency.xml
new file mode 100644
index 0000000..b2bae61
--- /dev/null
+++ b/slider-assembly/src/assembly/slider-dependency.xml
@@ -0,0 +1,38 @@
+<!--
+ ~ 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>dependency</id>
+ <formats>
+ <format>tar.gz</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <dependencySets>
+ <dependencySet>
+ <scope>runtime</scope>
+ <outputDirectory></outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <unpack>false</unpack>
+ </dependencySet>
+ </dependencySets>
+</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4dda8e8e/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
index 16e5c9a..3e7f6e1 100644
--- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
+++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
@@ -4407,8 +4407,7 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe
FilenameFilter jarFilter = new FilenameFilter() {
public boolean accept(File dir, String name) {
String lowercaseName = name.toLowerCase();
- if (lowercaseName.endsWith(".jar")
- && !lowercaseName.startsWith("slider-core")) {
+ if (lowercaseName.endsWith(".jar")) {
return true;
} else {
return false;