Merge branch 'development' into 'master'

v4.8.0

See merge request rml/proc/rmlmapper-java!95

.gitignore

@@ -4,4 +4,7 @@ rmlmapper.iml
 .DS_Store
 .settings
 .vscode
-.attach_*
+.attach_*
+ojdbc*.jar
+pom-oracle.xml
+dependency-reduced-pom.xml

.gitlab-ci.yml

@@ -1,4 +1,6 @@
-image: maven:3.5.0-jdk-8
+stages:
+  - test
+  - test-oracle
 
 variables:
   # This will suppress any download for dependencies and plugins or upload messages which would clutter the console log.
@@ -18,9 +20,17 @@ cache:
   paths:
     - .m2/repository
 
-verify:
+test:
+  stage: test
+  image: maven:3.5.0-jdk-8
   script:
-    - 'mvn $MAVEN_CLI_OPTS test'
+    - 'mvn $MAVEN_CLI_OPTS -Dtest=!Mapper_OracleDB_Test test'
+
+test-oracle:
+  stage: test-oracle
+  image: gitlab.ilabt.imec.be:4567/rml/util/mvn-oracle-docker:latest
+  script:
+    - '/entrypoint.sh'
 
 services:
   - postgres:10.4

CHANGELOG.md

@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+## [4.8.0] - 2020-05-25
+
+### Added
+- Oracle driver information in README (see [issue 142](https://gitlab.ilabt.imec.be/rml/proc/rmlmapper-java/-/issues/142))
+- Support Oracle databases (see [issue 160](https://gitlab.ilabt.imec.be/rml/proc/rmlmapper-java/-/issues/160))
+
+### Changed
+- Functions support more datatypes: `be/ugent/rml/functions/FunctionUtils.java`
+
+### Removed
+- Oracle setup file (see [issue 161](https://gitlab.ilabt.imec.be/rml/proc/rmlmapper-java/-/issues/161))
+
 ## [4.7.0] - 2020-03-09
 
 ### Added
@@ -249,6 +261,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - support for accessing remote files (via HTTP GET)
 - basic support for functions
 
+[4.8.0]: https://github.com/RMLio/rmlmapper-java/compare/v4.7.0...v4.8.0
 [4.7.0]: https://github.com/RMLio/rmlmapper-java/compare/v4.6.0...v4.7.0
 [4.6.0]: https://github.com/RMLio/rmlmapper-java/compare/v4.5.1...v4.6.0
 [4.5.1]: https://github.com/RMLio/rmlmapper-java/compare/v4.5.0...v4.5.1

README.md

@@ -89,6 +89,26 @@ options:
  -v,--verbose                     show more details in debugging output
 ```
 
+#### Accessing Oracle Database
+
+You need to add the Oracle JDBC driver manually to the class path
+if you want to access an Oracle Database.
+The required driver is `ojdbc8`.
+
+- Download `ojdbc8.jar` from [Oracle](https://www.oracle.com/database/technologies/jdbc-ucp-122-downloads.html).
+- Execute the RMLMapper via 
+
+```
+java -cp 'rmlmapper.jar:ojdbc8-12.2.0.1.jar' be.ugent.rml.cli.Main -m rules.rml.ttl
+```
+
+The options do the following:
+
+- `-cp 'rmlmapper.jar:ojdbc8-12.2.0.1.jar'`: Put the jar of the RMLMapper and JDBC driver in the classpath.
+- `be.ugent.rml.cli.Main`: `be.ugent.rml.cli.Main` is the entry point of the RMLMapper.
+- `-m rules.rml.ttl`: Use the RML rules in the file `rules.rml`.ttl.
+The exact same options as the ones mentioned earlier are supported.
+
 ### Library
 
 An example of how you can use the RMLMapper as an external library can be found
@@ -162,6 +182,8 @@ at [./src/test/java/be/ugent/rml/readme/ReadmeFunctionTest.java](https://github.
 
 ## Testing
 
+Run the tests via `test.sh`.
+
 ### RDBs
 Make sure you have [Docker](https://www.docker.com) running.
 

RELEASE.md

@@ -0,0 +1,14 @@
+Documentation for the release process of the RMLMapper.
+
+- [ ] Make a new release branch (named `release/X.Y.Z`)
+- [ ] Make sure you do not have any `dependency-reduced-pom.xml` file locally, it will be regenerated during the build process
+- [ ] Update [the changelog](https://github.com/RMLio/rmlmapper-java/blob/master/CHANGELOG.md) since last release
+- [ ] Bump version number
+  - Check and adjust `bump.sh`, depending on whether the update is major, minor, or patch
+- TODO: update the UML_diagrams (see README.md below)? We need to clarify which options are needed
+- [ ] Run `mvn clean install`
+    - This also updates the docs at `/docs/apidocs`.
+      If for some reason you need to update the docs yourself,
+      you can do so via `mvn javadoc:javadoc`.
+- [ ] If it looks like everything is good at this point, merge the release branch into `master`
+- [ ] Make a new release on [the GitHub release page](https://github.com/RMLio/rmlmapper-java/releases) with the most important parts of the changelog

buildNumber.properties

@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
-#Mon Mar 09 10:53:10 CET 2020
-buildNumber0=151
+#Mon May 25 08:33:31 CEST 2020
+buildNumber0=246