Skip to content

Commit

Permalink
Remove unused (and unimplemented) security in example
Browse files Browse the repository at this point in the history
  • Loading branch information
ghsnd committed Dec 14, 2021
1 parent 25e4c05 commit 1d50a98
Show file tree
Hide file tree
Showing 2 changed files with 84 additions and 26 deletions.
10 changes: 6 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,24 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## [2.2.0]

### Added
* Logicat target compression for files: gzip, zip, xz.
* WebSocket support for Logical Target via WoT description and format JSON.
* Logical target compression for files: gzip, zip, xz.
* WebSocket support for Logical Source via WoT description.
* Added scopt dependency

### Changed
* Updated Flink from version 1.12.3 to 1.14.0
* Updated SLF4J from version 1.7.26 to 1.7.32
* Updated Log4J from version 2.13.3 to 2.14.1
* Updated Jena from version 3.11.0 to 4.2.0
* Updated Log4J from version 2.13.3 to 2.15.0
* Updated Jena from version 3.11.0 to 4.3.1
* Updated JayWay JsonPath from version 2.3.0 to 2.6.0
* Updated JsonSurfer Jackson from version 1.6.0 to 1.6.2
* Updated Moquette from version 0.13 to 0.15

### Fixed
* Objects generated by functions with term type IRI were quoted, resulting in a wrong IRI.
(GitHub [issue #33](https://github.com/RMLio/RMLStreamer/issues/33), internal [issue #140](https://gitlab.ilabt.imec.be/rml/proc/rml-streamer/-/issues/140))
* Updated Log4J to a version protected against [Log4Shell](https://en.wikipedia.org/wiki/Log4Shell)
(Internal [issue #146](https://gitlab.ilabt.imec.be/rml/proc/rml-streamer/-/issues/146)).

## [2.1.1] - 2020-05-19

Expand Down
100 changes: 78 additions & 22 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ SOFTWARE.
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<flink.version>1.14.0</flink.version>
<slf4j.version>1.7.32</slf4j.version>
<log4j.version>2.14.1</log4j.version>
<jena.version>4.2.0</jena.version>
<log4j.version>2.15.0</log4j.version>
<jena.version>4.3.1</jena.version>
<kafka.version>2.4.1</kafka.version>

<scala.binary.version>2.11</scala.binary.version>
Expand Down Expand Up @@ -71,25 +71,19 @@ SOFTWARE.

<!-- Framework dependencies -->

<!-- https://mvnrepository.com/artifact/org.apache.jena/jena-core -->
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId>
<artifactId>jena-arq</artifactId>
<version>${jena.version}</version>
<exclusions>
<exclusion>
<artifactId>commons-cli</artifactId>
<groupId>commons-cli</groupId>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- https://mvnrepository.com/artifact/org.apache.jena/jena-arq -->
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-arq</artifactId>
<version>${jena.version}</version>
<exclusions>
<!-- provided by Flink -->
<exclusion>
<groupId>org.apache.commons</groupId>
Expand All @@ -102,6 +96,12 @@ SOFTWARE.
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
<version>2.6.0</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down Expand Up @@ -136,6 +136,10 @@ SOFTWARE.
<artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
<groupId>org.apache.flink</groupId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand All @@ -152,16 +156,13 @@ SOFTWARE.
<artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
<groupId>org.apache.flink</groupId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j.version}</version>
</dependency>

<dependency>
<groupId>com.github.scopt</groupId>
<artifactId>scopt_${scala.binary.version}</artifactId>
Expand Down Expand Up @@ -197,24 +198,48 @@ SOFTWARE.
<artifactId>flink-scala_${scala.binary.version}</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-scala_${scala.binary.version}</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients_${scala.binary.version}</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-kafka_${scala.binary.version}</artifactId>
<version>${flink.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand All @@ -240,6 +265,10 @@ SOFTWARE.
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<!--exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
Expand Down Expand Up @@ -282,6 +311,16 @@ SOFTWARE.
<artifactId>moquette-broker</artifactId>
<version>0.15</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- embeddable WebSocket server -->
Expand All @@ -290,6 +329,12 @@ SOFTWARE.
<artifactId>Java-WebSocket</artifactId>
<version>1.5.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>


Expand All @@ -301,6 +346,11 @@ SOFTWARE.
<version>${slf4j.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
Expand Down Expand Up @@ -364,6 +414,12 @@ SOFTWARE.
<groupId>org.apache.flink</groupId>
<artifactId>flink-runtime-web_2.11</artifactId>
<version>${flink.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</profile>
Expand Down

0 comments on commit 1d50a98

Please sign in to comment.