You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by el...@apache.org on 2019/05/24 20:30:54 UTC

[phoenix] branch master updated: PHOENIX-5297 POM cleanup and de-duplication

This is an automated email from the ASF dual-hosted git repository.

elserj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
     new fffd21a  PHOENIX-5297 POM cleanup and de-duplication
fffd21a is described below

commit fffd21aea72ec47a36adcb7d3ba778a15fd7dc10
Author: Josh Elser <el...@apache.org>
AuthorDate: Fri May 24 12:02:11 2019 -0400

    PHOENIX-5297 POM cleanup and de-duplication
    
    Signed-off-by: Geoffrey Jacoby <gj...@apache.org>
---
 phoenix-core/pom.xml  | 14 --------------
 phoenix-pherf/pom.xml |  7 -------
 pom.xml               |  8 ++++----
 3 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index aa58901..bf4b815 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -10,20 +10,6 @@
   <name>Phoenix Core</name>
   <description>Core Phoenix codebase</description>
 
-  <licenses>
-      <license>
-          <name>The Apache Software License, Version 2.0</name>
-          <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-          <distribution>repo</distribution>
-          <comments />
-      </license>
-  </licenses>
-
-  <organization>
-      <name>Apache Software Foundation</name>
-      <url>http://www.apache.org</url>
-  </organization>
-
   <properties>
     <top.dir>${project.basedir}/..</top.dir>
     <argparse4j.version>0.8.1</argparse4j.version>
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index 6456ace..b35200c 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -27,13 +27,6 @@
 		<shaded.package>org.apache.phoenix.shaded</shaded.package>
 	</properties>
 
-	<repositories>
-		<repository>
-			<id>apache release</id>
-			<url>https://repository.apache.org/content/repositories/releases/</url>
-		</repository>
-	</repositories>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.phoenix</groupId>
diff --git a/pom.xml b/pom.xml
index 937b487..dd6203b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
   <licenses>
     <license>
       <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
       <distribution>repo</distribution>
       <comments/>
     </license>
@@ -19,7 +19,7 @@
 
   <organization>
     <name>Apache Software Foundation</name>
-    <url>http://www.apache.org</url>
+    <url>https://www.apache.org</url>
   </organization>
 
   <modules>
@@ -45,7 +45,7 @@
   </parent>
 
   <scm>
-    <connection>scm:git:http://git-wip-us.apache.org/repos/asf/phoenix.git</connection>
+    <connection>scm:git:https://git-wip-us.apache.org/repos/asf/phoenix.git</connection>
     <url>https://git-wip-us.apache.org/repos/asf/phoenix.git</url>
     <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/phoenix.git</developerConnection>
   </scm>
@@ -409,7 +409,7 @@
         <configuration>
           <quiet>true</quiet>
           <links>
-            <link>http://hbase.apache.org/apidocs/</link>
+            <link>https://hbase.apache.org/apidocs/</link>
           </links>
         </configuration>
         <executions>