Changed to differential deployment to Stratosphere core (complementar…

…y zip); Cleaned up Maven dependiences

meteor/meteor-client/pom.xml

@@ -26,10 +26,6 @@
 			<artifactId>meteor-meteor</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<dependency>
-      		<groupId>org.apache.hadoop</groupId>
-      		<artifactId>hadoop-core</artifactId>
-    	</dependency>
 	</dependencies>
 
 	<reporting>

sopremo/sopremo-common/pom.xml

@@ -27,11 +27,6 @@
 			<artifactId>javolution</artifactId>
 			<version>5.5.1</version>
 		</dependency>
-		<dependency>
-			<groupId>com.amazonaws</groupId>
-			<artifactId>aws-java-sdk</artifactId>
-			<version>1.3.20</version>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
@@ -54,17 +49,6 @@
 			<version>${stratosphere-testing.version}</version>
 			<scope>test</scope>
 		</dependency>
-
-		<!-- <dependency> -->
-		<!-- <groupId>dk.brics.automaton</groupId> -->
-		<!-- <artifactId>automaton</artifactId> -->
-		<!-- <version>1.11-8</version> -->
-		<!-- </dependency> -->
-		<dependency>
-			<groupId>org.ow2.asm</groupId>
-			<artifactId>asm</artifactId>
-			<version>4.2</version>
-		</dependency>
 	</dependencies>
 	<reporting>
 		<plugins>

sopremo/sopremo-common/src/main/java/eu/stratosphere/sopremo/type/JsonUtil.java

@@ -4,8 +4,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.codehaus.jackson.map.ObjectMapper;
-
 import eu.stratosphere.sopremo.expressions.ArrayAccess;
 import eu.stratosphere.sopremo.expressions.ArrayProjection;
 import eu.stratosphere.sopremo.expressions.ExpressionUtil;
