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/11/13 10:16:22 UTC

[30/50] [abbrv] incubator-omid git commit: Reverting tests to get omid to build

Reverting tests to get omid to build


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

Branch: refs/heads/1.0.0
Commit: ab09536a9b17d7589e75f9f74e5a4708911f8b0c
Parents: ba3527a
Author: James Taylor <ja...@apache.org>
Authored: Sat Sep 29 09:27:18 2018 -0700
Committer: Yonatan Gottesman <yo...@gmail.com>
Committed: Tue Nov 13 10:09:33 2018 +0200

----------------------------------------------------------------------
 hbase-coprocessor/pom.xml |  23 +++++
 pom.xml                   | 211 ++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 233 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/ab09536a/hbase-coprocessor/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-coprocessor/pom.xml b/hbase-coprocessor/pom.xml
index adf9365..828f454 100644
--- a/hbase-coprocessor/pom.xml
+++ b/hbase-coprocessor/pom.xml
@@ -118,6 +118,29 @@
 
         <plugins>
 
+            <plugin>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>${maven-shade-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
+                    <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                    <artifactSet>
+                        <includes>
+                            <include>org.apache.omid:*</include>
+                        </includes>
+                    </artifactSet>
+                    <finalName>omid-hbase-coprocessor-${project.version}</finalName>
+                </configuration>
+            </plugin>
+
             <!-- Disable maven site plugin -->
             <plugin>
                 <artifactId>maven-site-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/ab09536a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3dfe59b..3c74a2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,6 +107,8 @@
         <module>packaging</module>
     </modules>
 
+
+
     <scm>
         <connection>scm:git:git://github.com/yahoo/omid.git</connection>
         <developerConnection>scm:git:https://${GH_TOKEN}@github.com/yahoo/omid.git</developerConnection>
@@ -119,6 +121,15 @@
             <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>
@@ -148,7 +159,7 @@
         <jcommander.version>1.35</jcommander.version>
         <commons.conf.version>1.10</commons.conf.version>
         <hamcrest.version>1.3</hamcrest.version>
-        <curator.version>3.3.0</curator.version>
+        <curator.version>2.6.0</curator.version>
         <zookeeper.version>3.4.9</zookeeper.version>
         <snakeyaml.version>1.11</snakeyaml.version>
         <beanutils.version>1.8.3</beanutils.version>
@@ -162,6 +173,7 @@
         <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>
@@ -171,6 +183,7 @@
         <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>
         <maven-findbugs-maven-plugin.version>3.0.1</maven-findbugs-maven-plugin.version>
@@ -259,6 +272,45 @@
                     <version>${maven-javadoc-plugin.version}</version>
                 </plugin>
 
+                <!-- ============================================================================================== -->
+                <!-- Code coverage plugins                                                                          -->
+                <!-- ============================================================================================== -->
+
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>cobertura-maven-plugin</artifactId>
+                    <version>${maven-cobertura-plugin.version}</version>
+                    <configuration>
+                        <check>
+                            <haltOnFailure>true</haltOnFailure>
+                            <branchRate>0</branchRate>
+                            <lineRate>0</lineRate>
+                            <totalBranchRate>0</totalBranchRate>
+                            <totalLineRate>0</totalLineRate>
+                            <packageLineRate>0</packageLineRate>
+                            <packageBranchRate>0</packageBranchRate>
+                        </check>
+                        <aggregate>true</aggregate>
+                        <formats>
+                            <format>xml</format>
+                            <format>html</format>
+                        </formats>
+                        <instrumentation>
+                            <excludes>
+                                <exclude>org/apache/omid/proto/*.class</exclude>
+                            </excludes>
+                        </instrumentation>
+                    </configuration>
+                </plugin>
+
+                <!-- Show Coverage reports in https://coveralls.io/ -->
+                <plugin>
+                    <groupId>org.eluder.coveralls</groupId>
+                    <artifactId>coveralls-maven-plugin</artifactId>
+                    <version>${maven-coveralls-plugin.version}</version>
+                </plugin>
+
+
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>findbugs-maven-plugin</artifactId>
@@ -301,14 +353,139 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
             </plugin>
+
+
+            <plugin>
+                <groupId>org.eluder.coveralls</groupId>
+                <artifactId>coveralls-maven-plugin</artifactId>
+                <configuration>
+                    <repoToken>${COVERALLS_TOKEN}</repoToken>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>cobertura-maven-plugin</artifactId>
+            </plugin>
+
+
+            <!-- ============================================================================================== -->
+            <!-- License Management plugins                                                                     -->
+            <!-- ============================================================================================== -->
+            <plugin>
+                <groupId>com.mycila</groupId>
+                <artifactId>license-maven-plugin</artifactId>
+                <version>${maven-license-plugin.version}</version>
+                <inherited>true</inherited> <!-- for multi-module config -->
+                <configuration>
+                    <header>${license.header}</header>
+                    <aggregate>true</aggregate> <!-- for multi-module config -->
+                    <skipExistingHeaders>false</skipExistingHeaders>
+                    <includes>
+                        <!-- Add files where to include licensing -->
+                        <include>src/**/*.java</include>
+                        <include>src/**/*.xml</include>
+                        <include>src/**/*.proto</include>
+                        <include>**/*.css</include>
+                        <include>**/*.sh</include>
+                    </includes>
+                    <excludes>
+                        <!-- Add files to exclude from licensing -->
+
+                        <!-- Exclude pom -->
+                        <exclude>**/pom.xml</exclude>
+
+                        <!-- Exclude config and scripts -->
+                        <exclude>**/dev-utils/*</exclude>
+
+                        <!-- Exclude assembly -->
+                        <exclude>**/maven/assembly/*</exclude>
+
+                        <!-- Project specific exclusions (e.g. they've been copied/modified from other open-source projects -->
+
+                        <!-- Protocol buffers generated classes -->
+                        <exclude>**/src/main/java/org/apache/omid/proto/TSOProto.java</exclude>
+
+                        <!-- Taken from https://github.com/brianfrankcooper/YCSB -->
+                        <exclude>**/src/main/java/org/apache/omid/benchmarks/utils/Generator.java</exclude>
+                        <exclude>**/src/main/java/org/apache/omid/benchmarks/utils/IntegerGenerator.java</exclude>
+                        <exclude>**/src/main/java/org/apache/omid/benchmarks/utils/ZipfianGenerator.java</exclude>
+                        <exclude>**/src/main/java/org/apache/omid/benchmarks/utils/ScrambledZipfianGenerator.java
+                        </exclude>
+
+                        <!-- Taken from https://github.com/apache/hbase -->
+                        <exclude>**/src/main/java/org/apache/omid/committable/hbase/RegionSplitter.java</exclude>
+
+                    </excludes>
+                    <!-- Add comment style for protocol buffers -->
+                    <mapping>
+                        <java>SLASHSTAR_STYLE</java>
+                        <proto>DOUBLESLASH_STYLE</proto>
+                    </mapping>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>check-license</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <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>
+                    <stagingDirectory>${basedir}/generated-website-staging</stagingDirectory>
+                </configuration>
+                <dependencies>
+                    <dependency><!-- add support for ssh/scp -->
+                        <groupId>org.apache.maven.wagon</groupId>
+                        <artifactId>wagon-ssh</artifactId>
+                        <version>1.0</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+
         </plugins>
 
+        <extensions>
+            <extension>
+                <groupId>${harmless.groupId}</groupId>
+                <artifactId>${harmless.artifactId}</artifactId>
+                <version>${harmless.version}</version>
+            </extension>
+        </extensions>
+
     </build>
 
 
     <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>
 
@@ -365,6 +542,22 @@
                     </plugin>
 
                     <plugin>
+                        <groupId>org.eluder.coveralls</groupId>
+                        <artifactId>coveralls-maven-plugin</artifactId>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>cobertura-maven-plugin</artifactId>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </plugin>
+
+                    <plugin>
                         <artifactId>maven-source-plugin</artifactId>
                         <executions>
                             <execution>
@@ -453,6 +646,13 @@
                 <artifactId>findbugs-maven-plugin</artifactId>
             </plugin>
 
+            <!-- Required for generating cross references with sources on reports: e.g. line numbers... -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jxr-plugin</artifactId>
+                <version>${maven-jxr-plugin.version}</version>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
@@ -462,6 +662,15 @@
                 </configuration>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-pmd-plugin</artifactId>
+                <version>${maven-pmd-plugin.version}</version>
+                <configuration>
+                    <aggregate>true</aggregate>
+                </configuration>
+            </plugin>
+
         </plugins>
     </reporting>