aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Boudnik <cos@apache.org>2016-01-30 20:40:03 -0800
committerKonstantin Boudnik <cos@apache.org>2016-01-30 20:40:03 -0800
commit9974ff22c185668be2ed9181d660ea2db63ea787 (patch)
tree4e193f35092a76ba388a47e6eced356871cf8769
parentf90bacc52ac1a5904cc95c26563aef4cdc99707f (diff)
parent5e9cdeab060b0de8878c2c1e8b348e6d97eec259 (diff)
downloadbigtop-odpi-9974ff22c185668be2ed9181d660ea2db63ea787.tar.gz
Merge branch 'branch-1.1'
Latest commits made for release 1.1.0
-rw-r--r--CHANGES.txt1
-rw-r--r--bigtop-tests/test-artifacts/hadoop/pom.xml4
-rw-r--r--bigtop-tests/test-artifacts/spark/pom.xml14
-rw-r--r--src/site/xdoc/release-notes.xml2
4 files changed, 18 insertions, 3 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 55b3b897..c3165fb7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -217,6 +217,7 @@ Release Notes - Bigtop - Version 1.1.0
* [BIGTOP-2276] - Zeppeling added war_tempdir location, which needs to be set
* [BIGTOP-2281] - Add HIVE-12875 to Bigtop
* [BIGTOP-2288] - Hadoop time-server fails to start
+ * [BIGTOP-2299] - test resources are breaking rat
** Improvement
* [BIGTOP-1126] - Add Hama to Bigtop
diff --git a/bigtop-tests/test-artifacts/hadoop/pom.xml b/bigtop-tests/test-artifacts/hadoop/pom.xml
index 87539801..d62f8f6b 100644
--- a/bigtop-tests/test-artifacts/hadoop/pom.xml
+++ b/bigtop-tests/test-artifacts/hadoop/pom.xml
@@ -62,9 +62,7 @@
<exclude>**/clitest_data/**</exclude>
<exclude>**/ints/file*.txt</exclude>
<exclude>**/text/file*.txt</exclude>
- <exclude>**/resources/input.txt</exclude>
- <exclude>**/resources/examples/text/*.txt</exclude>
- <exclude>**/resources/part-00001.snappy</exclude>
+ <exclude>**/resources/**</exclude>
</excludes>
</configuration>
</plugin>
diff --git a/bigtop-tests/test-artifacts/spark/pom.xml b/bigtop-tests/test-artifacts/spark/pom.xml
index f96bc933..66895e5b 100644
--- a/bigtop-tests/test-artifacts/spark/pom.xml
+++ b/bigtop-tests/test-artifacts/spark/pom.xml
@@ -60,4 +60,18 @@
<artifactId>hadoop-common</artifactId>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/resources/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/src/site/xdoc/release-notes.xml b/src/site/xdoc/release-notes.xml
index be3a0bf7..fc3456b4 100644
--- a/src/site/xdoc/release-notes.xml
+++ b/src/site/xdoc/release-notes.xml
@@ -216,7 +216,9 @@
<li>[<a href='https://issues.apache.org/jira/browse/BIGTOP-2276'>BIGTOP-2276</a>] - Zeppeling added war_tempdir location, which needs to be set</li>
<li>[<a href='https://issues.apache.org/jira/browse/BIGTOP-2281'>BIGTOP-2281</a>] - Add HIVE-12875 to Bigtop</li>
<li>[<a href='https://issues.apache.org/jira/browse/BIGTOP-2288'>BIGTOP-2288</a>] - Hadoop time-server fails to start </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/BIGTOP-2299'>BIGTOP-2299</a>] - test resources are breaking rat</li>
</ul>
+
<h2>Improvement</h2>
<ul>
<li>[<a href='https://issues.apache.org/jira/browse/BIGTOP-1126'>BIGTOP-1126</a>] - Add Hama to Bigtop</li>