@@ -18,23 +16,11 @@
  */
 public class JsonUtil {
 	/**
-	 * A general purpose {@link ObjectMapper}. No state of this mapper should be changed. If a specifically configured
+	 * A general purpose ObjectMapper. No state of this mapper should be changed. If a specifically configured
 	 * ObjectMapper is needed, a new instance should be created.
 	 */
 	public static final JavaToJsonMapper OBJECT_MAPPER = new JavaToJsonMapper();
 
-	// /**
-	// * A general purpose {@link JsonNodeFactory}. No state of this node factory should be changed. If a specifically
-	// * configured JsonNodeFactory is needed, a new instance should be created.
-	// */
-	// public static final JsonNodeFactory NODE_FACTORY = JsonNodeFactory.instance;
-
-	// /**
-	// * A general purpose {@link JsonFactory}. No state of this factory should be changed. If a specifically
-	// * configured JsonFactory is needed, a new instance should be created.
-	// */
-	// public static final JsonFactory FACTORY = new JsonFactory();
-
 	/**
 	 * Creates an efficient read-only wrapper for the given node array.
 	 * 

sopremo/sopremo-server/src/main/java/eu/stratosphere/sopremo/server/SopremoJobInfo.java

@@ -17,8 +17,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import com.amazonaws.services.simpleworkflow.model.ExecutionStatus;
-
 import eu.stratosphere.configuration.Configuration;
 import eu.stratosphere.nephele.client.JobClient;
 import eu.stratosphere.sopremo.execution.ExecutionRequest;
@@ -125,7 +123,7 @@ public void setMetaData(final String key, final String value) {
 	}
 
 	/**
-	 * Sets the {@link ExecutionStatus} and provides additional details.
+	 * Sets the {@link ExecutionState} and provides additional details.
 	 */
 	public void setStatusAndDetail(final ExecutionState status, final String detail) {
 		if (status == null)

stratosphere-dist/pom.xml

@@ -16,61 +16,6 @@
 	<packaging>pom</packaging>
 
 	<dependencies>
-		<!-- Core -->
-		<dependency>
-			<groupId>eu.stratosphere</groupId>
-			<artifactId>stratosphere-core</artifactId>
-			<version>${core.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>eu.stratosphere</groupId>
-			<artifactId>stratosphere-java</artifactId>
-			<version>${core.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>eu.stratosphere</groupId>
-			<artifactId>stratosphere-scala</artifactId>
-			<version>${core.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>eu.stratosphere</groupId>
-			<artifactId>stratosphere-runtime</artifactId>
-			<version>${core.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>eu.stratosphere</groupId>
-			<artifactId>stratosphere-compiler</artifactId>
-			<version>${core.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>eu.stratosphere</groupId>
-			<artifactId>stratosphere-clients</artifactId>
-			<version>${core.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>eu.stratosphere</groupId>
-			<artifactId>stratosphere-java-examples</artifactId>
-			<version>${core.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>eu.stratosphere</groupId>
-			<artifactId>stratosphere-scala-examples</artifactId>
-			<version>${core.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>eu.stratosphere</groupId>
-			<artifactId>swt-visualization</artifactId>
-			<version>${core.version}</version>
-		</dependency>
-
 		<!-- HLL -->
 		<dependency>
 			<groupId>eu.stratosphere</groupId>

stratosphere-dist/src/main/assemblies/bin.xml

@@ -18,19 +18,34 @@
 			<outputDirectory>lib</outputDirectory>
 			<unpack>false</unpack>
 			<useTransitiveDependencies>true</useTransitiveDependencies>
+			<useTransitiveFiltering>true</useTransitiveFiltering>
 			<useProjectArtifact>false</useProjectArtifact>
 			<useProjectAttachments>false</useProjectAttachments>
 
 			<excludes>
-				<exclude>**/*examples*.jar</exclude>
-				<exclude>**/*javadoc*</exclude>
-				<exclude>**/*sources*</exclude>
+				<exclude>hadoop-*</exclude>
+				<exclude>stratosphere-core*</exclude>
+				<exclude>stratosphere-runtime*</exclude>
+				<exclude>stratosphere-java*</exclude>
+				<exclude>stratosphere-compiler*</exclude>
+				<!--<exclude>stratosphere-*</exclude>
+				<exclude>ant-*</exclude>
+				<exclude>aws-*</exclude>
+				<exclude>core-*</exclude>
+				<exclude>hamcrest-*</exclude>
+				<exclude>hsql-*</exclude>
+				<exclude>http-*</exclude>
+				<exclude>jasper-*</exclude>
+				<exclude>jetty-*</exclude>
+				<exclude>servlet-*</exclude>
+				<exclude>jackson-*</exclude>
+				<exclude>hadoop-*</exclude>
+				<exclude>xmlenc-*</exclude>-->
 			</excludes>
 		</dependencySet>
 	</dependencySets>
 
 	<fileSets>
-
 		<fileSet>
 			<!-- copy start scripts -->
 			<directory>src/main/stratosphere-bin/bin</directory>
@@ -44,44 +59,6 @@
 			<outputDirectory>conf</outputDirectory>
 			<fileMode>0644</fileMode>
 		</fileSet>
-
-		<fileSet>
-			<!-- create an empty log directory -->
-			<directory>src/main/stratosphere-bin/docs</directory>
-			<outputDirectory>log</outputDirectory>
-			<fileMode>0644</fileMode>
-			<excludes>
-				<exclude>*</exclude>
-			</excludes>
-		</fileSet>
-
-		<fileSet>
-			<!-- create an empty dropin-lib directory -->
-			<directory>src/main/stratosphere-bin/docs</directory>
-			<outputDirectory>lib/dropin</outputDirectory>
-			<fileMode>0644</fileMode>
-			<excludes>
-				<exclude>*</exclude>
-			</excludes>
-		</fileSet>
-
-		<fileSet>
-			<!-- copy README file -->
-			<directory>src/main/stratosphere-bin/docs</directory>
-			<outputDirectory>docs</outputDirectory>
-			<fileMode>0644</fileMode>
-		</fileSet>
-
-		<fileSet>
-			<!-- copy JavaDocs -->
-			<!-- <directory>../target/apidocs</directory -->
-			<directory>../target</directory>
-			<includes>
-				<include>stratosphere-*-javadoc.jar</include>
-			</includes>
-			<outputDirectory>docs/javadoc</outputDirectory>
-			<fileMode>0644</fileMode>
-		</fileSet>
 	</fileSets>
 
 </assembly>

stratosphere-dist/src/main/stratosphere-bin/README.txt

@@ -2,10 +2,6 @@ For the latest information about Stratosphere, please visit our website at:
 
    http://www.stratosphere.eu/
 
-and our wiki, at:
-
-   http://stratosphere.eu/wiki
-
 This distribution includes cryptographic software.  The country in 
 which you currently reside may have restrictions on the import, 
 possession, use, and/or re-export to another country, of