SLIDER-759 slider tarball doesn't always contain slider-agent.tar.gz
diff --git a/pom.xml b/pom.xml
index c6595a5..b6e1e19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -223,6 +223,7 @@
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<maven-surefire-report-plugin.version>${maven-surefire-plugin.version}</maven-surefire-report-plugin.version>
<maven-failsafe-plugin.version>${maven-surefire-plugin.version}</maven-failsafe-plugin.version>
+ <maven-verifier-plugin.version>1.0</maven-verifier-plugin.version>
<apache-rat-plugin.version>0.11</apache-rat-plugin.version>
<!-- build options-->
diff --git a/slider-assembly/pom.xml b/slider-assembly/pom.xml
index a7ce994..654bb86 100644
--- a/slider-assembly/pom.xml
+++ b/slider-assembly/pom.xml
@@ -102,7 +102,7 @@
<executions>
<execution>
<id>copy-dependencies</id>
- <phase>package</phase>
+ <phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
@@ -117,7 +117,7 @@
<execution>
<!-- copy in the agent tar file -->
<id>copy</id>
- <phase>package</phase>
+ <phase>prepare-package</phase>
<goals>
<goal>copy</goal>
</goals>
@@ -137,7 +137,7 @@
<execution>
<!-- copy in the agent tar file -->
<id>copy-to-lib</id>
- <phase>package</phase>
+ <phase>prepare-package</phase>
<goals>
<goal>copy</goal>
</goals>
@@ -222,7 +222,25 @@
</execution>
</executions>
</plugin>
-
+
+ <!-- verification phase checks for files in the target assembly -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-verifier-plugin</artifactId>
+ <version>${maven-verifier-plugin.version}</version>
+ <configuration>
+ <verificationFile>src/assembly/verifications.xml</verificationFile>
+ </configuration>
+ <executions>
+ <execution>
+ <id>main</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
diff --git a/slider-assembly/src/assembly/slider-bin.xml b/slider-assembly/src/assembly/slider-bin.xml
index c5611f8..f13f5df 100644
--- a/slider-assembly/src/assembly/slider-bin.xml
+++ b/slider-assembly/src/assembly/slider-bin.xml
@@ -18,9 +18,9 @@
<assembly
- xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ 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.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ 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>all</id>
<formats>
<format>tar.gz</format>
@@ -43,35 +43,9 @@
</fileSet>
<fileSet>
- <directory>
- src/conf
- </directory>
+ <directory>src/conf</directory>
<outputDirectory>conf</outputDirectory>
</fileSet>
-
- <fileSet>
- <directory>${project.build.directory}</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>${project.build.directory}/agent</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>slider-agent.tar.gz</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>${project.build.directory}/agent</directory>
- <outputDirectory>agent</outputDirectory>
- <includes>
- <include>slider-agent.tar.gz</include>
- </includes>
- </fileSet>
<fileSet>
<directory>${project.build.directory}/../../slider-agent/conf</directory>
@@ -97,6 +71,20 @@
</fileSet>
</fileSets>
+
+ <files>
+
+ <file>
+ <source>${project.build.directory}/agent/slider-agent.tar.gz</source>
+ <outputDirectory>lib</outputDirectory>
+ </file>
+
+ <file>
+ <source>${project.build.directory}/agent/slider-agent.tar.gz</source>
+ <outputDirectory>agent</outputDirectory>
+ </file>
+
+ </files>
<dependencySets>
<dependencySet>
<scope>runtime</scope>
diff --git a/slider-assembly/src/assembly/verifications.xml b/slider-assembly/src/assembly/verifications.xml
new file mode 100644
index 0000000..920fedb
--- /dev/null
+++ b/slider-assembly/src/assembly/verifications.xml
@@ -0,0 +1,34 @@
+<!--
+ ~ 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.
+ -->
+
+<verifications>
+ <!-- These checks verify that the tarfile is in place.
+ However, they don't check that the tarfile has made it through to the -all tarball, as the name of
+ that file is not known & the verifier plugin doesn't do property expansion
+ -->
+ <files>
+ <file>
+ <location>target/lib/slider-agent.tar.gz</location>
+ <exists>true</exists>
+ </file>
+ <file>
+ <location>target/agent/slider-agent.tar.gz</location>
+ <exists>true</exists>
+ </file>
+ </files>
+</verifications>
\ No newline at end of file