Skip to content
This repository was archived by the owner on May 12, 2021. It is now read-only.

Commit 77b993c

Browse files
chtyimchtyim
committed
(TWILL-270) Remove support for old Hadoop-2.0 alpha
This closes #82 from Github. Signed-off-by: Terence Yim <[email protected]>
1 parent cacfb32 commit 77b993c

22 files changed

+30
-2045
lines changed

‎.travis.yml

-2
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,11 @@ script: mvn --batch-mode test -P $PROFILE -Dsurefire.redirectTestOutputToFile=fa
3232
install: mvn --batch-mode install -P $PROFILE -DskipTests=true
3333

3434
env:
35-
- PROFILE='hadoop-2.0'
3635
- PROFILE='hadoop-2.1'
3736
- PROFILE='hadoop-2.2'
3837
- PROFILE='hadoop-2.4'
3938
- PROFILE='hadoop-2.5'
4039
- PROFILE='hadoop-2.6'
41-
- PROFILE='cdh-4.4.0'
4240
- PROFILE='mapr-hadoop-2.4'
4341
- PROFILE='hadoop-2.6,java8-test'
4442

‎pom.xml

+6-158
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,6 @@
179179
<junit.version>4.11</junit.version>
180180
<jopt-simple.version>3.2</jopt-simple.version>
181181
<commons-compress.version>1.5</commons-compress.version>
182-
<hadoop20.output.dir>target/hadoop20-classes</hadoop20.output.dir>
183182
<force.mac.tests>false</force.mac.tests>
184183
</properties>
185184

