You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by dz...@apache.org on 2022/07/08 07:33:51 UTC

[drill] branch 1.20 updated (fb66c36668 -> da7f2da01c)

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

dzamo pushed a change to branch 1.20
in repository https://gitbox.apache.org/repos/asf/drill.git


 discard fb66c36668 DRILL-8227: JConnect and jTDS JDBC drivers do not implement Connection::getSchema
 discard a5b66802f5 add log4j version in root pom
     new 2ddab8555e [MINOR UPDATE] Add log4j version property to pom.xml and update Release.md.
     new da7f2da01c DRILL-8227: JConnect and jTDS JDBC drivers do not implement Connection::getSchema

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   (fb66c36668)
            \
             N -- N -- N   refs/heads/1.20 (da7f2da01c)

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 2 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:
 docs/dev/Release.md | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)


[drill] 01/02: [MINOR UPDATE] Add log4j version property to pom.xml and update Release.md.

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

dzamo pushed a commit to branch 1.20
in repository https://gitbox.apache.org/repos/asf/drill.git

commit 2ddab8555e893cc89a06e3a30dda8a670d614105
Author: kingswanwho <ji...@u.northwestern.edu>
AuthorDate: Tue Jul 5 12:55:20 2022 +0800

    [MINOR UPDATE] Add log4j version property to pom.xml and update Release.md.
    
    The log4j version was converted to a Maven property in DRILL-8225 (Update
    LogParser and Yauaa to support User-Agent Client Hints) which is not marked
    for backporting.
---
 docs/dev/Release.md | 15 ++++-----------
 pom.xml             |  1 +
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/docs/dev/Release.md b/docs/dev/Release.md
index 4c6da335ab..3bfb4d9230 100644
--- a/docs/dev/Release.md
+++ b/docs/dev/Release.md
@@ -27,9 +27,7 @@
 
         Example:
         ```
-        Note for the committers:
-        until the release is not over and Drill version is not changed to 1.17.0-SNAPSHOT, please do not push any
-        changes into Drill master.
+        Note for committers: until the release is over and Drill version is changed to 1.17.0-SNAPSHOT, please do not push any changes into Drill master.
         ```
 2. ## Setup environment:
     1. ### SVN
@@ -202,14 +200,9 @@
     The release script will push the maven artifacts to the Maven staging repo.
 
 5. ## Multiple builds
-    Currently, releasing multiple builds is done by performing consecutive releases.  E.g. to add
-    an Hadoop 2 build of Drill,  loop back to the top of the instructions now and start again with
-    a build profile of 'hadoop-2' and a release version of '1.17.0-hadoop2'.  Note that it is not
-    necessary to close the jar release in the Maven repo first since the artifacts from your next
-    release will cause no identifier collisions due to their different version suffix.  This means
-    that a single Maven repo can hold the artifacts for both 1.17.0 and 1.17.0-hadoop2.
-
-5. ## Publish release candidate and vote
+    For each additional build of Drill beyond the default, e.g. an Hadoop 2 build, create only the signed archives of the source and binaries and upload these to the Apache distribution network using svn. Do not run the full release process again using the Maven release plugin since that will result in the unwanted creation of a new Drill version number. This has the consequence that for additional builds we do not publish code artifacts to the Apache Maven repo. Users of these builds wh [...]
+
+6. ## Publish release candidate and vote
     1. Go to the [Apache Maven staging repo](https://repository.apache.org/) and close the new jar release.
         This step is done in the Maven GUI. For detailed instructions on sonatype GUI please refer to
         https://central.sonatype.org/pages/releasing-the-deployment.html#locate-and-examine-your-staging-repository.
diff --git a/pom.xml b/pom.xml
index 6d3d1f4cc1..27385ae964 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,6 +140,7 @@
     <univocity-parsers.version>2.8.3</univocity-parsers.version>
     <mongo.version>4.3.3</mongo.version>
     <junit.args />
+    <log4j.version>2.17.2</log4j.version>
   </properties>
 
   <scm>


[drill] 02/02: DRILL-8227: JConnect and jTDS JDBC drivers do not implement Connection::getSchema

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

dzamo pushed a commit to branch 1.20
in repository https://gitbox.apache.org/repos/asf/drill.git

commit da7f2da01cd7174ba93fa01c60dda9d5f090f059
Author: kingswanwho <ji...@u.northwestern.edu>
AuthorDate: Tue Jul 5 17:06:03 2022 +0800

    DRILL-8227: JConnect and jTDS JDBC drivers do not implement Connection::getSchema
    
    Fix build errors in the original backport attempt (aa5341df6).
---
 .../java/org/apache/drill/exec/store/jdbc/TestJdbcPluginWithMSSQL.java  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/contrib/storage-jdbc/src/test/java/org/apache/drill/exec/store/jdbc/TestJdbcPluginWithMSSQL.java b/contrib/storage-jdbc/src/test/java/org/apache/drill/exec/store/jdbc/TestJdbcPluginWithMSSQL.java
index a1299f67a0..f451d51c22 100644
--- a/contrib/storage-jdbc/src/test/java/org/apache/drill/exec/store/jdbc/TestJdbcPluginWithMSSQL.java
+++ b/contrib/storage-jdbc/src/test/java/org/apache/drill/exec/store/jdbc/TestJdbcPluginWithMSSQL.java
@@ -19,7 +19,6 @@ package org.apache.drill.exec.store.jdbc;
 
 import org.apache.drill.categories.JdbcStorageTest;
 import org.apache.drill.common.logical.security.PlainCredentialsProvider;
-import org.apache.drill.common.logical.StoragePluginConfig.AuthMode;
 import org.apache.drill.common.types.TypeProtos.MinorType;
 import org.apache.drill.exec.physical.rowSet.DirectRowSet;
 import org.apache.drill.exec.physical.rowSet.RowSet;
@@ -85,7 +84,6 @@ public class TestJdbcPluginWithMSSQL extends ClusterTest {
       false,
       sourceParms,
       credentialsProvider,
-      AuthMode.SHARED_USER.name(),
       100000
     );
     jdbcStorageConfig.setEnabled(true);