You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by li...@apache.org on 2018/06/06 02:56:04 UTC
[1/2] trafodion git commit: TRAFODION-3076 update pom.xml.hdp
Repository: trafodion
Updated Branches:
refs/heads/master fc939b990 -> dc1a619ae
TRAFODION-3076 update pom.xml.hdp
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/2f791126
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/2f791126
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/2f791126
Branch: refs/heads/master
Commit: 2f791126896b05fde20b181366e7b6c9bca77a08
Parents: cc3faca
Author: Liu Ming <ov...@sina.com>
Authored: Sat May 19 11:36:55 2018 +0000
Committer: Liu Ming <ov...@sina.com>
Committed: Sat May 19 11:36:55 2018 +0000
----------------------------------------------------------------------
core/sqf/src/seatrans/hbase-trx/pom.xml.hdp | 1 +
core/sqf/src/seatrans/hbase-trx/pom.xml.hdp2_1 | 1 +
core/sqf/src/seatrans/hbase-trx/pom.xml.mapr | 334 --------------------
3 files changed, 2 insertions(+), 334 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/2f791126/core/sqf/src/seatrans/hbase-trx/pom.xml.hdp
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/pom.xml.hdp b/core/sqf/src/seatrans/hbase-trx/pom.xml.hdp
index 8592b58..e6a1b6c 100755
--- a/core/sqf/src/seatrans/hbase-trx/pom.xml.hdp
+++ b/core/sqf/src/seatrans/hbase-trx/pom.xml.hdp
@@ -320,6 +320,7 @@ if we can combine these profiles somehow -->
<plugin>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-maven-plugins</artifactId>
+ <version>2.7.1</version>
<executions>
<execution>
<id>compile-protoc</id>
http://git-wip-us.apache.org/repos/asf/trafodion/blob/2f791126/core/sqf/src/seatrans/hbase-trx/pom.xml.hdp2_1
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/pom.xml.hdp2_1 b/core/sqf/src/seatrans/hbase-trx/pom.xml.hdp2_1
index 8c28a82..c03d826 100755
--- a/core/sqf/src/seatrans/hbase-trx/pom.xml.hdp2_1
+++ b/core/sqf/src/seatrans/hbase-trx/pom.xml.hdp2_1
@@ -320,6 +320,7 @@ if we can combine these profiles somehow -->
<plugin>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-maven-plugins</artifactId>
+ <version>2.4.0</version>
<executions>
<execution>
<id>compile-protoc</id>
http://git-wip-us.apache.org/repos/asf/trafodion/blob/2f791126/core/sqf/src/seatrans/hbase-trx/pom.xml.mapr
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/pom.xml.mapr b/core/sqf/src/seatrans/hbase-trx/pom.xml.mapr
deleted file mode 100755
index b3ca105..0000000
--- a/core/sqf/src/seatrans/hbase-trx/pom.xml.mapr
+++ /dev/null
@@ -1,334 +0,0 @@
-<?xml version="1.0"?>
-<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/xsd/maven-4.0.0.xsd">
- <!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
- <repositories>
- <repository>
- <id>mapr release</id>
- <url>http://repository.mapr.com/maven</url>
- <snapshots><enabled>true</enabled></snapshots>
- <releases><enabled>true</enabled></releases>
- </repository>
- </repositories>
-
- <properties>
- <hadoop.version>2.5.0</hadoop.version>
- <hbase.version>0.98.7-mapr-1501-r1</hbase.version>
- <protobuf.version>2.5.0</protobuf.version>
- <protocVersion>2.5.0</protocVersion>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <java.version>1.7</java.version>
- <trx-suffix>mapr4_0</trx-suffix>
- </properties>
-
-
- <groupId>org.apache</groupId>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>hbase-trx-mapr4_0</artifactId>
- <version>${env.TRAFODION_VER}</version>
- <name>HBase - Trx</name>
- <description>Trx of HBase usage</description>
-
-
- <build>
- <defaultGoal>package</defaultGoal>
- <!-- allow for different build targets with separate classes directories and
- output jars, used for Java 6 compile for now -->
- <outputDirectory>${project.build.directory}/classes_${trx-suffix}</outputDirectory>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <!-- Some plugins (javadoc for example) can be used in the normal build- and the site phase.
- These plugins inherit their options from the <reporting> section below. These settings
- can be overwritten here. -->
- <plugins>
- <plugin>
- <!--Make it so assembly:single does nothing in here-->
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
- <configuration>
- <skipAssembly>true</skipAssembly>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <!-- Have to set the groups here because we only do
- split tests in this package, so groups on live in this module -->
- <groups>${surefire.firstPartGroups}</groups>
- </configuration>
- </plugin>
- <!-- Make a jar and put the sources in the jar -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.1.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>hbase-trx.jar.versions</manifestFile>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-
-
- <dependencies>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-common</artifactId>
- <version>${hbase.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-protocol</artifactId>
- <version>${hbase.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-client</artifactId>
- <version>${hbase.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-server</artifactId>
- <version>${hbase.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-thrift</artifactId>
- <version>${hbase.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-testing-util</artifactId>
- <scope>test</scope>
- <version>${hbase.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- <version>0.9.1</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- <version>3.4.5</version>
- </dependency>
- <dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- <version>2.5.0</version>
- </dependency>
- </dependencies>
- <profiles>
- <!-- Skip the tests in this module -->
- <profile>
- <id>skipTrxTests</id>
- <activation>
- <property>
- <name>skipTrxTests</name>
- </property>
- </activation>
- <properties>
- <surefire.skipFirstPart>true</surefire.skipFirstPart>
- <surefire.skipSecondPart>true</surefire.skipSecondPart>
- </properties>
- </profile>
-
- <!-- Profiles for building against different hadoop versions -->
- <!-- There are a lot of common dependencies used here, should investigate
-if we can combine these profiles somehow -->
- <!-- profile against Hadoop 1.1.x: This is the default. It has to have the same
- activation property as the parent Hadoop 1.1.x profile to make sure it gets run at
- the same time. -->
- <profile>
- <id>hadoop-1.1</id>
- <activation>
- <property>
- <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
- <!--h1--><name>hadoop.profile</name><value>1.1</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-test</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <!--
- profile for building against Hadoop 2.0.0-alpha. Activate using:
- mvn -Dhadoop.profile=2.0
- -->
- <profile>
- <id>hadoop-2.0</id>
- <activation>
- <property>
- <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
- <!--h2--><name>!hadoop.profile</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-core</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>create-mrapp-generated-classpath</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>build-classpath</goal>
- </goals>
- <configuration>
- <!-- needed to run the unit test for DS to generate
- the required classpath that is required in the env
- of the launch container in the mini mr/yarn cluster
- -->
- <outputFile>${project.build.directory}/test-classes/mrapp-generated-classpath</outputFile>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <!--
- profile for building against Hadoop 3.0.x. Activate using:
- mvn -Dhadoop.profile=3.0
- -->
- <profile>
- <id>hadoop-3.0</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>3.0</value>
- </property>
- </activation>
- <properties>
- <hadoop.version>3.0-SNAPSHOT</hadoop.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-minicluster</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>create-mrapp-generated-classpath</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>build-classpath</goal>
- </goals>
- <configuration>
- <!-- needed to run the unit test for DS to generate
- the required classpath that is required in the env
- of the launch container in the mini mr/yarn cluster
- -->
- <outputFile>${project.build.directory}/test-classes/mrapp-generated-classpath</outputFile>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>compile-protobuf</id>
- <activation>
- <property>
- <name>compile-protobuf</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-maven-plugins</artifactId>
- <executions>
- <execution>
- <id>compile-protoc</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>protoc</goal>
- </goals>
- <configuration>
- <protobuf.version>2.5.0</protobuf.version>
- <protocVersion>2.5.0</protocVersion>
- <imports>
- <param>${basedir}/src/main/protobuf</param>
- <param>${basedir}/hbase-protocol/src/main/protobuf</param>
- </imports>
- <source>
- <directory>${basedir}/src/main/protobuf</directory>
- <includes>
- <include>TrxRegion.proto</include>
- <include>SsccRegion.proto</include>
- </includes>
- </source>
- <output>${basedir}/src/main/java/</output>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
[2/2] trafodion git commit: merge TRAFODION-3076 update pom.xml.hdp
Posted by li...@apache.org.
merge TRAFODION-3076 update pom.xml.hdp
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/dc1a619a
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/dc1a619a
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/dc1a619a
Branch: refs/heads/master
Commit: dc1a619aeb70cf3a63b9c4564d33893699e01085
Parents: fc939b9 2f79112
Author: Liu Ming <ov...@sina.com>
Authored: Tue Jun 5 21:42:09 2018 +0000
Committer: Liu Ming <ov...@sina.com>
Committed: Tue Jun 5 21:42:09 2018 +0000
----------------------------------------------------------------------
core/sqf/src/seatrans/hbase-trx/pom.xml.hdp | 1 +
core/sqf/src/seatrans/hbase-trx/pom.xml.hdp2_1 | 1 +
core/sqf/src/seatrans/hbase-trx/pom.xml.mapr | 334 --------------------
3 files changed, 2 insertions(+), 334 deletions(-)
----------------------------------------------------------------------