0004279: Remove JAR files that are not used as often to download

separately

symmetric-assemble/asciidoc.gradle

@@ -86,11 +86,7 @@ task generateAppendixes {
 }
 
 ext.getDocDir = {
-    if (project.properties.containsKey('pro')) {
-        return file("$buildDir/../../../symmetric-pro/symmetric-pro/src/main/resources/VAADIN/doc")
-    } else {
-        return file("$buildDir/doc")
-    }
+    return file("$buildDir/doc")
 }
 
 task cleanDocs {

symmetric-assemble/common.gradle

@@ -226,8 +226,7 @@ subprojects { subproject ->
         commonsFileuploadVersion = '1.4'
         commonsIoVersion = '2.6'
         commonsLangVersion = '2.6'
-        commonsNetVersion = '3.6'
-        commonsCodecVersion = '1.12'
+        commonsCodecVersion = '1.14'
         commonsCollectionVersion = '3.2.2'
         hamcrestVersion = '1.3'
         h2Version = '1.3.176'
@@ -242,7 +241,7 @@ subprojects { subproject ->
         jdomVersion = '2.0.5'
         junitVersion = '4.11'
         log4jVersion = '1.2.17'
-        slf4jVersion = '1.7.26'
+        slf4jVersion = '1.7.29'
         mockitoVersion = '2.27.0'
         powerMockVersion = '2.0.2'
         mysqlVersion = '5.1.45'
@@ -267,84 +266,68 @@ subprojects { subproject ->
         compile "org.slf4j:slf4j-log4j12:$slf4jVersion"
         compile "log4j:log4j:$log4jVersion"
 
-        provided "org.apache.derby:derby:$derbyVersion"
-        provided "org.apache.derby:derbytools:$derbyVersion"
         provided "mysql:mysql-connector-java:$mysqlVersion"
-        provided ("org.mariadb.jdbc:mariadb-java-client:$mariaDbVersion") { exclude group: 'net.java.dev.jna' }
         provided "org.postgresql:postgresql:$postgresqlVersion"
         provided "jdbc:ojdbc8:18.3.0.0"
         provided "net.sourceforge.jtds:jtds:$jtdsVersion"
-        provided "org.voltdb:voltdbclient:$voltDbVersion"
-        provided "org.hsqldb:hsqldb:$hsqldbVersion"
         provided "com.h2database:h2:$h2Version"
-        provided "org.xerial:sqlite-jdbc:$sqliteVersion"
-        provided ("org.firebirdsql.jdbc:jaybird:$firebirdVersion") { 
-            exclude group: 'geronimo-spec'
-            exclude group: 'log4j'
-            exclude group: 'junit'
-            exclude group: 'xalan'
-        }
-        provided "xalan:xalan:2.7.1" // Required by  org.firebirdsql.jdbc:jaybird, but a user's security requirement was for a newer version of xalan.
-        provided ("net.sf.jt400:jt400:$jt400Version")
-        provided "jdbc.nuodb:nuodb-jdbc:$nuodbVersion"
-        provided "jdbc.tibero:tibero:$tiberoVersion"
-        provided "com.sap.cloud.db.jdbc:ngdbc:$hanaVersion"
 
-        // javax.resource needed by jaybird
-        provided "org.apache.geronimo.specs:geronimo-j2ee-connector_1.6_spec:1.0"
-        provided ("com.datastax.cassandra:cassandra-driver-core:3.1.4") {
+        compileOnly "org.apache.derby:derby:$derbyVersion"
+        compileOnly "org.hsqldb:hsqldb:$hsqldbVersion"
+        compileOnly "org.xerial:sqlite-jdbc:$sqliteVersion"
+        compileOnly "jdbc.sybase:jconnect:7.7"
+
+        compileOnly ("com.datastax.cassandra:cassandra-driver-core:3.1.4") {
             exclude group: 'org.slf4j'
             exclude group: 'com.google.guava'
         }
-        provided ("nl.cad:tps-parse:1.0.15-SNAPSHOT") {
+        compileOnly ("nl.cad:tps-parse:1.0.15-SNAPSHOT") {
         	exclude group: 'commons-lang', module: 'commons-lang'
         }
-        provided ("org.apache.kafka:kafka-clients:1.1.0") {
+        compileOnly ("org.apache.kafka:kafka-clients:1.1.0") {
             exclude group: 'org.slf4j'
         }
-        provided ("org.apache.avro:avro:1.8.2") {
+        compileOnly ("org.apache.avro:avro:1.8.2") {
             exclude group: 'org.slf4j'
         }
-		provided ("io.confluent:kafka-avro-serializer:3.2.1") {
+		compileOnly ("io.confluent:kafka-avro-serializer:3.2.1") {
 			exclude group: 'com.fasterxml.jackson.core'
             exclude group: 'org.slf4j'
         }        
 
-        provided "org.mongodb:mongo-java-driver:2.12.3"
+        compileOnly "org.mongodb:mongo-java-driver:2.12.3"
 
-        provided ("com.amazon.redshift:redshift-jdbc42-no-awssdk:1.2.36.1060") {
+        compileOnly ("com.amazon.redshift:redshift-jdbc42-no-awssdk:1.2.36.1060") {
 			exclude group: 'org.apache.httpcomponents'
             exclude group: 'commons-logging'
             exclude group: 'com.fasterxml.jackson.core'
             exclude group: 'commons-codec'
         }
 
-        provided ("com.amazonaws:aws-java-sdk-s3:1.11.510") {
+        compileOnly ("com.amazonaws:aws-java-sdk-s3:1.11.510") {
 			exclude group: 'org.apache.httpcomponents'
             exclude group: 'commons-logging'
             exclude group: 'com.fasterxml.jackson.core'
             exclude group: 'commons-codec'
         }
 
-        provided ("com.microsoft.azure:azure-storage:8.1.0") {
+        compileOnly ("com.microsoft.azure:azure-storage:8.1.0") {
             exclude group: 'com.fasterxml.jackson.core'
             exclude group: 'org.slf4j'
         }
 
-        provided ("net.snowflake:snowflake-jdbc:3.6.27") {
+        compileOnly ("net.snowflake:snowflake-jdbc:3.6.27") {
             exclude group: 'com.fasterxml.jackson.core'
         }
 
-        provided 'org.apache.phoenix:phoenix:5.0.0-HBase-2.0'
+        compileOnly 'org.apache.phoenix:phoenix:5.0.0-HBase-2.0'
 
-        provided "org.apache.hbase:hbase-client:1.3.6"
+        compileOnly "org.apache.hbase:hbase-client:1.3.6"
 
-        provided ('com.google.cloud:google-cloud-bigquery:1.99.0') {
+        compileOnly ('com.google.cloud:google-cloud-bigquery:1.99.0') {
             exclude group: 'com.google.protobuf'
         }
 
-        provided 'org.apache.httpcomponents:httpclient:4.5.4' // This is required by com.amazonaws:aws-java-sdk.  It is called out here to upgrade the version because of a user's security concerns.
-
         testCompile fileTree(dir: System.getProperty("user.home") + '/.symmetricds/lib', include: '*.jar')
         testCompile "junit:junit:$junitVersion"
         testCompile "org.hamcrest:hamcrest-all:$hamcrestVersion"

symmetric-assemble/gradle.properties

@@ -1,5 +1,5 @@
 symAssembleDir=../symmetric-assemble
-version=3.11.x-SNAPSHOT
+version=3.12.x-SNAPSHOT
 scmVersion=?
 deployUser=?
 deployPassword=?

symmetric-client/build.gradle

@@ -9,7 +9,7 @@ apply from: symAssembleDir + '/common.gradle'
         compile "commons-cli:commons-cli:$commonsCliVersion"
         compile "commons-vfs:commons-vfs:1.0"
 
-        provided "org.codehaus.mojo:animal-sniffer-annotations:$animalSnifferVersion"
+        compileOnly "org.codehaus.mojo:animal-sniffer-annotations:$animalSnifferVersion"
 
         testCompile project(path: ':symmetric-util', configuration: 'testArtifacts')
         testCompile project(path: ':symmetric-io', configuration: 'testArtifacts')

symmetric-client/src/main/java/org/jumpmind/symmetric/SymmetricAdmin.java

@@ -44,9 +44,9 @@
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.h2.util.StringUtils;
 import org.jumpmind.db.model.Table;
 import org.jumpmind.properties.TypedProperties;
 import org.jumpmind.security.ISecurityService;
@@ -203,7 +203,7 @@ protected void printHelp(CommandLine line, Options options) {
     }
 
     private void printHelpLine(PrintWriter pw, String cmd) {
-        String text = StringUtils.pad("   " + cmd, 23, " ", true)
+        String text = StringUtils.rightPad("   " + cmd, 23, " ")
                 + Message.get("SymAdmin.Cmd." + cmd);
         new HelpFormatter().printWrapped(pw, 79, 25, text);
     }

symmetric-client/src/main/java/org/jumpmind/symmetric/util/AWSHelper.java

@@ -0,0 +1,47 @@
+/**
+ * Licensed to JumpMind Inc under one or more contributor
+ * license agreements.  See the NOTICE file distributed
+ * with this work for additional information regarding
+ * copyright ownership.  JumpMind Inc licenses this file
+ * to you under the GNU General Public License, version 3.0 (GPLv3)
+ * (the "License"); you may not use this file except in compliance
+ * with the License.
+ *
+ * You should have received a copy of the GNU General Public License,
+ * version 3.0 (GPLv3) along with this library; if not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * 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.
+ */
+package org.jumpmind.symmetric.util;
+
+import java.util.List;
+
+import com.amazonaws.regions.Region;
+import com.amazonaws.regions.RegionUtils;
+import com.amazonaws.regions.Regions;
+
+/**
+ * Amazon Web Services Helper
+ * 
+ * Avoid static methods so we don't load AWS classes unless that addon is installed
+ */
+public class AWSHelper {
+
+	public AWSHelper() {
+	}
+
+	public List<Region> getRegions() {
+		return RegionUtils.getRegions();
+	}
+
+	public Regions fromName(String regionName) {
+		return Regions.fromName(regionName);
+	}
+
+}

symmetric-core/src/main/java/org/jumpmind/symmetric/common/ServerConstants.java

@@ -36,9 +36,6 @@ public class ServerConstants {
     public final static String HTTPS_VERIFIED_SERVERS = "https.verified.server.names";
     public final static String HTTPS_ALLOW_SELF_SIGNED_CERTS = "https.allow.self.signed.certs";    
 
-    public final static String JMX_HTTP_ENABLE = "jmx.http.enable";
-    public final static String JMX_HTTP_PORT = "jmx.http.port";
-
     public static final String SERVER_ALLOW_DIR_LISTING = "server.allow.dir.list";
     public static final String SERVER_ALLOW_HTTP_METHODS = "server.allow.http.methods";    
     public static final String SERVER_DISALLOW_HTTP_METHODS = "server.disallow.http.methods";

symmetric-core/src/main/java/org/jumpmind/symmetric/common/SystemConstants.java

@@ -28,8 +28,6 @@
  */
 public class SystemConstants {
 
-    public final static String SYSPROP_JMX_HTTP_CONSOLE_ENABLED = "jmx.http.console.for.embedded.webserver.enabled";
-    public final static String SYSPROP_JMX_HTTP_CONSOLE_LOCALHOST_ENABLED = "jmx.http.console.localhost.only.enabled";
     public static final String SYSPROP_STANDALONE_WEB = "symmetric.standalone.web";
     public static final String SYSPROP_ENGINES_DIR = "symmetric.engines.dir";
     public static final String SYSPROP_WAIT_FOR_DATABASE = "symmetric.wait.for.database.enabled";
@@ -38,7 +36,6 @@ public class SystemConstants {
     public static final String SYSPROP_CLUSTER_SERVER_ID = "runtime.symmetric.cluster.server.id";
     public static final String SYSPROP_DEFAULT_HTTP_PORT = "symmetric.default.http.port";
     public static final String SYSPROP_DEFAULT_HTTPS_PORT = "symmetric.default.https.port";
-    public static final String SYSPROP_DEFAULT_JMX_PORT = "symmetric.default.jmx.port";
     public static final String SYSPROP_CONCURRENT_ENGINES_STARTING_COUNT = "symmetric.concurrent.engines.starting.count";
     public static final String SYSPROP_KEYSTORE_TYPE = SecurityConstants.SYSPROP_KEYSTORE_TYPE;
     public static final String SYSPROP_KEYSTORE_CERT_ALIAS = SecurityConstants.SYSPROP_KEYSTORE_CERT_ALIAS;