Merge pull request #1 from apache/dev

merge
apache · Aug 13, 2019 · 464cc92 · 464cc92
2 parents a3f5737 + 9d0af95
commit 464cc92
Show file tree

Hide file tree

Showing 297 changed files with 8,762 additions and 2,969 deletions.
diff --git a/.mvn/jvm.config b/.mvn/jvm.config
@@ -0,0 +1 @@
+-Xmx1024m -XX:MaxPermSize=256m
diff --git a/.travis.yml b/.travis.yml
@@ -12,6 +12,6 @@ jdk:
 before_script:
   - echo "MAVEN_OPTS='-Xmx1024m -XX:MaxPermSize=256m'" > ~/.mavenrc
 script:
-  - mvn clean install cobertura:cobertura coveralls:report -DrepoToken="${COVERALLS_REPO_TOKEN}" -Dmaven.javadoc.skip=true
+  - mvn clean install cobertura:cobertura coveralls:report -DrepoToken=${COVERALLS_REPO_TOKEN} -Dmaven.javadoc.skip=true
 
 install: travis_wait 30 mvn install --quiet
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -2,7 +2,8 @@
 
 ### API Changes
 
-1. Optimize and delete API and configuration item of sharding logicIndex.
+1. Optimize and delete API and configuration item of sharding logic index.
+1. Update the API of encryption to support the encrypted and plain data coexistence.
 
 ### New Features
 

diff --git a/RELEASE-NOTES_ZH.md b/RELEASE-NOTES_ZH.md
diff --git a/jenkinsfile b/jenkinsfile
@@ -39,16 +39,16 @@ pipeline {
         }
         stage('Build & Test') {
             tools {
-                maven 'maven-3.2.1'
+                // use at least Apache Maven 3.3.1 to have .mvn/jvm.config support
+                maven 'Maven 3.6.0'
                 jdk 'JDK 1.8 (latest)'
             }
             steps {
                 script {
                     ssBuildBadge.setStatus('running')
                     try {
                         sh '''
-                        echo "MAVEN_OPTS='-Xmx1024m -XX:MaxPermSize=256m'" > ~/.mavenrc
-                        mvn clean install cobertura:cobertura coveralls:report -DrepoToken=${COVERALLS_REPO_TOKEN} -Prelease
+                        mvn clean verify cobertura:cobertura coveralls:report -DrepoToken=${COVERALLS_REPO_TOKEN} -Prelease
                         '''
                         ssBuildBadge.setStatus('passing')
                     } catch (Exception err) {

diff --git a/pom.xml b/pom.xml
@@ -746,6 +746,7 @@
                         <exclude>**/.git/**</exclude>
                         <!-- CI files -->
                         <exclude>**/.travis.yml</exclude>
+                        <exclude>**/.mvn/jvm.config</exclude>
                         <!-- GitHub files -->
                         <exclude>**/.github/**</exclude>
                         <!-- document files -->

diff --git a/...core/sharding-core-common/src/main/java/org/apache/shardingsphere/core/rule/BaseRule.java b/...core/sharding-core-common/src/main/java/org/apache/shardingsphere/core/rule/BaseRule.java
@@ -17,11 +17,20 @@
 
 package org.apache.shardingsphere.core.rule;
 
+import org.apache.shardingsphere.api.config.RuleConfiguration;
+
 /**
  * Base rule.
  *
  * @author zhangliang
  * @author panjuan
  */
 public interface BaseRule {
+
+    /**
+     * Get rule configuration.
+     * 
+     * @return rule configuration
+     */
+    RuleConfiguration getRuleConfiguration();
 }