You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by vl...@apache.org on 2019/11/10 20:43:32 UTC

[calcite-avatica] branch master updated (74ec8da -> 1ae4cf5)

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

vladimirsitnikov pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/calcite-avatica.git.


 discard 74ec8da  Add -PskipJavadoc to skip publication of the javadocs (to speedup publishToMavenLocal)
     new 1ae4cf5  Add -PskipJavadoc to skip publication of the javadocs (to speedup publishToMavenLocal)

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (74ec8da)
            \
             N -- N -- N   refs/heads/master (1ae4cf5)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


[calcite-avatica] 01/01: Add -PskipJavadoc to skip publication of the javadocs (to speedup publishToMavenLocal)

Posted by vl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/calcite-avatica.git

commit 1ae4cf520cebaa0936fac803dc7526393ecd7a64
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Sun Nov 10 23:39:41 2019 +0300

    Add -PskipJavadoc to skip publication of the javadocs (to speedup publishToMavenLocal)
---
 .travis.yml      |  6 +++---
 build.gradle.kts | 14 ++++++++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b95392c..75d3f17 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,13 +22,13 @@ matrix:
   include:
     - install: true
       script:
-        - ./gradlew $GRADLE_ARGS build
+        - ./gradlew $GRADLE_ARGS build javadoc
     - name: Calcite/master
       install:
-        - ./gradlew publishToMavenLocal -Pcalcite.avatica.version=42.0
+        - ./gradlew publishToMavenLocal -PskipJavadoc -Pcalcite.avatica.version=42.0
       script:
         - cd ..
-        - git clone --depth 100 https://github.com/apache/calcite.git
+        - git clone --depth 1000 https://github.com/apache/calcite.git
         - cd calcite
         - mvn install -Davatica.version=42.0-SNAPSHOT
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 8d7cda8..0719b30 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -80,6 +80,10 @@ val skipCheckstyle by extra {
     boolProp("skipCheckstyle") ?: false
 }
 
+val skipJavadoc by extra {
+    boolProp("skipJavadoc") ?: false
+}
+
 // By default use Java implementation to sign artifacts
 // When useGpgCmd=true, then gpg command line tool is used for signing
 val useGpgCmd by extra {
@@ -417,10 +421,12 @@ allprojects {
                     description = project.description
                     from(components["java"])
 
-                    // Eager task creation is required due to
-                    // https://github.com/gradle/gradle/issues/6246
-                    artifact(sourcesJar.get())
-                    artifact(javadocJar.get())
+                    if (!skipJavadoc) {
+                        // Eager task creation is required due to
+                        // https://github.com/gradle/gradle/issues/6246
+                        artifact(sourcesJar.get())
+                        artifact(javadocJar.get())
+                    }
 
                     // Use the resolved versions in pom.xml
                     // Gradle might have different resolution rules, so we set the versions