You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@omid.apache.org by yo...@apache.org on 2018/12/03 13:46:04 UTC

[09/50] [abbrv] incubator-omid git commit: OMID-109 Fix phoenix jenkins build error when checking out wagon repository.

OMID-109 Fix phoenix jenkins build error when checking out wagon repository.


Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/ded03007
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/ded03007
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/ded03007

Branch: refs/heads/master
Commit: ded03007bdc56ffa03cfbeb70dc4b754fd101626
Parents: 108198e
Author: Yonatan Gottesman <yo...@gmail.com>
Authored: Wed Sep 26 10:09:45 2018 +0300
Committer: Yonatan Gottesman <yo...@gmail.com>
Committed: Tue Nov 13 10:07:53 2018 +0200

----------------------------------------------------------------------
 hbase-common/pom.xml |  3 +++
 pom.xml              | 40 +++++++++++++++++++++++++++-------------
 2 files changed, 30 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/ded03007/hbase-common/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml
index 32f5fbe..515c0f6 100644
--- a/hbase-common/pom.xml
+++ b/hbase-common/pom.xml
@@ -95,6 +95,9 @@
 
         <profile>
             <id>hbase-1</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <dependencies>
                 <dependency>
                     <groupId>org.apache.omid</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/ded03007/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 51471f9..91caefa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,14 +107,7 @@
         <module>packaging</module>
     </modules>
 
-    <pluginRepositories>
 
-        <pluginRepository>
-            <id>synergian-repo</id>
-            <url>https://raw.githubusercontent.com/synergian/wagon-git/releases</url>
-        </pluginRepository>
-
-    </pluginRepositories>
 
     <scm>
         <connection>scm:git:git://github.com/yahoo/omid.git</connection>
@@ -189,7 +182,7 @@
         <maven-coveralls-plugin.version>4.1.0</maven-coveralls-plugin.version>
         <maven-cobertura-plugin.version>2.7</maven-cobertura-plugin.version>
         <maven-license-plugin.version>2.11</maven-license-plugin.version>
-        <maven-site-plugin.version>3.5</maven-site-plugin.version>
+        <maven-site-plugin.version>3.7.1</maven-site-plugin.version>
         <maven-pmd-plugin.version>3.4</maven-pmd-plugin.version>
         <maven-checkstyle-plugin.version>2.17</maven-checkstyle-plugin.version>
         <maven-jxr-plugin.version>2.3</maven-jxr-plugin.version>
@@ -198,6 +191,11 @@
         <!-- Licensing properties (for license-maven-plugins) -->
         <license.header>misc/header.txt</license.header>
 
+        <!-- Harmless extension default-->
+        <harmless.groupId>org.apache.hbase</harmless.groupId>
+        <harmless.artifactId>hbase-client</harmless.artifactId>
+        <harmless.version>${hbase.version}</harmless.version>
+
     </properties>
 
     <build>
@@ -483,13 +481,11 @@
         </plugins>
 
         <extensions>
-
             <extension>
-                <groupId>ar.com.synergian</groupId>
-                <artifactId>wagon-git</artifactId>
-                <version>0.2.5</version>
+                <groupId>${harmless.groupId}</groupId>
+                <artifactId>${harmless.artifactId}</artifactId>
+                <version>${harmless.version}</version>
             </extension>
-
         </extensions>
 
     </build>
@@ -498,6 +494,24 @@
     <profiles>
 
         <profile>
+            <id>site-deploy</id>
+            <pluginRepositories>
+
+                <pluginRepository>
+                    <id>synergian-repo</id>
+                    <url>https://raw.githubusercontent.com/synergian/wagon-git/releases</url>
+                </pluginRepository>
+
+            </pluginRepositories>
+            <properties>
+                <harmless.groupId>ar.com.synergian</harmless.groupId>
+                <harmless.artifactId>wagon-git</harmless.artifactId>
+                <harmless.version>0.2.5</harmless.version>
+            </properties>
+        </profile>
+
+
+        <profile>
 
             <id>release_profile</id>