Skip to content

Commit

Permalink
Rename POMs, scripts, quickstarts and other minor renames
Browse files Browse the repository at this point in the history
  • Loading branch information
rmetzger committed Jul 10, 2014
1 parent 5f01154 commit 8563d51
Show file tree
Hide file tree
Showing 1,979 changed files with 768 additions and 850 deletions.
12 changes: 6 additions & 6 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -202,14 +202,14 @@

=======================================================================

Stratosphere contains subcomponents with separate copyright notices and
Flink contains subcomponents with separate copyright notices and
license terms. Your use of the source code for the these subcomponents
is subject to the terms and conditions of their respective licenses.

-----------------------------------------------------------------------
For jQuery 1.4.2 (MIT) in:
- stratosphere-runtime/resources/web-docs-infoserver/js/jquery.js
- stratosphere-clients/resources/web-docs/jquery.js
- flink-runtime/resources/web-docs-infoserver/js/jquery.js
- flink-clients/resources/web-docs/jquery.js
-----------------------------------------------------------------------
Copyright 2014 jQuery Foundation and other contributors
http://jquery.com/
Expand All @@ -235,7 +235,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-----------------------------------------------------------------------
For jCanvas 13.11.21 (MIT) in:
- stratosphere-runtime/resources/web-docs-infoserver/js/jcanvas.min.js
- flink-runtime/resources/web-docs-infoserver/js/jcanvas.min.js
-----------------------------------------------------------------------
Copyright 2014 Caleb Evans
http://calebevans.me/projects/jcanvas/
Expand All @@ -261,7 +261,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-----------------------------------------------------------------------
For Flot 0.8.1 in:
- stratosphere-runtime/resources/web-docs-infoserver/js/jquery.flot.*
- flink-runtime/resources/web-docs-infoserver/js/jquery.flot.*
-----------------------------------------------------------------------
Copyright (c) 2007-2013 IOLA and Ole Laursen

Expand All @@ -288,7 +288,7 @@ OTHER DEALINGS IN THE SOFTWARE.

-----------------------------------------------------------------------
For js-graph.it 1.0 (LGPL 2.1) in:
- stratosphere-clients/resources/web-docs/js/js-graph-it.js
- flink-clients/resources/web-docs/js/js-graph-it.js
-----------------------------------------------------------------------
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
Expand Down
8 changes: 4 additions & 4 deletions docs/cluster_execution.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ If you are developing your program as a Maven project, you have to add the

```xml
<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>stratosphere-clients</artifactId>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients</artifactId>
<version>{{ site.FLINK_VERSION_STABLE }}</version>
</dependency>
```
Expand Down Expand Up @@ -72,8 +72,8 @@ If you are developing your program in a Maven project, you have to add the

```xml
<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>stratosphere-clients</artifactId>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients</artifactId>
<version>{{ site.FLINK_VERSION_STABLE }}</version>
</dependency>
```
Expand Down
8 changes: 4 additions & 4 deletions docs/java_api_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,13 @@ If you want to add Stratosphere to an existing Maven project, add the following

```xml
<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>stratosphere-java</artifactId>
<groupId>org.apache.flink</groupId>
<artifactId>flink-java</artifactId>
<version>{{site.FLINK_VERSION_STABLE }}</version>
</dependency>
<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>stratosphere-clients</artifactId>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients</artifactId>
<version>{{site.FLINK_VERSION_STABLE }}</version>
</dependency>
```
Expand Down
4 changes: 2 additions & 2 deletions docs/local_execution.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ If you are developing your program in a Maven project, you have to add the `stra

```xml
<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>stratosphere-clients</artifactId>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients</artifactId>
<version>{{site.FLINK_VERSION_STABLE}}</version>
</dependency>
```
Expand Down
8 changes: 4 additions & 4 deletions docs/scala_api_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,13 @@ following lines to your POM.
```xml
<dependencies>
<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>stratosphere-scala</artifactId>
<groupId>org.apache.flink</groupId>
<artifactId>flink-scala</artifactId>
<version>{{site.FLINK_VERSION_STABLE}}</version>
</dependency>
<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>stratosphere-clients</artifactId>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients</artifactId>
<version>{{site.FLINK_VERSION_STABLE}}</version>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion docs/spargel_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Add the following dependency to your `pom.xml` to use the Spargel.