@@ -225,11 +224,13 @@
225224
<configuration>
226225
<excludePackageNames>*.internal.*:echo:*.example.*</excludePackageNames>
227226
<links>
228-
<link>http://docs.oracle.com/javase/7/docs/api/</link>
227+
<link>http://docs.oracle.com/javase/8/docs/api/</link>
229228
</links>
230229
<bottom>
231-
<![CDATA[Copyright &#169; 2013-2016 <a href="http://www.apache.org">The Apache Software Foundation</a>. All rights reserved.]]>
230+
<![CDATA[Copyright &#169; 2013-2020 <a href="http://www.apache.org">The Apache Software Foundation</a>. All rights reserved.]]>
232231
</bottom>
232+
<doclint>none</doclint>
233+
<failOnError>false</failOnError>
233234
</configuration>
234235
<executions>
235236
<execution>
@@ -375,12 +376,13 @@
375376
<plugin>
376377
<groupId>org.apache.maven.plugins</groupId>
377378
<artifactId>maven-assembly-plugin</artifactId>
378-
<version>2.4</version>
379+
<version>3.2.0</version>
379380
<configuration>
380381
<finalName>apache-twill-${project.version}</finalName>
381382
<formats>
382383
<format>tar.gz</format>
383384
</formats>
385+
<tarLongFileMode>posix</tarLongFileMode>
384386
</configuration>
385387
</plugin>
386388
<plugin>
@@ -394,76 +396,6 @@
394396
</plugins>
395397
</build>
396398
</profile>
397-
<profile>
398-
<id>hadoop-2.0</id>
399-
<properties>
400-
<hadoop.version>2.0.2-alpha</hadoop.version>
401-
</properties>
402-
<build>
403-
<plugins>
404-
<plugin>
405-
<groupId>org.codehaus.mojo</groupId>
406-
<artifactId>build-helper-maven-plugin</artifactId>
407-
<version>1.8</version>
408-
<executions>
409-
<execution>
410-
<id>add-source</id>
411-
<phase>generate-sources</phase>
412-
<goals>
413-
<goal>add-source</goal>
414-
</goals>
415-
<configuration>
416-
<sources>
417-
<source>src/main/hadoop20</source>
418-
</sources>
419-
</configuration>
420-
</execution>
421-
</executions>
422-
</plugin>
423-
</plugins>
424-
</build>
425-
</profile>
426-
<profile>
427-
<id>cdh-4.4.0</id>
428-
<properties>
429-
<hadoop.version>2.0.0-cdh4.4.0</hadoop.version>
430-
</properties>
431-
<repositories>
432-
<repository>
433-
<id>cloudera-releases</id>
434-
<url>https://repository.cloudera.com/artifactory/cloudera-repos</url>
435-
<releases>
436-
<enabled>true</enabled>
437-
</releases>
438-
<snapshots>
439-
<enabled>false</enabled>
440-
</snapshots>
441-
</repository>
442-
</repositories>
443-
<build>
444-
<plugins>
445-
<plugin>
446-
<groupId>org.codehaus.mojo</groupId>
447-
<artifactId>build-helper-maven-plugin</artifactId>
448-
<version>1.8</version>
449-
<executions>
450-
<execution>
451-
<id>add-source</id>
452-
<phase>generate-sources</phase>
453-
<goals>
454-
<goal>add-source</goal>
455-
</goals>
456-
<configuration>
457-
<sources>
458-
<source>src/main/hadoop20</source>
459-
</sources>
460-
</configuration>
461-
</execution>
462-
</executions>
463-
</plugin>
464-
</plugins>
465-
</build>
466-
</profile>
467399
<profile>
468400
<id>hadoop-2.1</id>
469401
<properties>
@@ -488,18 +420,6 @@
488420
</sources>
489421
</configuration>
490422
</execution>
491-
<execution>
492-
<id>add-source-2.0</id>
493-
<phase>prepare-package</phase>
494-
<goals>
495-
<goal>add-source</goal>
496-
</goals>
497-
<configuration>
498-
<sources>
499-
<source>src/main/hadoop20</source>
500-
</sources>
501-
</configuration>
502-
</execution>
503423
</executions>
504424
</plugin>
505425
</plugins>
@@ -530,18 +450,6 @@
530450
</sources>
531451
</configuration>
532452
</execution>
533-
<execution>
534-
<id>add-source-2.0</id>
535-
<phase>prepare-package</phase>
536-
<goals>
537-
<goal>add-source</goal>
538-
</goals>
539-
<configuration>
540-
<sources>
541-
<source>src/main/hadoop20</source>
542-
</sources>
543-
</configuration>
544-
</execution>
545453
</executions>
546454
</plugin>
547455
</plugins>
@@ -573,18 +481,6 @@
573481
</sources>
574482
</configuration>
575483
</execution>
576-
<execution>
577-
<id>add-source-2.0</id>
578-
<phase>prepare-package</phase>
579-
<goals>
580-
<goal>add-source</goal>
581-
</goals>
582-
<configuration>
583-
<sources>
584-
<source>src/main/hadoop20</source>
585-
</sources>
586-
</configuration>
587-
</execution>
588484
</executions>
589485
</plugin>
590486
</plugins>
@@ -616,18 +512,6 @@
616512
</sources>
617513
</configuration>
618514
</execution>
619-
<execution>
620-
<id>add-source-2.0</id>
621-
<phase>prepare-package</phase>
622-
<goals>
623-
<goal>add-source</goal>
624-
</goals>
625-
<configuration>
626-
<sources>
627-
<source>src/main/hadoop20</source>
628-
</sources>
629-
</configuration>
630-
</execution>
631515
</executions>
632516
</plugin>
633517
</plugins>
@@ -673,18 +557,6 @@
673557
</sources>
674558
</configuration>
675559
</execution>
676-
<execution>
677-
<id>add-source-2.0</id>
678-
<phase>prepare-package</phase>
679-
<goals>
680-
<goal>add-source</goal>
681-
</goals>
682-
<configuration>
683-
<sources>
684-
<source>src/main/hadoop20</source>
685-
</sources>
686-
</configuration>
687-
</execution>
688560
</executions>
689561
</plugin>
690562
</plugins>
@@ -716,18 +588,6 @@
716588
</sources>
717589
</configuration>
718590
</execution>
719-
<execution>
720-
<id>add-source-2.0</id>
721-
<phase>prepare-package</phase>
722-
<goals>
723-
<goal>add-source</goal>
724-
</goals>
725-
<configuration>
726-
<sources>
727-
<source>src/main/hadoop20</source>
728-
</sources>
729-
</configuration>
730-
</execution>
731591
</executions>
732592
</plugin>
733593
</plugins>
@@ -763,18 +623,6 @@
763623
</sources>
764624
</configuration>
765625
</execution>
766-
<execution>
767-
<id>add-source-2.0</id>
768-
<phase>prepare-package</phase>
769-
<goals>
770-
<goal>add-source</goal>
771-
</goals>
772-
<configuration>
773-
<sources>
774-
<source>src/main/hadoop20</source>
775-
</sources>
776-
</configuration>
777-
</execution>
778626
</executions>
779627
</plugin>
780628
</plugins>

‎twill-yarn/pom.xml

-84
Original file line numberDiff line numberDiff line change
@@ -106,90 +106,6 @@
106106
</build>
107107

108108
<profiles>
109-
<profile>
110-
<id>hadoop-2.0</id>
111-
<properties>
112-
<output.dir>${hadoop20.output.dir}</output.dir>
113-
</properties>
114-
</profile>
115-
<profile>
116-
<id>hadoop-2.1</id>
117-
<build>
118-
<resources>
119-
<resource>
120-
<directory>${hadoop20.output.dir}</directory>
121-
</resource>
122-
<resource>
123-
<directory>src/main/resources</directory>
124-
</resource>
125-
</resources>
126-
</build>
127-
</profile>
128-
<profile>
129-
<id>hadoop-2.2</id>
130-
<build>
131-
<resources>
132-
<resource>
133-
<directory>${hadoop20.output.dir}</directory>
134-
</resource>
135-
<resource>
136-
<directory>src/main/resources</directory>
137-
</resource>
138-
</resources>
139-
</build>
140-
</profile>
141-
<profile>
142-
<id>hadoop-2.3</id>
143-
<build>
144-
<resources>
145-
<resource>
146-
<directory>${hadoop20.output.dir}</directory>
147-
</resource>
148-
<resource>
149-
<directory>src/main/resources</directory>
150-
</resource>
151-
</resources>
152-
</build>
153-
</profile>
154-
<profile>
155-
<id>hadoop-2.4</id>
156-
<build>
157-
<resources>
158-
<resource>
159-
<directory>${hadoop20.output.dir}</directory>
160-
</resource>
161-
<resource>
162-
<directory>src/main/resources</directory>
163-
</resource>
164-
</resources>
165-
</build>
166-
</profile>
167-
<profile>
168-
<id>hadoop-2.5</id>
169-
<build>
170-
<resources>
171-
<resource>
172-
<directory>${hadoop20.output.dir}</directory>
173-
</resource>
174-
<resource>
175-
<directory>src/main/resources</directory>
176-
</resource>
177-
</resources>
178-
</build>
179-
</profile>
180-
<profile>
181-
<id>hadoop-2.6</id>
182-
<build>
183-
<resources>
184-
<resource>
185-
<directory>${hadoop20.output.dir}</directory>
186-
</resource>
187-
<resource>
188-
<directory>src/main/resources</directory>
189-
</resource>
190-
</resources>
191-
</build>
192-
</profile>
193109
<profile>
194110
<id>mapr-hadoop-2.4</id>
195111
<dependencies>

0 commit comments

Comments
 (0)