You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by st...@apache.org on 2020/11/13 07:15:27 UTC
[phoenix-omid] branch master updated: OMID-165 Adopt Omid packaging
to Phoenix standards
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-omid.git
The following commit(s) were added to refs/heads/master by this push:
new 80fa33c OMID-165 Adopt Omid packaging to Phoenix standards
80fa33c is described below
commit 80fa33c63f1dc5090bd8e500debd12a4fad589c1
Author: Istvan Toth <st...@apache.org>
AuthorDate: Tue Nov 3 14:48:41 2020 +0100
OMID-165 Adopt Omid packaging to Phoenix standards
update Apache parent pom to 23
do not override plugin version defined in ASF parent
remove source assembly module
update maven scm section to ASF gitbox
remove bintray references, add ASF repo instead
---
benchmarks/pom.xml | 1 -
commit-table/pom.xml | 1 -
common/pom.xml | 1 -
examples/pom.xml | 3 --
hbase-client/pom.xml | 7 ++--
hbase-coprocessor/pom.xml | 1 -
packaging/maven/assembly/src.xml | 78 ----------------------------------------
packaging/pom.xml | 54 ----------------------------
pom.xml | 73 ++++++-------------------------------
tso-server/pom.xml | 5 +--
10 files changed, 16 insertions(+), 208 deletions(-)
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index 7156fae..0e3be20 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -96,7 +96,6 @@
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven-assembly-plugin.version}</version>
<configuration>
<skipAssembly>false</skipAssembly>
<tarLongFileMode>gnu</tarLongFileMode>
diff --git a/commit-table/pom.xml b/commit-table/pom.xml
index 4baffbf..a2a2fd3 100644
--- a/commit-table/pom.xml
+++ b/commit-table/pom.xml
@@ -59,7 +59,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>${maven-jar-plugin.version}</version>
<executions>
<execution>
<goals>
diff --git a/common/pom.xml b/common/pom.xml
index e39a276..14ba329 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -116,7 +116,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
<executions>
<execution>
<id>add-source</id>
diff --git a/examples/pom.xml b/examples/pom.xml
index 03bea50..d1b1c37 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -68,7 +68,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
@@ -83,7 +82,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>${maven-jar-plugin.version}</version>
<configuration>
<excludes>
<exclude>**/log4j.properties</exclude>
@@ -94,7 +92,6 @@
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven-assembly-plugin.version}</version>
<configuration>
<skipAssembly>false</skipAssembly>
<tarLongFileMode>gnu</tarLongFileMode>
diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml
index 17d2ab9..1408ff1 100644
--- a/hbase-client/pom.xml
+++ b/hbase-client/pom.xml
@@ -58,6 +58,11 @@
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
+ <artifactId>omid-hbase-common-${hbase.artifactId.suffix}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.omid</groupId>
<artifactId>omid-tso-server-${hbase.artifactId.suffix}</artifactId>
<version>${project.version}</version>
<scope>test</scope>
@@ -169,7 +174,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>${maven-jar-plugin.version}</version>
<executions>
<execution>
<goals>
@@ -182,7 +186,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${maven-surefire-plugin.version}</version>
<configuration>
<reuseForks>true</reuseForks>
<groups>.*</groups>
diff --git a/hbase-coprocessor/pom.xml b/hbase-coprocessor/pom.xml
index ade0e93..b4c31db 100644
--- a/hbase-coprocessor/pom.xml
+++ b/hbase-coprocessor/pom.xml
@@ -151,7 +151,6 @@
<plugin>
<artifactId>maven-shade-plugin</artifactId>
- <version>${maven-shade-plugin.version}</version>
<executions>
<execution>
<phase>package</phase>
diff --git a/packaging/maven/assembly/src.xml b/packaging/maven/assembly/src.xml
deleted file mode 100644
index a9bde58..0000000
--- a/packaging/maven/assembly/src.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<!--
- 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.
--->
-
-<assembly
- xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-
- <id>src</id>
-
- <formats>
- <format>tar.gz</format>
- </formats>
-
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>apache-omid-incubating-${project.version}-src</baseDirectory>
-
- <fileSets>
- <fileSet>
- <directory>${project.parent.basedir}</directory>
- <excludes>
- <exclude>**/*.jar</exclude>
- <exclude>**/*.tar.gz</exclude>
- <exclude>**/target/**</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/.settings/**</exclude>
- </excludes>
-
- <includes>
- <include>.gitignore</include>
- <include>.travis.yml</include>
- <include>DISCLAIMER</include>
- <include>LICENSE.txt</include>
- <include>NOTICE</include>
- <include>README.md</include>
- <include>KEYS</include>
- <include>bintray-settings.xml</include>
- <include>pom.xml</include>
- <include>benchmarks/**/*</include>
- <include>codahale-metrics/**/*</include>
- <include>commit-table/**/*</include>
- <include>common/**/*</include>
- <include>examples/**/*</include>
- <include>hbase-client/**/*</include>
- <include>hbase-commit-table/**/*</include>
- <include>hbase-common/**/*</include>
- <include>hbase-coprocessor/**/*</include>
- <include>hbase-shims/**/*</include>
- <include>hbase-tools/**/*</include>
- <include>metrics/**/*</include>
- <include>misc/**/*</include>
- <include>statemachine/**/*</include>
- <include>timestamp-storage/**/*</include>
- <include>transaction-client/**/*</include>
- <include>tso-server/**/*</include>
- <include>packaging/**/*</include>
- </includes>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/packaging/pom.xml b/packaging/pom.xml
deleted file mode 100644
index 0fb893a..0000000
--- a/packaging/pom.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed 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.
--->
-<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>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid</artifactId>
- <version>1.0.2-SNAPSHOT</version>
- </parent>
-
- <artifactId>omid-packaging</artifactId>
- <version>1.0.2-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>Omid Packaging</name>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${maven-assembly-plugin.version}</version>
- <configuration>
- <tarLongFileMode>gnu</tarLongFileMode>
- <skipAssembly>false</skipAssembly>
- <finalName>apache-omid-${project.version}</finalName>
- <descriptors>
- <descriptor>maven/assembly/src.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/pom.xml b/pom.xml
index fb1a73e..38b32fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>14</version>
+ <version>23</version>
</parent>
<licenses>
@@ -118,34 +118,22 @@
<module>hbase-coprocessor</module>
<module>hbase-tools</module>
<module>examples</module>
- <module>packaging</module>
</modules>
-
+ <repositories>
+ <repository>
+ <id>apache release</id>
+ <url>https://repository.apache.org/content/repositories/releases/</url>
+ </repository>
+ </repositories>
<scm>
- <connection>scm:git:git://github.com/yahoo/omid.git</connection>
- <developerConnection>scm:git:https://${GH_TOKEN}@github.com/yahoo/omid.git</developerConnection>
- <url>https://github.com/yahoo/omid</url>
+ <connection>https://gitbox.apache.org/repos/asf/phoenix-omid.git</connection>
+ <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/phoenix-omid.git</developerConnection>
+ <url>https://gitbox.apache.org/repos/asf/phoenix-omid.git</url>
<tag>master</tag>
</scm>
- <distributionManagement>
- <repository>
- <id>bintray</id>
- <url>https://api.bintray.com/maven/yahoo/maven/omid</url>
- </repository>
-
- <site>
- <id>apache-omid-site</id>
- <!-- Wagon-git URL format:
- protocol:branch://url
- Do not forget the 2 backslashes before the url
- -->
- <url>git:asf-site://https://git-wip-us.apache.org/repos/asf/incubator-omid-site.git</url>
- </site>
- </distributionManagement>
-
<properties>
@@ -200,21 +188,9 @@
<commons-pool2.version>2.4.2</commons-pool2.version>
<!-- Maven Plugin Versioning -->
- <maven-antrun-plugin.version>1.6</maven-antrun-plugin.version>
- <maven-source-plugin.version>2.4</maven-source-plugin.version>
- <maven-clean-plugin.version>2.5</maven-clean-plugin.version>
- <maven-compiler-plugin.version>3.0</maven-compiler-plugin.version>
- <maven-assembly-plugin.version>2.4</maven-assembly-plugin.version>
- <maven-shade-plugin.version>2.3</maven-shade-plugin.version>
- <maven-release-plugin.version>2.3.2</maven-release-plugin.version>
- <maven-javadoc-plugin.version>2.10.3</maven-javadoc-plugin.version>
- <maven-jar-plugin.version>2.5</maven-jar-plugin.version>
- <maven-surefire-plugin.version>2.19</maven-surefire-plugin.version>
- <maven-surefire-report-plugin.version>2.19</maven-surefire-report-plugin.version>
<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.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>
@@ -243,14 +219,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>${maven-clean-plugin.version}</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
@@ -260,7 +229,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${maven-surefire-plugin.version}</version>
<configuration>
<forkCount>1C</forkCount>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
@@ -268,15 +236,9 @@
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>${maven-surefire-report-plugin.version}</version>
- </plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven-assembly-plugin.version}</version>
<configuration>
<skipAssembly>true</skipAssembly>
<descriptors>
@@ -288,7 +250,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>${maven-release-plugin.version}</version>
<configuration>
<scmCommentPrefix>[ci skip]</scmCommentPrefix>
<useReleaseProfile>false</useReleaseProfile>
@@ -296,16 +257,6 @@
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <version>${maven-source-plugin.version}</version>
- </plugin>
-
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${maven-javadoc-plugin.version}</version>
- </plugin>
-
<!-- ============================================================================================== -->
<!-- Code coverage plugins -->
<!-- ============================================================================================== -->
@@ -388,7 +339,6 @@
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
-
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
@@ -402,7 +352,6 @@
<artifactId>cobertura-maven-plugin</artifactId>
</plugin>
-
<!-- ============================================================================================== -->
<!-- License Management plugins -->
<!-- ============================================================================================== -->
@@ -471,7 +420,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>${maven-site-plugin.version}</version>
<configuration>
<siteDirectory>${basedir}/doc/site</siteDirectory>
<outputDirectory>${basedir}/generated-website</outputDirectory>
@@ -545,7 +493,6 @@
<exclude>**/*.properties</exclude>
<exclude>**/hbase-site.xml</exclude>
<exclude>**/test-output/**</exclude>
- <exclude>bintray-settings.xml</exclude>
<exclude>doc/site/site.xml</exclude>
<exclude>doc/images/ModuleDependencies.graffle</exclude>
<exclude>misc/findbugs-exclude.xml</exclude>
diff --git a/tso-server/pom.xml b/tso-server/pom.xml
index dcdc430..ee3448e 100644
--- a/tso-server/pom.xml
+++ b/tso-server/pom.xml
@@ -273,7 +273,6 @@
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>${maven-clean-plugin.version}</version>
<configuration>
<filesets>
<fileset>
@@ -286,7 +285,6 @@
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven-assembly-plugin.version}</version>
<configuration>
<skipAssembly>false</skipAssembly>
<tarLongFileMode>gnu</tarLongFileMode>
@@ -294,7 +292,7 @@
<descriptor>maven/assembly/bin.xml</descriptor>
</descriptors>
</configuration>
- <executions>
+ <executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
@@ -308,7 +306,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>${maven-jar-plugin.version}</version>
<executions>
<execution>
<goals>