Skip to content

Commit

Permalink
JDG-551: Revert "JDG-140 use maven dependency plugin and maven resour…
Browse files Browse the repository at this point in the history
…ces plugin to move hadoop samples into source directory and package it with assembly plugin"

This reverts commit b29c44f.
  • Loading branch information
VaclavDedik committed Nov 18, 2016
1 parent cf36125 commit ce68de8
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 50 deletions.
3 changes: 0 additions & 3 deletions .gitignore
Expand Up @@ -19,6 +19,3 @@ README*.html

# javascript
node_modules

# hadoop samples
/hadoop-samples
47 changes: 1 addition & 46 deletions pom.xml
Expand Up @@ -59,7 +59,6 @@
<maven.compiler.source>1.8</maven.compiler.source>
<product.version>7.0.0</product.version>
<product.milestone>Final-SNAPSHOT</product.milestone>
<version.jdg.hadoop>0.2.0.Final-redhat-1</version.jdg.hadoop>
</properties>

<profiles>
Expand All @@ -70,51 +69,6 @@
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy-hadoop-samples</id>
<phase>validate</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.infinispan.hadoop</groupId>
<artifactId>infinispan-hadoop-aggregator</artifactId>
<version>${version.jdg.hadoop}</version>
<classifier>project-sources</classifier>
<type>tar.gz</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/hadoop-sources</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-hadoop-resources</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/hadoop-samples</outputDirectory>
<resources>
<resource>
<directory>${project.build.directory}/hadoop-sources/infinispan-hadoop-aggregator-${version.jdg.hadoop}/samples/</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
Expand All @@ -140,3 +94,4 @@
</profile>
</profiles>
</project>

2 changes: 1 addition & 1 deletion src/main/assemblies/sources.xml
Expand Up @@ -58,7 +58,6 @@
<include>hadoop/**</include>
<include>spark/**</include>
<include>hotrod-endpoint-js/**</include>
<include>hadoop-samples/**</include>
<include>remote-tasks-with-streams/**</include>
<include>settings.xml</include>
<include>README.md</include>
Expand All @@ -85,3 +84,4 @@
</fileSet>
</fileSets>
</assembly>

0 comments on commit ce68de8

Please sign in to comment.