Merge branch 'development' into 'master'

v4.6.0

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

CHANGELOG.md

@@ -7,6 +7,21 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+## [4.6.0] - 2019-11-19
+
+### Added
+- R2RML support
+
+### Changed
+- QuadFactory (removes need for explicit RDF4J store)
+- SQLTestCore created, used between RML SQL tests and R2RML tests
+
+### Fixed
+- Username without password is possible
+- Completed prefixes in some test mappings
+- Generation of blank nodes via Object Maps
+- FnO IRI
+
 ## [4.5.1] - 2019-09-04
 
 ### Fixed
@@ -211,6 +226,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.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
 [4.5.0]: https://github.com/RMLio/rmlmapper-java/compare/v4.4.2...v4.5.0
 [4.4.2]: https://github.com/RMLio/rmlmapper-java/compare/v4.4.1...v4.4.2

README.md

@@ -56,7 +56,7 @@ A standalone jar can be found in `/target`.
 ### CLI
 The following options are most common.
 
-- `-m, --mapping <arg>`: one or more mapping file paths and/or strings (multiple values are concatenated)
+- `-m, --mapping <arg>`: one or more mapping file paths and/or strings (multiple values are concatenated).
 - `-o, --output <arg>`: path to output file
 - `-s,--serialization <arg>`: serialization format (nquads (default), trig, trix, jsonld, hdt)
 
@@ -68,14 +68,26 @@ usage: java -jar mapper.jar <options>
 options:
  -c,--configfile <arg>            path to configuration file
  -d,--duplicates                  remove duplicates in the output
- -e,--metadatafile <arg>          path to metadata file
- -f,--functionfile <arg>          path to functions.ttl file (dynamic functions are found relative to functions.ttl)
+ -dsn,--r2rml-jdbcDriver <arg>    DSN of the database when using R2RML rules
+ -e,--metadatafile <arg>          path to output metadata file
+ -f,--functionfile <arg>          path to functions.ttl file (dynamic
+                                  functions are found relative to
+                                  functions.ttl)
  -h,--help                        show help info
- -l,--metadataDetailLevel <arg>   generate metadata on given detail level (dataset - triple - term)
- -m,--mappingfile <arg>           one or more mapping file paths and/or strings (multiple values are concatenated)
+ -l,--metadataDetailLevel <arg>   generate metadata on given detail level
+                                  (dataset - triple - term)
+ -m,--mappingfile <arg>           one or more mapping file paths and/or
+                                  strings (multiple values are
+                                  concatenated). r2rml is converted to rml 
+                                  if needed using the r2rml arguments.
  -o,--outputfile <arg>            path to output file (default: stdout)
- -s,--serialization <arg>         serialization format (nquads (default), turtle, trig, trix, jsonld, hdt)
- -t,--triplesmaps <arg>           IRIs of the triplesmaps that should be executed in order, split by ',' (default is all triplesmaps)
+ -p,--r2rml-password <arg>        password of the database when using R2RML rules
+ -s,--serialization <arg>         serialization format (nquads (default),
+                                  turtle, trig, trix, jsonld, hdt)
+ -t,--triplesmaps <arg>           IRIs of the triplesmaps that should be
+                                  executed in order, split by ',' (default
+                                  is all triplesmaps)
+ -u,--r2rml-username <arg>        username of the database when using R2RML rules
  -v,--verbose                     show more details in debugging output
 ```
 
@@ -159,7 +171,7 @@ Make sure you have [Docker](https://www.docker.com) running.
 | junit                              | Eclipse Public License 1.0                                         |
 | org.eclipse.rdf4j rdf4j-runtime    | Eclipse Public License 1.0                                         |
 | commons-cli                        | Apache License 2.0                                                 |
-| com.opencsv opencsv                | Apache License 2.0                                                 |
+| commons-csv                        | Apache License 2.0                                                 |
 | commons-lang                       | Apache License 2.0                                                 |
 | ch.qos.logback                     | Eclipse Public License 1.0 & GNU Lesser General Public License 2.1 |
 | org.rdfhdt.hdt-jena                | GNU Lesser General Public License v3.0                             |

buildNumber.properties

@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
-#Tue Aug 20 11:41:33 CEST 2019
-buildNumber0=137
+#Tue Nov 19 11:48:03 CET 2019
+buildNumber0=144

dependency-reduced-pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>be.ugent.rml</groupId>
   <artifactId>rmlmapper</artifactId>
-  <version>4.5.0</version>
+  <version>4.5.1</version>
   <scm>
     <connection>scm:git:ssh://[email protected]:RMLio/rmlmapper-java.git</connection>
     <url>https://github.com/RMLio/rmlmapper-java</url>
@@ -41,6 +41,7 @@
         </executions>
         <configuration>
           <reportOutputDirectory>docs</reportOutputDirectory>
+          <locale>en</locale>
         </configuration>
       </plugin>
       <plugin>
@@ -176,9 +177,9 @@
     </dependency>
   </dependencies>
   <properties>
+    <maven.compiler.target>8</maven.compiler.target>
     <maven.compiler.source>8</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.target>8</maven.compiler.target>
     <junit.version>4.12</junit.version>
   </properties>
 </project>