Skip to content

Commit

Permalink
Merge branch 'hotfix/v1.1.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
MiniPlayer committed Apr 15, 2019
2 parents c1b78ec + 256844a commit be0f2f3
Show file tree
Hide file tree
Showing 141 changed files with 624 additions and 245 deletions.
14 changes: 7 additions & 7 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ to build from the source just clone source and package with maven (logisland req
cd logisland
mvn clean install -Pfull
the final package is available at `logisland-assembly/target/logisland-1.1.1-bin.tar.gz`
the final package is available at `logisland-assembly/target/logisland-1.1.2-bin.tar.gz`

You can also download the `latest release build <https://github.com/Hurence/logisland/releases>`_

Expand Down Expand Up @@ -86,9 +86,9 @@ But you should choose the Spark version that is compatible with your environment
curl -s http://d3kbcqa49mib13.cloudfront.net/spark-<spark-version>-bin-hadoop<hadoop-version>.tgz | tar -xz -C /usr/local/
export SPARK_HOME=/usr/local/spark-<spark-version>-bin-hadoop<hadoop-version>
# install Logisland 1.1.1
# install Logisland 1.1.2
curl -s https://github.com/Hurence/logisland/releases/download/v1.0.0-RC2/logisland-1.0.0-RC2-bin.tar.gz | tar -xz -C /usr/local/
cd /usr/local/logisland-1.1.1
cd /usr/local/logisland-1.1.2
# launch a logisland job
bin/logisland.sh --conf conf/index-apache-logs.yml
Expand Down Expand Up @@ -117,9 +117,9 @@ Launching logisland streaming apps is just easy as unarchiving logisland distrib

.. code-block:: sh
# install Logisland 1.1.1
curl -s https://github.com/Hurence/logisland/releases/download/v0.10.0/logisland-1.1.1-bin-hdp2.5.tar.gz | tar -xz -C /usr/local/
cd /usr/local/logisland-1.1.1
# install Logisland 1.1.2
curl -s https://github.com/Hurence/logisland/releases/download/v0.10.0/logisland-1.1.2-bin-hdp2.5.tar.gz | tar -xz -C /usr/local/
cd /usr/local/logisland-1.1.2
bin/logisland.sh --conf conf/index-apache-logs.yml
Expand All @@ -140,7 +140,7 @@ The first part is the `ProcessingEngine` configuration (here a Spark streaming e

.. code-block:: yaml
version: 1.1.1
version: 1.1.2
documentation: LogIsland job config file
engine:
component: com.hurence.logisland.engine.spark.KafkaStreamProcessingEngine
Expand Down
2 changes: 1 addition & 1 deletion launch-tuto.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash

logisland-assembly/target/logisland-1.1.1-bin/logisland-1.1.1/bin/logisland.sh \
logisland-assembly/target/logisland-1.1.2-bin/logisland-1.1.2/bin/logisland.sh \
--conf logisland-core/logisland-framework/logisland-resources/src/main/resources/conf/$1
2 changes: 1 addition & 1 deletion logisland-assembly/NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -922,5 +922,5 @@ The following binary components are provided to the 'Public Domain'. See projec

The following binary components are provided under the Creative Commons Zero license version 1.0. See project link for details.

(CC0v1.0) JSR166e for Twitter (com.twitter:jsr166e:jar:1.1.1 - https://github.com/twitter/jsr166e)
(CC0v1.0) JSR166e for Twitter (com.twitter:jsr166e:jar:1.1.2 - https://github.com/twitter/jsr166e)

2 changes: 1 addition & 1 deletion logisland-assembly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>
<artifactId>logisland-assembly</artifactId>
<packaging>pom</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-connectors</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>
<packaging>jar</packaging>

Expand Down
2 changes: 1 addition & 1 deletion logisland-components/logisland-connectors/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-components</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>
<packaging>pom</packaging>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-processors</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>

<artifactId>logisland-botsearch-plugin</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-processors</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>

<artifactId>logisland-processor-common-logs</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-processors</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>

<artifactId>logisland-processor-common</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-processors</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>

<artifactId>logisland-processor-cyber-security</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-processors</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>

<artifactId>logisland-processor-elasticsearch</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-processors</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>

<artifactId>logisland-processor-enrichment</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-processors</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>

<artifactId>logisland-processor-excel</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-processors</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>

<artifactId>logisland-processor-hbase</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-processors</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>

<packaging>jar</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ http://www.w3.org/2001/XMLSchema-instance ">
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-processors</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>

<packaging>jar</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ http://www.w3.org/2001/XMLSchema-instance ">
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-processors</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>

<packaging>jar</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-processors</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>

<artifactId>logisland-processor-scripting</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-processors</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>

<artifactId>logisland-processor-useragent</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-processors</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>

<artifactId>logisland-processor-web-analytics</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-processors</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>

<artifactId>logisland-processor-xml</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion logisland-components/logisland-processors/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-components</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>

<name>Logisland processors package</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-service-cassandra</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>

<artifactId>logisland-service-cassandra-api</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-service-cassandra</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>

<artifactId>logisland-service-cassandra-client</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-services</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>

<artifactId>logisland-service-cassandra</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-service-elasticsearch</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>

<artifactId>logisland-service-elasticsearch-api</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-service-elasticsearch</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>

<artifactId>logisland-service-elasticsearch_2_4_0-client</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-service-elasticsearch</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>

<artifactId>logisland-service-elasticsearch_5_4_0-client</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-services</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>

<artifactId>logisland-service-elasticsearch</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-service-hbase</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>

<artifactId>logisland-service-hbase-api</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-service-hbase</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>

<artifactId>logisland-service-hbase_1_1_2-client</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-services</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>

<artifactId>logisland-service-hbase</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>logisland-services</artifactId>
<groupId>com.hurence.logisland</groupId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>

<artifactId>logisland-service-inmemory-cache</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-service-ip-to-geo</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-service-ip-to-geo</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-services</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>

<artifactId>logisland-service-ip-to-geo</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-mongodb</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>

<artifactId>logisland-service-mongodb-api</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-mongodb</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>

<artifactId>logisland-service-mongodb-client</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-services</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>

<artifactId>logisland-mongodb</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-services</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>

<artifactId>logisland-service-redis</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-service-solr</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>

<artifactId>logisland-service-solr-api</artifactId>
Expand Down
Loading

0 comments on commit be0f2f3

Please sign in to comment.