Skip to content

F
flink

doujutun3207 / flink
与 Fork 源项目一致

从无法访问的项目Fork

通知 24
Star 0
Fork 0
F
flink

体验新版 GitCode，发现更多精彩内容 >>

提交 3dcf89e6 编写于 作者: A andrehacker
浏览文件
操作

Merge pull request #1 from aalexandrov/hadoop-maven-profiles 

Fix from Alexander, so that pact-hbase is only included if yarn is used (because it is not compatible with hadoop v1)
上级 c3d9b777 b96d4107
隐藏空白更改
内联 并排
Showing with 143 addition and 77 deletion
nephele/nephele-hdfs/pom.xml
浏览文件 @ 3dcf89e6
......@@ -56,5 +56,4 @@
</profile>
</profiles>
</project>
pact/pact-compiler/pom.xml
浏览文件 @ 3dcf89e6
......@@ -16,21 +16,18 @@
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>pact-common</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>pact-runtime</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
<reporting>
......
pact/pact-examples/pom.xml
浏览文件 @ 3dcf89e6
......@@ -21,14 +21,6 @@
<groupId>eu.stratosphere</groupId>
<artifactId>pact-common</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>pact-hbase</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
......@@ -47,31 +39,6 @@
<version>2.4</version>
<executions>
<!-- HBaseExample
<execution>
<id>HBaseExample</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<classifier>HBaseExample</classifier>
<archive>
<manifestEntries>
<Pact-Assembler-Class>eu.stratosphere.pact.example.hbase.HBaseReadExample</Pact-Assembler-Class>
</manifestEntries>
</archive>
<includes>
<include>**/hbase/*.class</include>
<include>**/util/ConfigUtils.class</include>
</includes>
</configuration>
</execution>
-->
<!-- Connected Components -->
<execution>
<id>ConnectedComponents</id>
......@@ -365,4 +332,85 @@
</plugins>
</build>
<!-- See main pom.xml for explanation of profiles -->
<profiles>
<profile>
<id>hadoop_yarn</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<dependencies>
<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>pact-hbase</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<executions>
<!-- HBaseExample -->
<execution>
<id>HBaseExample</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<classifier>HBaseExample</classifier>
<archive>
<manifestEntries>
<Pact-Assembler-Class>eu.stratosphere.pact.example.hbase.HBaseReadExample</Pact-Assembler-Class>
</manifestEntries>
</archive>
<includes>
<include>**/hbase/*.class</include>
<include>**/util/ConfigUtils.class</include>
</includes>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>hadoop_v1</id>
<dependencies>
<!-- No extra dependencies: pact-hbase is currently not compatible with Hadoop v1 -->
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<id>default-compile</id>
<phase>compile</phase>
<configuration>
<excludes>
<exclude>**/hbase/*.java</exclude>
</excludes>
</configuration>
<goals>
<goal>compile</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
pact/pact-hbase/pom.xml
浏览文件 @ 3dcf89e6
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>pact</artifactId>
<groupId>eu.stratosphere</groupId>
<version>0.2-ozone</version>
</parent>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>pact</artifactId>
<groupId>eu.stratosphere</groupId>
<version>0.2-ozone</version>
</parent>
<artifactId>pact-hbase</artifactId>
<name>pact-hbase</name>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>pact-common</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase</artifactId>
<version>0.94.2-cdh4.2.1</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<version>${hadoop.version}</version>
</dependency>
</dependencies>
</dependencies>
<!--
hadoop-clients is available for yarn and non-yarn, so there is no need to use profiles
<!--
hadoop-client is available for yarn and non-yarn, so there is no need to use profiles
See ticket https://issues.apache.org/jira/browse/HADOOP-8009 for description of hadoop-clients
-->
-->
<reporting>
<plugins>
......
pact/pact-runtime/pom.xml
浏览文件 @ 3dcf89e6
......@@ -16,25 +16,21 @@
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>pact-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>nephele-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>pact-array-datamodel</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<!-- See main pom.xml for explanation of profiles -->
......@@ -71,7 +67,6 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
......
pact/pom.xml
浏览文件 @ 3dcf89e6
......@@ -63,25 +63,6 @@
</plugins>
</build>
<profiles>
<profile>
<id>hadoop_yarn</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>pact-hbase</module>
</modules>
</profile>
<profile>
<id>hadoop_v1</id>
<modules>
<!-- No extra modules: pact-hbase is currently not compatible with Hadoop v1 -->
</modules>
</profile>
</profiles>
<modules>
<module>pact-common</module>
......@@ -93,4 +74,23 @@
<module>pact-tests</module>
<module>pact-array-datamodel</module>
</modules>
<profiles>
<profile>
<id>hadoop_yarn</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>pact-hbase</module>
</modules>
</profile>
<profile>
<id>hadoop_v1</id>
<modules>
<!-- No extra modules: pact-hbase is currently not compatible with Hadoop v1 -->
</modules>
</profile>
</profiles>
</project>
stratosphere-dist/pom.xml
浏览文件 @ 3dcf89e6
......@@ -91,13 +91,32 @@
<artifactId>pact-runtime</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>pact-hbase</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<!-- See main pom.xml for explanation of profiles -->
<profiles>
<profile>
<id>hadoop_yarn</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<dependencies>
<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>pact-hbase</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>
<profile>
<id>hadoop_v1</id>
<dependencies>
<!-- No extra dependencies: pact-hbase is currently not compatible with Hadoop v1 -->
</dependencies>
</profile>
</profiles>
<build>
<plugins>
<plugin>
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或