RYA-485 Fixed issues with maven-shade-plugin. Closes #288
diff --git a/extras/rya.merger/pom.xml b/extras/rya.merger/pom.xml
index b030479..0a1b7f6 100644
--- a/extras/rya.merger/pom.xml
+++ b/extras/rya.merger/pom.xml
@@ -162,28 +162,11 @@
<plugins>
<!--
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <mainClass>org.apache.rya.accumulo.mr.merge.MergeTool</mainClass>
- </manifest>
- </archive>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- </configuration>
- </plugin>
- -->
-
- <!--
Create shaded jar with all the dependencies
-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>2.4.3</version>
<executions>
<execution>
<phase>package</phase>
diff --git a/extras/rya.prospector/pom.xml b/extras/rya.prospector/pom.xml
index 1df7acd..65ed9ae 100644
--- a/extras/rya.prospector/pom.xml
+++ b/extras/rya.prospector/pom.xml
@@ -79,6 +79,10 @@
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
<configuration>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>map-reduce</shadedClassifierName>
diff --git a/extras/rya.reasoning/pom.xml b/extras/rya.reasoning/pom.xml
index 69be760..38fa015 100644
--- a/extras/rya.reasoning/pom.xml
+++ b/extras/rya.reasoning/pom.xml
@@ -100,6 +100,10 @@
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
<configuration>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>shaded</shadedClassifierName>
diff --git a/mapreduce/pom.xml b/mapreduce/pom.xml
index 30a00f4..6852aa3 100644
--- a/mapreduce/pom.xml
+++ b/mapreduce/pom.xml
@@ -101,40 +101,34 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+ </transformers>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>
</build>
-
- <profiles>
- <profile>
- <id>mr</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <configuration>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
- </transformers>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/pig/accumulo.pig/pom.xml b/pig/accumulo.pig/pom.xml
index 5b5c594..e807cd0 100644
--- a/pig/accumulo.pig/pom.xml
+++ b/pig/accumulo.pig/pom.xml
@@ -82,6 +82,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
diff --git a/pom.xml b/pom.xml
index 9cc67e5..8a4604b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1183,6 +1183,11 @@
<threshold>Low</threshold>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rpm-maven-plugin</artifactId>
+ <version>2.2.0</version>
+ </plugin>
</plugins>
</pluginManagement>
diff --git a/spark/pom.xml b/spark/pom.xml
index 68d4334..575fe8c 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -124,6 +124,10 @@
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
<configuration>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
