Repository: incubator-pirk Updated Branches: refs/heads/master c312d1f26 -> d9d3adf13
PIRK-10: Upgrade and Enforce Java 8 - closes apache/incubator-pirk#19 Project: http://git-wip-us.apache.org/repos/asf/incubator-pirk/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-pirk/commit/d9d3adf1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-pirk/tree/d9d3adf1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-pirk/diff/d9d3adf1 Branch: refs/heads/master Commit: d9d3adf13a570d122140b6308e60dab92b9c4f9e Parents: c312d1f Author: smarthi <[email protected]> Authored: Fri Jul 22 23:11:26 2016 -0400 Committer: eawilliams <[email protected]> Committed: Fri Jul 22 23:11:26 2016 -0400 ---------------------------------------------------------------------- .travis.yml | 16 +++++++++--- pom.xml | 75 +++++++++++++++++++++++++++++++------------------------- 2 files changed, 54 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/d9d3adf1/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 456d1cc..ebe19b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,6 @@ os: jdk: - oraclejdk8 - - oraclejdk7 - - openjdk7 # before_install is used to provide a workaround for buffer overflow issues with OpenJDK versions of java as per: # https://github.com/travis-ci/travis-ci/issues/5227#issuecomment-165135711 @@ -14,4 +12,16 @@ before_install: - sudo hostname "$(hostname | cut -c1-63)" - sed -e "s/^\\(127\\.0\\.0\\.1.*\\)/\\1 $(hostname | cut -c1-63)/" /etc/hosts | sudo tee /etc/hosts -script: mvn clean package -f pom.xml + - wget http://apache.claz.org/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz + - tar zxvf apache-maven-3.3.9-bin.tar.gz + - chmod +x apache-maven-3.3.9/bin/mvn + - export M2_HOME=$PWD/apache-maven-3.3.9 + - export PATH=$PWD/apache-maven-3.3.9/bin:${PATH} + - hash -r + +before_script: + - export M2_HOME=$PWD/apache-maven-3.3.9 + - export PATH=$PWD/apache-maven-3.3.9/bin:${PATH} + - hash -r + +install: mvn clean install http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/d9d3adf1/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d9faedb..996c629 100644 --- a/pom.xml +++ b/pom.xml @@ -20,12 +20,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - + <groupId>org.apache.pirk</groupId> <artifactId>pirk</artifactId> <version>0.0.1-SNAPSHOT</version> <packaging>jar</packaging> - + <name>Apache Pirk (incubating) Project</name> <description>Apache Pirk (incubating) is a framework for scalable Private Information Retrieval (PIR). </description> <url>http://pirk.incubator.apache.org/</url> @@ -118,19 +118,19 @@ <artifactId>hadoop-common</artifactId> <version>2.7.2</version> </dependency> - + <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-core</artifactId> <version>2.7.2</version> </dependency> - + <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> <version>2.7.2</version> - </dependency> - + </dependency> + <dependency> <groupId>org.apache.spark</groupId> <artifactId>spark-core_2.11</artifactId> @@ -249,37 +249,44 @@ </configuration> </execution> - <!-- in the version with benchmarks (pom-with-benchmarks.xml), this + <!-- in the version with benchmarks (pom-with-benchmarks.xml), this is where that <execution></execution> lives --> - </executions> - </plugin> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <version>0.11</version> - <configuration> - <excludes> - <exclude>.travis.yml</exclude> - <exclude>eclipse-pirk-codestyle.xml</exclude> - <exclude>logs/**</exclude> - <exclude>docs/package-list</exclude> - </excludes> - </configuration> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> + </executions> + </plugin> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <exclude>nb-configuration.xml</exclude> <!-- courtesy excludes for netbeans users --> + <exclude>nbactions.xml</exclude> <!-- courtesy excludes for netbeans users --> + <exclude>DEPENDENCIES + </exclude> <!-- auto generated file by apache's maven config while building sources.zip --> + <exclude>.travis.yml</exclude> <!-- Travis CI Build Descriptor File --> + <exclude>appveyor.yml</exclude> <!-- AppVeyor CI Build Descriptor File --> + </excludes> + </configuration> + <dependencies> + <!-- workaround for RAT-158 --> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> + <version>1.6</version> + <exclusions> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + </plugin> + </plugins> <pluginManagement> <plugins> - <!--This plugin's configuration is used to store Eclipse m2e settings + <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself. --> <plugin> <groupId>org.eclipse.m2e</groupId> @@ -304,7 +311,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore/> </action> </pluginExecution> <pluginExecution> @@ -323,7 +330,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore/> </action> </pluginExecution> </pluginExecutions>
