[tika] branch master updated: TIKA-1518 -- turn dockerfile-maven-plugin back on. Accidentally commented it out. Doh!

[ta...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tallison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git


The following commit(s) were added to refs/heads/master by this push:
     new ca19696  TIKA-1518 -- turn dockerfile-maven-plugin back on.  Accidentally commented it out. Doh!
     new f745340  Merge remote-tracking branch 'origin/master'
ca19696 is described below

commit ca19696657cca2ec83160f9a16cbb36bfc35cde6
Author: tballison <ta...@mitre.org>
AuthorDate: Wed Mar 7 16:28:37 2018 -0500

    TIKA-1518 -- turn dockerfile-maven-plugin back on.  Accidentally commented it out. Doh!
---
 tika-server/pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tika-server/pom.xml b/tika-server/pom.xml
index 76b0ad0..d35321f 100644
--- a/tika-server/pom.xml
+++ b/tika-server/pom.xml
@@ -260,7 +260,6 @@
           </execution>
         </executions>
       </plugin>
-      <!--
       <plugin>
         <groupId>com.spotify</groupId>
         <artifactId>dockerfile-maven-plugin</artifactId>
@@ -280,7 +279,7 @@
             <JAR_FILE>tika-server-${project.version}.jar</JAR_FILE>
           </buildArgs>
         </configuration>
-      </plugin>-->
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>

-- 
To stop receiving notification emails like this one, please contact
tallison@apache.org.