Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-6405 Addendum for Eclipse (Jesse Yates) 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1363201 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Zhihong Yu 2012-07-19 01:41:01 +00:00
parent 0da654d45f
commit 92ed1401b7
2 changed files with 212 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
hbase-hadoop1-compat/pom.xml
View File

@ -2,24 +2,22 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> 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
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file
* or more contributor license agreements. See the NOTICE file distributed with this work for additional information
* distributed with this work for additional information regarding copyright ownership. The ASF licenses this file
* regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
* "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
* with the License. You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and
* See the License for the specific language governing permissions and limitations under the License.
* limitations under the License. -->
*/
-->
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<artifactId>hbase</artifactId> <artifactId>hbase</artifactId>
@ -30,17 +28,15 @@
<artifactId>hbase-hadoop1-compat</artifactId> <artifactId>hbase-hadoop1-compat</artifactId>
<name>HBase - Hadoop One Compatibility</name> <name>HBase - Hadoop One Compatibility</name>
<description> <description> Interfaces to be implemented in order to smooth over hadoop version differences
Interfaces to be implemented in order to smooth
over hadoop version differences
</description> </description>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<!-- Always skip the second part executions, since we only run <!-- Always skip the second part executions, since we only run simple unit
simple unit tests in this module --> tests in this module -->
<executions> <executions>
<execution> <execution>
<id>secondPartTestsExecution</id> <id>secondPartTestsExecution</id>
@ -57,7 +53,6 @@
</plugins> </plugins>
</build> </build>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
@ -66,7 +61,7 @@
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId> <artifactId>hadoop-core</artifactId>
<version>${hadoop-one.version}</version> <version>${hadoop-one.version}</version><!--$NO-MVN-MAN-VER$-->
<optional>true</optional> <optional>true</optional>
<exclusions> <exclusions>
<exclusion> <exclusion>
@ -94,10 +89,9 @@
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-test</artifactId> <artifactId>hadoop-test</artifactId>
<version>${hadoop-one.version}</version> <version>${hadoop-one.version}</version><!--$NO-MVN-MAN-VER$-->
<optional>true</optional> <optional>true</optional>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

82
hbase-hadoop2-compat/pom.xml
View File

@ -2,24 +2,22 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> 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
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file
* or more contributor license agreements. See the NOTICE file distributed with this work for additional information
* distributed with this work for additional information regarding copyright ownership. The ASF licenses this file
* regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
* "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
* with the License. You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and
* See the License for the specific language governing permissions and limitations under the License.
* limitations under the License. -->
*/
-->
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<artifactId>hbase</artifactId> <artifactId>hbase</artifactId>
@ -39,8 +37,8 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<!-- Always skip the second part executions, since we only run <!-- Always skip the second part executions, since we only run simple unit
simple unit tests in this module --> tests in this module -->
<executions> <executions>
<execution> <execution>
<id>secondPartTestsExecution</id> <id>secondPartTestsExecution</id>
@ -55,7 +53,9 @@
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<version>2.4</version>
<executions> <executions>
<execution> <execution>
<id>create-mrapp-generated-classpath</id> <id>create-mrapp-generated-classpath</id>
@ -64,10 +64,8 @@
<goal>build-classpath</goal> <goal>build-classpath</goal>
</goals> </goals>
<configuration> <configuration>
<!-- needed to run the unit test for DS to generate <!-- needed to run the unit test for DS to generate the required classpath
the required classpath that is required in the env that is required in the env of the launch container in the mini mr/yarn cluster -->
of the launch container in the mini mr/yarn cluster
-->
<outputFile> <outputFile>
${project.build.directory}/test-classes/mrapp-generated-classpath ${project.build.directory}/test-classes/mrapp-generated-classpath
</outputFile> </outputFile>
@ -76,9 +74,39 @@
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only.
It has no influence on the Maven build itself and needs to be kept in plugin management,
not in the actual plugins. -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<versionRange>[2.4,)</versionRange>
<goals>
<goal>build-classpath</goal>
</goals>
</pluginExecutionFilter>
<action>
<execute/>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build> </build>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
@ -94,8 +122,8 @@
<artifactId>hadoop-annotations</artifactId> <artifactId>hadoop-annotations</artifactId>
<version>${hadoop-two.version}</version> <version>${hadoop-two.version}</version>
</dependency> </dependency>
<!-- This was marked as test dep in earlier pom, but was scoped compile. <!-- This was marked as test dep in earlier pom, but was scoped compile. Where
Where do we actually need it? --> do we actually need it? -->
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId> <artifactId>hadoop-minicluster</artifactId>