Skip to content

Commit

Permalink
Release RapidMiner 9.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Marco Boeck committed Jun 3, 2020
1 parent df2298d commit 7124551
Show file tree
Hide file tree
Showing 547 changed files with 34,802 additions and 6,597 deletions.
31 changes: 27 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ repositories {
dependencies {

// belt project for new data core
compile 'com.rapidminer:belt:1.0.0-BETA4'
compile 'com.rapidminer:belt:1.0.0-BETA5'

// belt adapter for conversion between old and new core
compile ('com.rapidminer:belt-adapter:0.6'){
compile ('com.rapidminer:belt-adapter:0.7'){
exclude group: 'com.rapidminer.studio', module: 'rapidminer-studio-core'
exclude group: 'com.rapidminer', module: 'belt'
}
Expand All @@ -40,13 +40,23 @@ dependencies {

// RapidMiner API
compile 'com.rapidminer:rapidminer-api:0.2.2'

// RapidMiner HDF5 Writer library
compile 'com.rapidminer:rapidminer-hdf5-writer:0.5.0'

// Alphanumeric sorting
compile 'com.rapidminer.external:alphanumeric-sorting:1.0.1'

// VLDocking as docking framework (https://code.google.com/p/vldocking/)
compile 'com.rapidminer.external:vldocking:9.0.2'

// repository supporting versioning
compile('com.rapidminer.repository:versioned-repository:0.1.1') {
exclude group: 'org.bouncycastle', module: 'bcprov-jdk15on'
exclude group: 'commons-io', module: 'commons-io'
exclude group: 'org.apache.commons', module: 'commons-lang3'
}

// Freehep for vector graphic export (http://java.freehep.org/)
compile('org.freehep:freehep-graphicsio-ps:2.3') {
exclude group:'junit', module: 'junit'
Expand Down Expand Up @@ -86,7 +96,7 @@ dependencies {
compile 'org.jfree:jfreechart:1.0.17'

// Java Mail Implementation for mail sending (https://javaee.github.io/javamail/)
compile 'com.sun.mail:javax.mail:1.6.0'
compile 'com.sun.mail:javax.mail:1.6.2'

// Groovy for 'Execute Script' operator (http://groovy.codehaus.org/)
compile 'org.codehaus.groovy:groovy-all:2.4.10'
Expand All @@ -109,6 +119,9 @@ dependencies {
// commons-lang for different String utility functions (http://commons.apache.org/proper/commons-lang/)
compile 'commons-lang:commons-lang:2.6'

// commons-email for sending emails (https://commons.apache.org/proper/commons-email/)
compile 'org.apache.commons:commons-email:1.5'

// bouncycastle for encryption algorithms (https://www.bouncycastle.org/)
compile 'org.bouncycastle:bcprov-jdk15on:1.50'

Expand Down Expand Up @@ -160,15 +173,25 @@ dependencies {

// matrix library (https://www.ojalgo.org/)
compile 'org.ojalgo:ojalgo:47.3.0'

//java hdf5 reader library (https://github.com/jamesmudd/jhdf)
compile ('io.jhdf:jhdf:0.5.7'){
exclude group: 'org.slf4j', module: 'slf4j-api'
exclude group: 'org.apache.commons', module: 'commons-lang3'
}

// OpenJDK 8 does not come with JavaFX, so we need the core libs from it separately
compile 'com.dukescript.api:javafx.base:8.60.11'

// new encryption framework (since 9.7)
compile 'com.google.crypto.tink:tink:1.3.0'
compile 'commons-codec:commons-codec:1.14'

// tests require mockito
testCompile 'org.mockito:mockito-core:2.13.0'
}

task wrapper(type: Wrapper) { gradleVersion = '4.0.1' }
task wrapper(type: Wrapper) { gradleVersion = '4.10.3' }

apply from: 'gradle/props.gradle'
apply from: 'gradle/tutorial.gradle'
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version=9.6.0
version=9.7.0
group=com.rapidminer.studio

licenseVersion=4.2.3
licenseVersion=4.2.4
10 changes: 5 additions & 5 deletions gradle/props.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
buildscript {
repositories {
mavenCentral()
gradlePluginPortal()
}
dependencies {
classpath 'org.ajoberstar:grgit:0.3.+'
classpath 'org.ajoberstar.grgit:grgit-gradle:4.0.+'
}
}

import org.ajoberstar.grgit.Grgit
apply plugin: org.ajoberstar.grgit.gradle.GrgitPlugin


// Generates a file containing the current Git revision
task generateGitRevFile() {
Expand All @@ -18,9 +19,8 @@ task generateGitRevFile() {
outputs.upToDateWhen { false }

doLast {
def repo = Grgit.open(rootProject.file('.'))
if (!outputFile.parentFile.isDirectory()) { outputFile.parentFile.mkdirs() }
outputFile.text = repo.head().id
outputFile.text = grgit.head().id
}
}

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Tue Aug 08 11:49:22 CEST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.1-bin.zip
102 changes: 0 additions & 102 deletions src/main/java/com/rapidminer/Experiment.java

This file was deleted.

25 changes: 8 additions & 17 deletions src/main/java/com/rapidminer/FileProcessLocation.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,22 @@

import java.io.BufferedReader;
import java.io.File;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.IOException;
import java.io.OutputStream;
import java.nio.file.Files;
import java.util.logging.Level;

import org.w3c.dom.Document;

import com.rapidminer.io.process.XMLImporter;
import com.rapidminer.io.process.XMLTools;
import com.rapidminer.tools.LogService;
import com.rapidminer.tools.ProgressListener;
import com.rapidminer.tools.Tools;
import com.rapidminer.tools.XMLException;
import com.rapidminer.tools.encryption.EncryptionProvider;


/**
*
* A file process location. Note that a file process is always using the {@link EncryptionProvider#DEFAULT_CONTEXT} for
* encryption/decryption.
*
* @author Simon Fischer
*/
public class FileProcessLocation implements ProcessLocation {
Expand All @@ -58,7 +56,7 @@ public Process load(ProgressListener l) throws IOException, XMLException {
if (!file.canRead()) {
throw new IOException("Process file '" + file + "' is not readable.");
}
return new Process(file, l);
return new Process(file, EncryptionProvider.DEFAULT_CONTEXT, l);
}

@Override
Expand All @@ -73,29 +71,22 @@ public String getRawXML() throws IOException {

@Override
public void store(Process process, ProgressListener listener) throws IOException {
OutputStream out = null;
try {
if (listener != null) {
listener.setCompleted(33);
}
Document document = process.getRootOperator().getDOMRepresentation();
out = new FileOutputStream(file);
XMLTools.stream(document, out, XMLImporter.PROCESS_FILE_CHARSET);
process.getRootOperator().writeXML(Files.newBufferedWriter(file.toPath()), false, EncryptionProvider.DEFAULT_CONTEXT);
if (listener != null) {
listener.setCompleted(100);
}
// LogService.getRoot().info("Saved process definition file at '" + file + "'.");
LogService.getRoot().log(Level.INFO, "com.rapidminer.FileProcessLocation.saved_process_definition_file", file);
} catch (XMLException e) {
} catch (IOException e) {
throw new IOException("Cannot save process: " + e, e);
} finally {
if (listener != null) {
listener.setCompleted(100);
listener.complete();
}
if (out != null) {
out.close();
}
}
}

Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/rapidminer/OperatorLibraryService.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@
* as well as to the context menu. They are only available on entries of the according class.
*
* @author Sebastian Land
* @deprecated since 9.7, but was unused even before
*/
@Deprecated
public class OperatorLibraryService {

/**
Expand Down
Loading

0 comments on commit 7124551

Please sign in to comment.