Release RapidMiner 7.6.0

.gitignore

@@ -1,6 +1,7 @@
 bin/
 target/
 build/
+out/
 .gradle/
 .settings/
 *.classpath

build.gradle

@@ -1,30 +1,30 @@
 buildscript {
-	repositories {
-		jcenter()
-		maven { url 'https://maven.rapidminer.com/content/groups/public/' }
-	}
-	dependencies {
-		classpath 'com.rapidminer.gradle:java-basics:0.4.0'
-		classpath 'com.rapidminer.gradle:java-publishing:0.2.0'
-	}
+    repositories {
+        jcenter()
+        maven { url 'https://maven.rapidminer.com/content/groups/public/' }
+    }
+    dependencies {
+        classpath 'com.rapidminer.gradle:java-basics:0.4.0'
+        classpath 'com.rapidminer.gradle:java-publishing:0.2.0'
+    }
 }
 
 apply plugin: 'com.rapidminer.java-basics'
 apply plugin: 'com.rapidminer.java-publishing.agpl-v3'
 
 repositories {
-	jcenter()
-	maven { url 'https://maven.rapidminer.com/content/groups/public/' }
+    jcenter()
+    maven { url 'https://maven.rapidminer.com/content/groups/public/' }
 }
 
 dependencies {
 
-	// OS X adapter to add platform specific UI
-	compile 'com.rapidminer.studio:rapidminer-studio-osx-adapter:1.0.1'
+    // OS X adapter to add platform specific UI
+    compile 'com.rapidminer.studio:rapidminer-studio-osx-adapter:1.0.1'
 
 	// RapidMiner license framework for license management
-	compile 'com.rapidminer.license:rapidminer-license-api:3.2.0'
-	compile('com.rapidminer.license:rapidminer-license-commons:3.2.1'){
+	compile 'com.rapidminer.license:rapidminer-license-api:4.0.0'
+	compile('com.rapidminer.license:rapidminer-license-commons:4.0.0'){
 		exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
 		exclude group: 'com.fasterxml.jackson.core', module: 'jackson-databind'
 	}
@@ -76,8 +76,8 @@ dependencies {
 	// JFreeChart for chart rendering (http://www.jfree.org/jfreechart/)
 	compile 'org.jfree:jfreechart:1.0.17'
 
-	// Java Mail API for mail sending
-	compile 'javax.mail:mail:1.4.7'
+	// Java Mail Implementation for mail sending (https://javaee.github.io/javamail/)
+	compile 'com.sun.mail:javax.mail:1.6.0'
 
 	// Groovy for 'Execute Script' operator (http://groovy.codehaus.org/)
 	compile 'org.codehaus.groovy:groovy-all:2.4.10'
@@ -144,8 +144,11 @@ dependencies {
 	compile 'com.fasterxml.jackson.core:jackson-databind:2.6.6'
 }
 
-task wrapper(type: Wrapper) { gradleVersion = '2.14.1' }
+task wrapper(type: Wrapper) { gradleVersion = '4.0.1' }
 
 apply from: 'gradle/wsimport.gradle'
 apply from: 'gradle/props.gradle'
 apply from: 'gradle/tutorial.gradle'
+
+// Jacoco for code coverage information
+apply from: 'jacoco.gradle'

gradle.properties

@@ -1,2 +1,2 @@
-version=7.5.3
+version=7.6.0
 group=com.rapidminer.studio

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Jan 25 09:44:18 CET 2017
+#Tue Aug 08 11:49:22 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.1-bin.zip

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -49,7 +49,6 @@ goto fail
 @rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

jacoco.gradle

@@ -0,0 +1,27 @@
+apply plugin: 'jacoco'
+
+jacoco {
+    toolVersion ='0.7.9'
+}
+
+test {
+    jacoco {
+        // go 1 up to end up in root project dir
+        destinationFile = file("../build/jacoco.exec")
+    }
+}
+
+jacocoTestReport {
+    // Temporary work-around -- http://issues.gradle.org/browse/GRADLE-2764
+    additionalSourceDirs = files(sourceSets.main.allJava.srcDirs)
+    reports {
+        html.enabled true
+        xml.enabled true
+    }
+}
+
+// Temporary work-around -- Fixes http://issues.gradle.org/browse/GRADLE-2859 
+// Allows to run jacoco with multi project builds
+tasks.withType(Test) {
+    systemProperties['user.dir'] = workingDir
+}

src/main/java/com/rapidminer/Process.java

@@ -269,16 +269,8 @@ public Process(final File file) throws IOException, XMLException {
 	public Process(final File file, final ProgressListener progressListener) throws IOException, XMLException {
 		this.processLocation = new FileProcessLocation(file);
 		initContext();
-		Reader in = null;
-		try {
-			in = new InputStreamReader(new FileInputStream(file), "UTF-8");
+		try (FileInputStream fis = new FileInputStream(file); Reader in = new InputStreamReader(fis, "UTF-8")) {
 			readProcess(in, progressListener);
-		} catch (IOException e) {
-			throw e;
-		} finally {
-			if (in != null) {
-				in.close();
-			}
 		}
 	}
 
@@ -428,6 +420,10 @@ private void fireProcessStateChanged(int stateBefore, int newState) {
 	// Logging
 	// -------------------------
 
+	/**
+	 * @deprecated use {@link #getLogger()} instead
+	 */
+	@Deprecated
 	public LoggingHandler getLog() {
 		return this.logService;
 	}
@@ -454,7 +450,7 @@ public void clearMacros() {
 	// IOObject Storage
 	// -------------------------
 
-	/** Returns the macro handler. */
+	/** Stores the object with the given name. */
 	public void store(final String name, final IOObject object) {
 		this.storageMap.put(name, object);
 	}

src/main/java/com/rapidminer/RapidMiner.java

@@ -277,6 +277,11 @@ public boolean isLoadingManagedExtensions() {
 	public static final int PROPERTY_RAPIDMINER_TOOLS_MAIL_METHOD_SENDMAIL = 0;
 	public static final int PROPERTY_RAPIDMINER_TOOLS_MAIL_METHOD_SMTP = 1;
 
+	/**
+	 * Specifies the sender mail address
+	 */
+	public static final String PROPERTY_RAPIDMINER_TOOLS_MAIL_SENDER = "rapidminer.tools.mail.sender";
+
 	/**
 	 * Property specifying the email address to which mails are sent if no email address is
 	 * specified in the {@link ProcessRootOperator}.
@@ -315,6 +320,36 @@ public boolean isLoadingManagedExtensions() {
 	 */
 	public static final String PROPERTY_RAPIDMINER_TOOLS_SMTP_PASSWD = "rapidminer.tools.smtp.passwd";
 
+	/**
+	 * The property specifying the security for smtp.
+	 */
+	public static final String PROPERTY_RAPIDMINER_TOOLS_SMTP_SECURITY = "rapidminer.tools.smtp.security";
+
+	public static final String PROPERTY_RAPIDMINER_TOOLS_SMTP_SECURITY_NONE = "None";
+	public static final String PROPERTY_RAPIDMINER_TOOLS_SMTP_SECURITY_STARTTLS = "StartTLS";
+	public static final String PROPERTY_RAPIDMINER_TOOLS_SMTP_SECURITY_STARTTLS_ENFORCE = "Enforce StartTLS";
+	public static final String PROPERTY_RAPIDMINER_TOOLS_SMTP_SECURITY_STARTTLS_ENFORCE_PFS = "Enforce StartTLS - TLS 1.2 + PFS";
+	public static final String PROPERTY_RAPIDMINER_TOOLS_SMTP_SECURITY_TLS = "TLS";
+	public static final String PROPERTY_RAPIDMINER_TOOLS_SMTP_SECURITY_TLS_PFS = "TLS 1.2 + PFS";
+
+	public static final String[] PROPERTY_RAPIDMINER_TOOLS_SMTP_SECURITY_VALUES = {
+			PROPERTY_RAPIDMINER_TOOLS_SMTP_SECURITY_NONE, PROPERTY_RAPIDMINER_TOOLS_SMTP_SECURITY_STARTTLS,
+			PROPERTY_RAPIDMINER_TOOLS_SMTP_SECURITY_STARTTLS_ENFORCE,
+			PROPERTY_RAPIDMINER_TOOLS_SMTP_SECURITY_STARTTLS_ENFORCE_PFS, PROPERTY_RAPIDMINER_TOOLS_SMTP_SECURITY_TLS,
+			PROPERTY_RAPIDMINER_TOOLS_SMTP_SECURITY_TLS_PFS };
+
+	/**
+	 * The property specifying the authentication method for smtp.
+	 */
+	public static final String PROPERTY_RAPIDMINER_TOOLS_SMTP_AUTHENTICATION = "rapidminer.tools.smtp.authentication";
+
+	public static final String PROPERTY_RAPIDMINER_TOOLS_SMTP_AUTHENTICATION_AUTO = "Auto";
+	public static final String PROPERTY_RAPIDMINER_TOOLS_SMTP_AUTHENTICATION_CRAM_MD5 = "CRAM-MD5";
+	public static final String PROPERTY_RAPIDMINER_TOOLS_SMTP_AUTHENTICATION_NTLM = "NTLM";
+	public static final String[] PROPERTY_RAPIDMINER_TOOLS_SMTP_AUTHENTICATION_VALUES = {
+			PROPERTY_RAPIDMINER_TOOLS_SMTP_AUTHENTICATION_AUTO, PROPERTY_RAPIDMINER_TOOLS_SMTP_AUTHENTICATION_CRAM_MD5,
+			PROPERTY_RAPIDMINER_TOOLS_SMTP_AUTHENTICATION_NTLM };
+
 	/**
 	 * If set to true, the query builders and database assistants and query_builders show only
 	 * standard tables (no views and system tables).
@@ -490,6 +525,7 @@ public boolean isLoadingManagedExtensions() {
 		registerParameter(new ParameterTypeString(PROPERTY_RAPIDMINER_TOOLS_EDITOR, "", true));
 		registerParameter(new ParameterTypeCategory(PROPERTY_RAPIDMINER_TOOLS_MAIL_METHOD, "",
 				PROPERTY_RAPIDMINER_TOOLS_MAIL_METHOD_VALUES, PROPERTY_RAPIDMINER_TOOLS_MAIL_METHOD_SMTP));
+		registerParameter(new ParameterTypeString(PROPERTY_RAPIDMINER_TOOLS_MAIL_SENDER, "", true));
 		registerParameter(new ParameterTypeString(PROPERTY_RAPIDMINER_TOOLS_MAIL_DEFAULT_RECIPIENT, "", true));
 		registerParameter(new ParameterTypeInt(PROPERTY_RAPIDMINER_TOOLS_MAIL_DEFAULT_PROCESS_DURATION_FOR_MAIL, "", 0,
 				Integer.MAX_VALUE, 30));
@@ -499,6 +535,10 @@ public boolean isLoadingManagedExtensions() {
 		registerParameter(new ParameterTypeString(PROPERTY_RAPIDMINER_TOOLS_SMTP_PORT, "", true));
 		registerParameter(new ParameterTypeString(PROPERTY_RAPIDMINER_TOOLS_SMTP_USER, "", true));
 		registerParameter(new ParameterTypePassword(PROPERTY_RAPIDMINER_TOOLS_SMTP_PASSWD, ""));
+		registerParameter(new ParameterTypeCategory(PROPERTY_RAPIDMINER_TOOLS_SMTP_SECURITY, "",
+				PROPERTY_RAPIDMINER_TOOLS_SMTP_SECURITY_VALUES, 0));
+		registerParameter(new ParameterTypeCategory(PROPERTY_RAPIDMINER_TOOLS_SMTP_AUTHENTICATION, "",
+				PROPERTY_RAPIDMINER_TOOLS_SMTP_AUTHENTICATION_VALUES, 0));
 
 		registerParameter(new ParameterTypeBoolean(PROPERTY_RAPIDMINER_TOOLS_DB_ONLY_STANDARD_TABLES, "", true));
 		registerParameter(new ParameterTypeInt(PROPERTY_RAPIDMINER_TOOLS_DB_LOGIN_TIMEOUT, "", 0, Integer.MAX_VALUE,
@@ -804,8 +844,8 @@ private static void performInitialSettings() {
 		} else {
 			String versionString = null;
 			BufferedReader in = null;
-			try {
-				in = new BufferedReader(new FileReader(lastVersionFile));
+			try (FileReader fr = new FileReader(lastVersionFile)) {
+				in = new BufferedReader(fr);
 				versionString = in.readLine();
 			} catch (IOException e) {
 				LogService.getRoot().log(Level.WARNING, I18N.getMessage(LogService.getRoot().getResourceBundle(),
@@ -848,17 +888,11 @@ private static void performInitialSettings() {
 	}
 
 	private static void writeLastVersion(final File versionFile) {
-		PrintWriter out = null;
-		try {
-			out = new PrintWriter(new FileWriter(versionFile));
+		try (FileWriter fw = new FileWriter(versionFile); PrintWriter out = new PrintWriter(fw)) {
 			out.println(getLongVersion());
 		} catch (IOException e) {
 			LogService.getRoot().log(Level.WARNING, I18N.getMessage(LogService.getRoot().getResourceBundle(),
 					"com.rapidminer.RapidMiner.writing_current_version_error"), e);
-		} finally {
-			if (out != null) {
-				out.close();
-			}
 		}
 	}
 

src/main/java/com/rapidminer/core/license/DatabaseConstraintViolationException.java

@@ -1,21 +1,21 @@
 /**
  * Copyright (C) 2001-2017 by RapidMiner and the contributors
- * 
+ *
  * Complete list of developers available at our web site:
- * 
+ *
  * http://rapidminer.com
- * 
+ *
  * This program is free software: you can redistribute it and/or modify it under the terms of the
  * GNU Affero General Public License as published by the Free Software Foundation, either version 3
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
  * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  * Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License along with this program.
  * If not, see http://www.gnu.org/licenses/.
-*/
+ */
 package com.rapidminer.core.license;
 
 import com.rapidminer.license.violation.LicenseConstraintViolation;
@@ -41,7 +41,7 @@ public class DatabaseConstraintViolationException extends LicenseViolationExcept
 	 *            the database constraint violation
 	 */
 	public DatabaseConstraintViolationException(Operator op, String databaseURL,
-			@SuppressWarnings("rawtypes") LicenseConstraintViolation violation) {
+												@SuppressWarnings("rawtypes") LicenseConstraintViolation violation) {
 		super(op, violation);
 		this.databaseURL = databaseURL;
 	}