Skip to content

Commit

Permalink
Removed profile dev-install-hadoop2 that installed the distribution i…
Browse files Browse the repository at this point in the history 
…n the top-level dir

Fixes Issue JanusGraph#519

Signed-off-by: Robert Dale <robdale@gmail.com>
  • Loading branch information
@robertdale
robertdale committed Sep 18, 2017
1 parent f41b885 commit 007ac43
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 135 deletions.
9 changes: 0 additions & 9 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,8 @@ target/
.idea/
*.iml
*.DS_Store
/bin/
/_bsp/
/conf/
/data/
/db/
/ext/
/lib/
/log/
/output/
/scripts/
/elasticsearch/
/docker/*.zip
# When executing tests in alphabetical order, Maven generates temporary
# files with names like this:
Expand Down
34 changes: 0 additions & 34 deletions janusgraph-dist/janusgraph-dist-hadoop-2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,39 +171,5 @@
</build>
</profile>

<profile>
<id>dev-install-hadoop2</id>

<!-- Enable Hadoop 2 by default -->
<activation>
<property>
<name>!dev.hadoop</name>
</property>
</activation>

<build>
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<executions>
<execution>
<id>clean-dev-dirs-hadoop</id>
<phase>clean</phase>
</execution>
</executions>
</plugin>

<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>install-dev-dirs-hadoop</id>
<phase>install</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
77 changes: 0 additions & 77 deletions janusgraph-dist/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -472,83 +472,6 @@
</plugin>
</plugins>

<pluginManagement>
<plugins>
<!-- Delete bin, lib, conf, ... dirs in the root -->
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<executions>
<execution>
<id>clean-dev-dirs-hadoop</id>
<phase>none</phase>
<goals>
<goal>clean</goal>
</goals>
<configuration>
<excludeDefaultDirectories>true</excludeDefaultDirectories>
<filesets>
<fileset>
<directory>${top.level.basedir}/bin/</directory>
</fileset>
<fileset>
<directory>${top.level.basedir}/conf/</directory>
</fileset>
<fileset>
<directory>${top.level.basedir}/db/</directory>
</fileset>
<fileset>
<directory>${top.level.basedir}/examples/</directory>
</fileset>
<fileset>
<directory>${top.level.basedir}/ext/</directory>
</fileset>
<fileset>
<directory>${top.level.basedir}/lib/</directory>
</fileset>
<fileset>
<directory>${top.level.basedir}/log/</directory>
</fileset>
<fileset>
<directory>${top.level.basedir}/data/</directory>
</fileset>
<fileset>
<directory>${top.level.basedir}/elasticsearch/</directory>
</fileset>
<fileset>
<directory>${top.level.basedir}/scripts/</directory>
</fileset>
</filesets>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>install-dev-dirs-hadoop</id>
<phase>none</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<attach>false</attach>
<outputDirectory>${top.level.basedir}</outputDirectory>
<finalName>/</finalName>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>../src/assembly/descriptor/filesystem.xml</descriptor>
</descriptors>
<formats combine.self="override">
<format>dir</format>
</formats>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>

<profiles>
Expand Down
15 changes: 0 additions & 15 deletions janusgraph-dist/src/assembly/descriptor/filesystem.xml
View file

This file was deleted.

0 comments on commit 007ac43

Please sign in to comment.