```xml
<dependency>
<groupId>eu.stratosphere</groupId>
<groupId>org.apache.flink</groupId>
<artifactId>spargel</artifactId>
<version>{{site.FLINK_VERSION_STABLE}}</version>
</dependency>
Expand Down
16 changes: 8 additions & 8 deletions stratosphere-addons/avro/pom.xml → flink-addons/avro/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>stratosphere-addons</artifactId>
<groupId>eu.stratosphere</groupId>
<artifactId>flink-addons</artifactId>
<groupId>org.apache.flink</groupId>
<version>0.6-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
Expand All @@ -19,14 +19,14 @@

<dependencies>
<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>stratosphere-java</artifactId>
<groupId>org.apache.flink</groupId>
<artifactId>flink-java</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>stratosphere-clients</artifactId>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients</artifactId>
<version>${project.version}</version>
</dependency>

Expand All @@ -43,8 +43,8 @@
</dependency>

<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>stratosphere-test-utils</artifactId>
<groupId>org.apache.flink</groupId>
<artifactId>flink-test-utils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>stratosphere-addons</artifactId>
<groupId>eu.stratosphere</groupId>
<artifactId>flink-addons</artifactId>
<groupId>org.apache.flink</groupId>
<version>0.6-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
Expand All @@ -19,25 +19,25 @@

<dependencies>
<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>stratosphere-java</artifactId>
<groupId>org.apache.flink</groupId>
<artifactId>flink-java</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>stratosphere-clients</artifactId>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>stratosphere-tests</artifactId>
<groupId>org.apache.flink</groupId>
<artifactId>flink-tests</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>stratosphere-test-utils</artifactId>
<groupId>org.apache.flink</groupId>
<artifactId>flink-test-utils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
Expand Down
12 changes: 6 additions & 6 deletions stratosphere-addons/hbase/pom.xml → flink-addons/hbase/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>stratosphere-addons</artifactId>
<groupId>eu.stratosphere</groupId>
<artifactId>flink-addons</artifactId>
<groupId>org.apache.flink</groupId>
<version>0.6-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
Expand Down Expand Up @@ -34,14 +34,14 @@

<dependencies>
<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>stratosphere-core</artifactId>
<groupId>org.apache.flink</groupId>
<artifactId>flink-core</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>stratosphere-java</artifactId>
<groupId>org.apache.flink</groupId>
<artifactId>flink-java</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down
16 changes: 8 additions & 8 deletions stratosphere-addons/jdbc/pom.xml → flink-addons/jdbc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>stratosphere-addons</artifactId>
<groupId>eu.stratosphere</groupId>
<artifactId>flink-addons</artifactId>
<groupId>org.apache.flink</groupId>
<version>0.6-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
Expand All @@ -19,20 +19,20 @@

<dependencies>
<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>stratosphere-java</artifactId>
<groupId>org.apache.flink</groupId>
<artifactId>flink-java</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>stratosphere-core</artifactId>
<groupId>org.apache.flink</groupId>
<artifactId>flink-core</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>stratosphere-clients</artifactId>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down
8 changes: 4 additions & 4 deletions stratosphere-addons/pom.xml → flink-addons/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>eu.stratosphere</groupId>
<artifactId>stratosphere</artifactId>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
<version>0.6-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>stratosphere-addons</artifactId>
<name>stratosphere-addons</name>
<artifactId>flink-addons</artifactId>
<name>flink-addons</name>
<packaging>pom</packaging>

<modules>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>stratosphere-addons</artifactId>
<groupId>eu.stratosphere</groupId>
<artifactId>flink-addons</artifactId>
<groupId>org.apache.flink</groupId>
<version>0.6-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
Expand All @@ -18,23 +18,23 @@

<dependencies>
<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>stratosphere-core</artifactId>
<groupId>org.apache.flink</groupId>
<artifactId>flink-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>stratosphere-java</artifactId>
<groupId>org.apache.flink</groupId>
<artifactId>flink-java</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>stratosphere-clients</artifactId>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>stratosphere-test-utils</artifactId>
<groupId>org.apache.flink</groupId>
<artifactId>flink-test-utils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
Expand Down
12 changes: 6 additions & 6 deletions stratosphere-addons/yarn/pom.xml → flink-addons/yarn/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>eu.stratosphere</groupId>
<artifactId>stratosphere-addons</artifactId>
<groupId>org.apache.flink</groupId>
<artifactId>flink-addons</artifactId>
<version>0.6-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
Expand All @@ -16,8 +16,8 @@
<dependencies>

<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>stratosphere-runtime</artifactId>
<groupId>org.apache.flink</groupId>
<artifactId>flink-runtime</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
Expand All @@ -28,8 +28,8 @@
</dependency>

<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>stratosphere-clients</artifactId>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down
Loading

0 comments on commit 8563d51

Please sign in to comment.