reconfigure docker plugin to source jars from dist/ not target/
diff --git a/local/elasticsearch-hdfs/pom.xml b/local/elasticsearch-hdfs/pom.xml
index 7a90052..662c41f 100644
--- a/local/elasticsearch-hdfs/pom.xml
+++ b/local/elasticsearch-hdfs/pom.xml
@@ -255,6 +255,10 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
</plugins>
diff --git a/local/elasticsearch-reindex/pom.xml b/local/elasticsearch-reindex/pom.xml
index 544713f..9021ae1 100644
--- a/local/elasticsearch-reindex/pom.xml
+++ b/local/elasticsearch-reindex/pom.xml
@@ -228,6 +228,10 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
</plugins>
diff --git a/local/mongo-elasticsearch-sync/pom.xml b/local/mongo-elasticsearch-sync/pom.xml
index 388662f..05a4000 100644
--- a/local/mongo-elasticsearch-sync/pom.xml
+++ b/local/mongo-elasticsearch-sync/pom.xml
@@ -257,6 +257,10 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
</plugins>
diff --git a/local/twitter-follow-graph/pom.xml b/local/twitter-follow-graph/pom.xml
index d2e9273..4c332f9 100644
--- a/local/twitter-follow-graph/pom.xml
+++ b/local/twitter-follow-graph/pom.xml
@@ -199,45 +199,13 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>docker</id>
- <build>
- <plugins>
- <plugin>
- <!-- The Docker Maven plugin is used to create docker image with the fat jar -->
- <groupId>org.jolokia</groupId>
- <artifactId>docker-maven-plugin</artifactId>
- <version>0.11.0</version>
- <configuration>
- <images>
-
- <image>
- <alias>${project.artifactId}</alias>
- <name>${project.artifactId}:${project.version}</name>
- <build>
- <from>dockerfile/java:latest</from>
- <assembly>
- <basedir>/</basedir>
- <descriptorRef>artifact</descriptorRef>
- </assembly>
- <!-- Default command for the build image -->
- </build>
-
- </image>
-
- </images>
- </configuration>
-
- </plugin>
-
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
\ No newline at end of file
diff --git a/local/twitter-history-elasticsearch/pom.xml b/local/twitter-history-elasticsearch/pom.xml
index 1b27789..6492c42 100644
--- a/local/twitter-history-elasticsearch/pom.xml
+++ b/local/twitter-history-elasticsearch/pom.xml
@@ -227,6 +227,11 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
+
</plugins>
</build>
diff --git a/local/twitter-userstream-elasticsearch/pom.xml b/local/twitter-userstream-elasticsearch/pom.xml
index bcff091..5a61d54 100644
--- a/local/twitter-userstream-elasticsearch/pom.xml
+++ b/local/twitter-userstream-elasticsearch/pom.xml
@@ -175,7 +175,7 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
+ <artifactId>maven-resources-plugin</artifactId>
</plugin>
</plugins>
</build>
diff --git a/pom.xml b/pom.xml
index 2ac857b..6e5cf5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -191,7 +191,7 @@
<build-helper.plugin.version>1.8</build-helper.plugin.version>
<compiler.plugin.version>3.0</compiler.plugin.version>
<clean.plugin.version>2.6</clean.plugin.version>
- <docker.plugin.version>0.11.2</docker.plugin.version>
+ <docker.plugin.version>0.11.5-M1</docker.plugin.version>
<enforcer.plugin.version>1.3.1</enforcer.plugin.version>
<failsafe.plugin.version>2.17</failsafe.plugin.version>
<jar.plugin.version>2.6</jar.plugin.version>
@@ -714,7 +714,15 @@
<from>dockerfile/java:oracle-java7</from>
<assembly>
<basedir>/</basedir>
- <descriptorRef>artifact</descriptorRef>
+ <inline>
+ <baseDirectory>/</baseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>dist</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+ </inline>
</assembly>
<!-- Default command for the build image -->
</build>
