Skip to content

Commit 4672830

Browse files
authored
Merge pull request #165 from jerryjch/clean-up-hadoop1
Issue 162: Clean up Hadoop1 from doc and other places
2 parents 871d99b + ce5407a commit 4672830

2 files changed

Lines changed: 4 additions & 65 deletions

File tree

docs/intro.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,11 +150,11 @@ JanusGraph requires Java 8 (Standard Edition). Oracle Java 8 is recommended. J
150150

151151
[source, gremlin]
152152
----
153-
$ unzip janusgraph-$MAVEN{project.version}-hadoop1.zip
154-
Archive: janusgraph-$MAVEN{project.version}-hadoop1.zip
155-
creating: janusgraph-$MAVEN{project.version}-hadoop1/
153+
$ unzip janusgraph-$MAVEN{project.version}-hadoop2.zip
154+
Archive: janusgraph-$MAVEN{project.version}-hadoop2.zip
155+
creating: janusgraph-$MAVEN{project.version}-hadoop2/
156156
...
157-
$ cd janusgraph-$MAVEN{project.version}-hadoop1
157+
$ cd janusgraph-$MAVEN{project.version}-hadoop2
158158
$ bin/gremlin.sh
159159

160160
\,,,/

janusgraph-hbase-parent/janusgraph-hbase-098/pom.xml

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -134,67 +134,6 @@
134134
</build>
135135

136136
<profiles>
137-
<profile>
138-
<id>hadoop1</id>
139-
140-
<activation>
141-
<property>
142-
<name>hadoop.profile</name>
143-
<value>1.0</value>
144-
</property>
145-
</activation>
146-
147-
<properties>
148-
<hbase.version>${hbase098.core.version}-hadoop1</hbase.version>
149-
</properties>
150-
151-
<build>
152-
<plugins>
153-
<plugin>
154-
<artifactId>maven-surefire-plugin</artifactId>
155-
<configuration>
156-
<additionalClasspathElements>
157-
<additionalClasspathElement>${project.basedir}/conf</additionalClasspathElement>
158-
</additionalClasspathElements>
159-
</configuration>
160-
</plugin>
161-
</plugins>
162-
</build>
163-
164-
<dependencyManagement>
165-
<dependencies>
166-
<dependency>
167-
<groupId>org.apache.hadoop</groupId>
168-
<artifactId>hadoop-core</artifactId>
169-
<version>${hadoop.version}</version>
170-
</dependency>
171-
<dependency>
172-
<groupId>org.apache.hadoop</groupId>
173-
<artifactId>hadoop-client</artifactId>
174-
<version>${hadoop.version}</version>
175-
</dependency>
176-
</dependencies>
177-
</dependencyManagement>
178-
179-
<dependencies>
180-
<dependency>
181-
<groupId>org.apache.hadoop</groupId>
182-
<artifactId>hadoop-core</artifactId>
183-
</dependency>
184-
<dependency>
185-
<groupId>org.apache.hadoop</groupId>
186-
<artifactId>hadoop-client</artifactId>
187-
</dependency>
188-
<!-- HBase fails to start during testing with a
189-
Netty ClassNotFoundException unless this
190-
dependency is declared -->
191-
<dependency>
192-
<groupId>io.netty</groupId>
193-
<artifactId>netty</artifactId>
194-
</dependency>
195-
</dependencies>
196-
</profile>
197-
198137
<profile>
199138
<id>hadoop2</id>
200139

0 commit comments

Comments
 (0)