Skip to content

Commit

Permalink
Merge pull request #321 from AbsaOSS/feature/prep_release_2_1_1
Browse files Browse the repository at this point in the history
Release Cobrix 2.1.1
  • Loading branch information
yruslan authored Aug 18, 2020
2 parents b759d1c + bf55cde commit e2b9ffe
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 27 deletions.
18 changes: 8 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,21 @@ temp*
dist
test-output
build.log
gen
.cache*
dependency-reduced-pom.xml

# other scm
.svn
.CVS
.hg*

# temporary test dirs
_testOutput
output
.attach_pid*

# switch to regexp syntax.
# syntax: regexp
# ^\.pc/

#SHITTY output not in target directory
build.log

gen
.cache*
dependency-reduced-pom.xml

_testOutput
output
.attach_pid*
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ You can link against this library in your program at the following coordinates:
```
groupId: za.co.absa.cobrix
artifactId: spark-cobol_2.11
version: 2.1.0
version: 2.1.1
```

### Scala 2.12
Expand All @@ -72,7 +72,7 @@ version: 2.1.0
```
groupId: za.co.absa.cobrix
artifactId: spark-cobol_2.12
version: 2.1.0
version: 2.1.1
```

## Using with Spark shell
Expand All @@ -81,12 +81,12 @@ This package can be added to Spark using the `--packages` command line option. F

### Spark compiled with Scala 2.11
```
$SPARK_HOME/bin/spark-shell --packages za.co.absa.cobrix:spark-cobol_2.11:2.1.0
$SPARK_HOME/bin/spark-shell --packages za.co.absa.cobrix:spark-cobol_2.11:2.1.1
```

### Spark compiled with Scala 2.12
```
$SPARK_HOME/bin/spark-shell --packages za.co.absa.cobrix:spark-cobol_2.12:2.1.0
$SPARK_HOME/bin/spark-shell --packages za.co.absa.cobrix:spark-cobol_2.12:2.1.1
```

## Usage
Expand Down Expand Up @@ -203,16 +203,16 @@ to decode various binary formats.

The jars that you need to get are:

* spark-cobol_2.11-2.1.0.jar
* cobol-parser_2.11-2.1.0.jar
* spark-cobol_2.11-2.1.1.jar
* cobol-parser_2.11-2.1.1.jar
* scodec-core_2.11-1.10.3.jar
* scodec-bits_2.11-1.1.4.jar

After that you can specify these jars in `spark-shell` command line. Here is an example:
```
$ spark-shell --packages za.co.absa.cobrix:spark-cobol_2.11:2.1.0
$ spark-shell --packages za.co.absa.cobrix:spark-cobol_2.11:2.1.1
or
$ spark-shell --master yarn --deploy-mode client --driver-cores 4 --driver-memory 4G --jars spark-cobol_2.11-2.1.0.jar,cobol-parser_2.11-2.1.0.jar,scodec-core_2.11-1.10.3.jar,scodec-bits_2.11-1.1.4.jar
$ spark-shell --master yarn --deploy-mode client --driver-cores 4 --driver-memory 4G --jars spark-cobol_2.11-2.1.1.jar,cobol-parser_2.11-2.1.1.jar,scodec-core_2.11-1.10.3.jar,scodec-bits_2.11-1.1.4.jar
Setting default log level to "WARN".
To adjust logging level use sc.setLogLevel(newLevel). For SparkR, use setLogLevel(newLevel).
Expand Down Expand Up @@ -1198,7 +1198,7 @@ For multisegment variable lengths tests:
![](performance/images/exp3_multiseg_wide_records_throughput.svg) ![](performance/images/exp3_multiseg_wide_mb_throughput.svg)

## Changelog
- #### 2.1.1 to be released soon
- #### 2.1.1 released 18 August 2020.
- [#53](https://github.com/AbsaOSS/cobrix/issues/53) Added an option to retain FILLERs. `.option("drop_value_fillers", "false")`. Use together with `.option("drop_group_fillers", "false")`.
- [#315](https://github.com/AbsaOSS/cobrix/issues/315) Added `CopybookParser.parseSimple()` that requires only essential arguments.
- [#316](https://github.com/AbsaOSS/cobrix/issues/316) Added support for copybooks that contain non-breakable spaces (0xA0) and tabs.
Expand Down
2 changes: 1 addition & 1 deletion cobol-converters/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>za.co.absa.cobrix</groupId>
<artifactId>cobrix_2.11</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion cobol-parser/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>za.co.absa.cobrix</groupId>
<artifactId>cobrix_2.11</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion examples/examples-collection/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<scala.compat.version>2.11</scala.compat.version>
<spark.version>2.4.4</spark.version>
<specs.version>2.4.16</specs.version>
<spark.cobol.version>2.1.0</spark.cobol.version>
<spark.cobol.version>2.1.1</spark.cobol.version>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion examples/spark-cobol-app/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ThisBuild / version := "0.1.0-SNAPSHOT"
ThisBuild / scalaVersion := "2.11.12"

val sparkVersion = "2.4.4"
val sparkCobolVersion = "2.1.0"
val sparkCobolVersion = "2.1.1"
val scalatestVersion = "3.0.1"

ThisBuild / libraryDependencies ++= Seq(
Expand Down
2 changes: 1 addition & 1 deletion examples/spark-cobol-app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<scalatest.version>3.0.0</scalatest.version>
<spark.version>2.4.4</spark.version>
<specs.version>2.4.16</specs.version>
<spark.cobol.version>2.1.0</spark.cobol.version>
<spark.cobol.version>2.1.1</spark.cobol.version>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<groupId>za.co.absa.cobrix</groupId>
<artifactId>cobrix_2.11</artifactId>

<version>2.1.0-SNAPSHOT</version>
<version>2.1.2-SNAPSHOT</version>

<packaging>pom</packaging>

Expand Down
2 changes: 1 addition & 1 deletion spark-cobol/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>za.co.absa.cobrix</groupId>
<artifactId>cobrix_2.11</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion version.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version in ThisBuild := "2.1.1-SNAPSHOT"
version in ThisBuild := "2.1.2-SNAPSHOT"

0 comments on commit e2b9ffe

Please sign in to comment.