You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2019/05/08 11:51:22 UTC
[jena] 01/08: Merge master into jena-geosparql
This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch geosparql
in repository https://gitbox.apache.org/repos/asf/jena.git
commit 2f75797ab8bb26c29c152bbdd8bd97402f99b649
Merge: 32bfee7 b58c56f
Author: Greg Albiston <46...@users.noreply.github.com>
AuthorDate: Mon May 6 16:53:37 2019 +0100
Merge master into jena-geosparql
Conflicts:
pom.xml
apache-jena/assembly-jena-zip.xml | 38 ---
apache-jena/pom.xml | 42 +---
jena-arq/DEPENDENCIES | 26 --
jena-arq/LICENSE | 202 ---------------
jena-arq/NOTICE | 11 -
.../jena/query/ParameterizedSparqlString.java | 178 ++++++++-----
.../java/org/apache/jena/riot/system/RiotLib.java | 41 +--
.../main/java/org/apache/jena/riot/web/HttpOp.java | 19 +-
.../org/apache/jena/sparql/core/GraphView.java | 18 +-
.../sparql/engine/iterator/QueryIterDistinct.java | 2 +-
.../jena/sparql/expr/nodevalue/NodeFunctions.java | 23 +-
jena-arq/src/main/resources/META-INF/DEPENDENCIES | 19 --
jena-arq/src/main/resources/META-INF/LICENSE | 202 ---------------
jena-arq/src/main/resources/META-INF/NOTICE | 11 -
.../org/apache/jena/sparql/expr/TestFunctions.java | 2 +-
...Graph2.java => AbstractTestGraphAddDelete.java} | 3 +-
...ng2.java => AbstractTestPrefixMappingView.java} | 3 +-
.../jena/web/AbstractTestDatasetGraphAccessor.java | 2 +-
.../java/org/apache/jena/atlas/iterator/Iter.java | 54 +++-
jena-cmds/src/main/java/riotcmd/CmdLangParse.java | 7 +-
jena-cmds/src/main/java/tdb2/tdbcompact.java | 2 +-
jena-core/DEPENDENCIES | 17 --
jena-core/LICENSE | 236 ------------------
jena-core/NOTICE | 18 --
jena-core/src/main/resources/META-INF/DEPENDENCIES | 17 --
jena-core/src/main/resources/META-INF/LICENSE | 236 ------------------
jena-core/src/main/resources/META-INF/NOTICE | 14 --
jena-db/LICENSE | 202 ---------------
jena-db/NOTICE | 8 -
.../base/recordbuffer/RecordRangeIterator.java | 2 -
jena-db/jena-dboe-storage/pom.xml | 81 ++++++
.../org/apache/jena/dboe/storage/DatabaseRDF.java | 39 +++
.../apache/jena/dboe/storage/StoragePrefixes.java | 82 ++++++
.../org/apache/jena/dboe/storage/StorageRDF.java | 252 +++++++++++++++++++
.../org/apache/jena/dboe/storage/migrate/M.java | 65 +++++
.../jena/dboe/storage/migrate/StreamOps.java | 58 +++++
.../jena/dboe/storage/prefixes/PrefixEntry.java | 42 ++++
.../jena/dboe/storage/prefixes/PrefixLib.java | 99 ++++++++
.../jena/dboe/storage/prefixes/PrefixMapBase.java | 124 ++++++++++
.../jena/dboe/storage/prefixes/PrefixMapI.java | 104 ++++++++
.../storage/prefixes/PrefixMapOverPrefixMapI.java | 105 ++++++++
.../storage/prefixes/PrefixMapStorageSimple.java | 74 ++++++
.../prefixes/PrefixMappingOverPrefixMapI.java | 145 +++++++++++
.../dboe/storage/prefixes/PrefixesFactory.java | 62 +++++
.../dboe/storage/prefixes/StoragePrefixMap.java | 79 ++++++
.../storage/prefixes/StoragePrefixesEmpty.java | 74 ++++++
.../dboe/storage/prefixes/StoragePrefixesView.java | 108 ++++++++
.../apache/jena/dboe/storage/simple/SimpleDB.java | 34 ++-
.../jena/dboe/storage/simple/StorageMem.java | 28 +++
.../dboe/storage/simple/StoragePrefixesMem.java | 120 +++++++++
.../jena/dboe/storage/simple/StorageTuples.java | 116 +++++++++
.../jena/dboe/storage/simple/StorageTuplesN.java | 86 +++++++
.../dboe/storage/system/DatasetGraphStorage.java | 182 ++++++++++++++
.../jena/dboe/storage/system/GraphViewStorage.java | 71 ++++++
.../jena/dboe/storage/system/StorageLib.java | 80 ++++++
.../org/apache/jena/dboe/storage/TC_StoreBase.java | 34 +--
.../AbstractTestDatasetPrefixesStorage.java | 85 +++++++
.../jena/dboe/storage/prefixes/TS_Prefixes.java | 37 +++
.../storage/prefixes/TestDatasetPrefixesMem.java | 38 +++
.../jena/dboe/storage/prefixes/TestPrefixLib.java | 95 +++++++
.../prefixes/TestPrefixMapOverPrefixMapI.java | 26 +-
.../TestPrefixMappingOverDatasetPrefixes.java | 41 +++
.../TestPrefixMappingOverDatasetPrefixes2.java | 44 ++++
.../prefixes/TestPrefixMappingOverPrefixMap.java | 39 +++
.../dboe/storage/storage/BaseTestStorageRDF.java | 131 ++++++++++
.../jena/dboe/storage/storage/TS_Storage.java | 30 +++
.../storage/TestDatasetGraphStorageFindTests.java | 28 +++
.../storage/TestDatasetGraphStorageTests.java | 28 +++
.../dboe/storage/storage/TestStorageSimple.java | 30 +++
.../jena/dboe/trans/bplustree/BPlusTree.java | 32 +--
.../org/apache/jena/dboe/trans/bplustree/Mode.java | 32 +--
.../jena/dboe/trans/data/TransBinaryDataFile.java | 6 +-
.../org/apache/jena/dboe/trans/data/TransBlob.java | 4 +-
.../apache/jena/dboe/transaction/TransInteger.java | 4 +-
.../dboe/transaction/txn}/IteratorTxnTracker.java | 6 +-
.../jena/dboe/transaction/txn/Transaction.java | 11 +
.../txn/TransactionalComponentLifecycle.java | 92 ++-----
.../src/main/java/org/apache/jena/tdb2/TDB2.java | 2 +-
.../org/apache/jena/tdb2/setup/TDBBuilder.java | 2 +-
.../apache/jena/tdb2/store/DatasetGraphTDB.java | 41 +--
.../jena/tdb2/store/GraphViewSwitchable.java | 4 +-
.../tdb2/store/IteratorCheckNotConcurrent.java | 93 -------
.../jena/tdb2/store/nodetable/NodeTableCache.java | 3 -
.../apache/jena/tdb2/sys/DatabaseConnection.java | 3 +-
.../jena/tdb2/graph/TestPrefixMappingTDB.java | 4 +-
.../apache/jena/tdb2/store/TestGraphNamedTDB.java | 4 +-
.../org/apache/jena/tdb2/store/TestGraphTDB.java | 4 +-
jena-db/pom.xml | 1 +
jena-elephas/LICENSE | 176 -------------
jena-elephas/NOTICE | 5 -
jena-elephas/pom.xml | 16 +-
.../apache/jena/fuseki/build/FusekiBuildLib.java | 10 +-
.../org/apache/jena/fuseki/build/FusekiConst.java | 1 +
.../jena/fuseki/ctl/ActionContainerItem.java | 2 +-
.../org/apache/jena/fuseki/ctl/ActionStats.java | 24 +-
.../org/apache/jena/fuseki/server/DataService.java | 12 +
.../jena/fuseki/servlets/SPARQL_QueryDataset.java | 5 +-
.../org/apache/jena/fuseki/main/FusekiServer.java | 58 +++--
.../java/org/apache/jena/fuseki/TestAdmin.java | 24 +-
jena-integration-tests/LICENSE | 177 -------------
jena-integration-tests/NOTICE | 4 -
jena-iri/DEPENDENCIES | 13 -
jena-iri/LICENSE | 175 -------------
jena-iri/NOTICE | 11 -
jena-iri/src/main/resources/META-INF/DEPENDENCIES | 13 -
jena-iri/src/main/resources/META-INF/LICENSE | 175 -------------
jena-iri/src/main/resources/META-INF/NOTICE | 11 -
jena-jdbc/LICENSE | 275 ---------------------
jena-jdbc/NOTICE | 10 -
jena-jdbc/jena-jdbc-driver-bundle/LICENSE | 275 ---------------------
jena-jdbc/jena-jdbc-driver-bundle/NOTICE | 10 -
jena-jdbc/jena-jdbc-driver-mem/LICENSE | 275 ---------------------
jena-jdbc/jena-jdbc-driver-mem/NOTICE | 10 -
jena-jdbc/jena-jdbc-driver-remote/LICENSE | 275 ---------------------
jena-jdbc/jena-jdbc-driver-remote/NOTICE | 10 -
jena-jdbc/jena-jdbc-driver-tdb/LICENSE | 275 ---------------------
jena-jdbc/jena-jdbc-driver-tdb/NOTICE | 10 -
jena-maven-tools/LICENSE | 202 ---------------
jena-maven-tools/pom.xml | 6 +-
jena-permissions/LICENSE | 202 ---------------
jena-permissions/NOTICE | 9 -
jena-rdfconnection/LICENSE | 177 -------------
jena-rdfconnection/NOTICE | 5 -
jena-sdb/LICENSE | 202 ---------------
jena-sdb/NOTICE | 11 -
jena-sdb/src/main/resources/META-INF/DEPENDENCIES | 19 --
jena-sdb/src/main/resources/META-INF/LICENSE | 202 ---------------
jena-sdb/src/main/resources/META-INF/NOTICE | 11 -
jena-shaded-guava/DEPENDENCIES | 2 -
jena-shaded-guava/LICENSE | 175 -------------
jena-spatial/DEPENDENCIES | 25 --
jena-spatial/LICENSE | 202 ---------------
jena-spatial/NOTICE | 5 -
jena-spatial/src/main/resources/META-INF/NOTICE | 5 -
jena-tdb/DEPENDENCIES | 16 --
jena-tdb/LICENSE | 175 -------------
jena-tdb/NOTICE | 11 -
.../apache/jena/tdb/store/DatasetPrefixesTDB.java | 7 +-
jena-tdb/src/main/resources/META-INF/DEPENDENCIES | 19 --
jena-tdb/src/main/resources/META-INF/LICENSE | 175 -------------
jena-tdb/src/main/resources/META-INF/NOTICE | 11 -
.../jena/tdb/graph/TestPrefixMappingTDB.java | 4 +-
.../apache/jena/tdb/store/TestGraphNamedTDB.java | 4 +-
.../org/apache/jena/tdb/store/TestGraphTDB.java | 4 +-
jena-text-es/LICENSE | 202 ---------------
jena-text-es/NOTICE | 5 -
jena-text-es/src/main/resources/META-INF/LICENSE | 202 ---------------
jena-text-es/src/main/resources/META-INF/NOTICE | 5 -
jena-text/LICENSE | 202 ---------------
jena-text/NOTICE | 5 -
.../apache/jena/query/text/TextIndexLucene.java | 3 +
jena-text/src/main/resources/META-INF/LICENSE | 202 ---------------
jena-text/src/main/resources/META-INF/NOTICE | 5 -
jena-text/src/test/resources/log4j.properties | 3 +
pom.xml | 196 ++++++++++++++-
155 files changed, 3578 insertions(+), 6674 deletions(-)
diff --cc pom.xml
index 160e21f,cfb23b3..32a71d2
--- a/pom.xml
+++ b/pom.xml
@@@ -767,370 -765,372 +767,564 @@@
unecessarily clutter so we exclude these
-->
<exclude>**/META-INF/services/*</exclude>
-
+
<!--
Jena historically has large numbers of small test file
- with no license headers. Such small files are not required
- to have headers.
-
- In addition, there are files with different Licenses
- (e.g. W3C Software Licence, W3C Test Suite License) as
- noted in the code tree.
- -->
- <exclude>**/src/test/resources/**/*</exclude>
- <exclude>**/testing/**/*</exclude>
-
- <exclude>**/log4j.properties</exclude>
- <exclude>**/log4j-testing.properties</exclude>
- <exclude>**/derby.log</exclude>
- <exclude>**/DB/**/*</exclude>
- <!-- TDB config files JSON - no comments allowed -->
- <exclude>**/tdb*.cfg</exclude>
- <!-- Fuseki2 server "run" area -->
- <exclude>**/run/**/*</exclude>
- <!-- Cached classpath for commands - autogenerated -->
- <exclude>**/*.classpath</exclude>
- <!-- Cached recommenders by Eclipse - autogenerated -->
- <exclude>**/*.recommenders/**/*</exclude>
-
- <!-- Exclude anything created during the build (plugin generated files) ->-->
- <exclude>**/target/**/*</exclude>
- <!-- MSHADE-124 -->
- <exclude>**/dependency-reduced-pom.xml</exclude>
- <exclude>.travis.yml</exclude>
- <exclude>jena-examples/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- </plugins>
+ with no license headers. Such small files are not required
+ to have headers.
+
+ In addition, there are files with different Licenses
+ (e.g. W3C Software Licence, W3C Test Suite License) as
+ noted in the code tree.
+ -->
+ <exclude>**/src/test/resources/**/*</exclude>
+ <exclude>**/testing/**/*</exclude>
+
+ <exclude>**/log4j.properties</exclude>
+ <exclude>**/log4j-testing.properties</exclude>
+ <exclude>**/derby.log</exclude>
+ <exclude>**/DB/**/*</exclude>
+ <!-- TDB config files JSON - no comments allowed -->
+ <exclude>**/tdb*.cfg</exclude>
+ <!-- Fuseki2 server "run" area -->
+ <exclude>**/run/**/*</exclude>
+ <!-- Cached classpath for commands - autogenerated -->
+ <exclude>**/*.classpath</exclude>
+ <!-- Cached recommenders by Eclipse - autogenerated -->
+ <exclude>**/*.recommenders/**/*</exclude>
+
+ <!-- Exclude anything created during the build (plugin generated files) ->-->
+ <exclude>**/target/**/*</exclude>
+ <!-- MSHADE-124 -->
+ <exclude>**/dependency-reduced-pom.xml</exclude>
+ <exclude>.travis.yml</exclude>
+ <exclude>jena-examples/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
- <!-- Plugin version list: http://maven.apache.org/plugins/index.html -->
- <pluginManagement>
- <plugins>
+ <!-- Plugin version list: http://maven.apache.org/plugins/index.html -->
+ <pluginManagement>
+ <plugins>
- <plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.1.0</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.0</version>
+ <configuration>
+ <showDeprecation>false</showDeprecation>
+ <encoding>UTF-8</encoding>
+ <debug>true</debug>
+ <debuglevel>source,lines,vars</debuglevel>
+ <optimize>true</optimize>
+ <source>${jdk.version}</source>
+ <target>${jdk.version}</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.22.1</version>
+ <!--
+ Bug: SUREFIRE-1588
+ https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911925
+ -->
+ <configuration>
+ <useSystemClassLoader>false</useSystemClassLoader>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ <!-- Only needed in some jars <execution> <id>attach-sources-test</id>
+ <goals> <goal>test-jar-no-fork</goal> </goals> </execution> -->
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.1.0</version>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <!-- Java 11: explicitly define the source as Java8 -->
+ <source>8</source>
+ <!-- Java 10
+ <additionalOptions>-html5</additionalOptions>
+ -->
+ <quiet>true</quiet>
+ <doclint>none</doclint>
+ <!-- To allow the build to keep going despite javadoc problems:
+ <failOnError>false</failOnError>
+ -->
+ <version>true</version>
+ <show>public</show>
+ <encoding>UTF-8</encoding>
+ <windowtitle>${project.name} ${project.version}</windowtitle>
+ <doctitle>${project.name} ${project.version}</doctitle>
+ <bottom>Licensed under the Apache License, Version 2.0</bottom>
+ <links>
+ <link>http://jena.apache.org/documentation/javadoc/jena/</link>
+ <link>http://jena.apache.org/documentation/javadoc/arq/</link>
+ <link>http://jena.apache.org/documentation/javadoc/tdb/</link>
+ <link>http://jena.apache.org/documentation/javadoc/text/</link>
+ <link>http://jena.apache.org/documentation/javadoc/rdfconnection/</link>
+ <link>http://jena.apache.org/documentation/javadoc/fuseki2/</link>
+ <link>http://jena.apache.org/documentation/javadoc/permissions/</link>
+ <link>http://jena.apache.org/documentation/javadoc/jdbc/</link>
+ </links>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+
+ <!-- Temp fix for remote-resources while waiting for remote-resources >1.5
+ 1.6 should fix this - SNAPSHOT already does.
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.5</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-filtering</artifactId>
+ <version>1.2</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <configuration>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteIfNewer>true</overWriteIfNewer>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>3.0.0-M1</version>
+ <executions>
+ <execution>
+ <id>enforce</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <rules>
+ <requirePluginVersions>
+ <message>Best practice is to always define plugin versions!</message>
+ <banLatest>true</banLatest>
+ <banRelease>true</banRelease>
+ </requirePluginVersions>
+ <requireReleaseDeps>
+ <message>No SNAPSHOT dependencies are allowed!</message>
+ <onlyWhenRelease>true</onlyWhenRelease>
+ </requireReleaseDeps>
+ <DependencyConvergence />
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>4.2.0</version>
+ <extensions>true</extensions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>3.2.0</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>3.2.0</version>
+ </plugin>
+
+ <!--
+ Avoid the warnings and errors from m2e.
+ This plugin's configuration is used to store Eclipse m2e settings only.
+ It has no influence on the Maven build itself.
+ -->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <!--
+ Warning:
+ "maven-remote-resources-plugin (goal "process") is ignored by m2e."
+ -->
+ <pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <versionRange>[1.0.0,)</versionRange>
- <goals>
- <goal>enforce</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- <pluginExecution>
- <!--
- Warning:
- "maven-enforcer-plugin (goal "enforce") is ignored by m2e."
- -->
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <versionRange>[1.0.0,)</versionRange>
- <goals>
- <goal>process</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
-
- <pluginExecution>
- <!--
- Error:
- Plugin execution not covered by lifecycle configuration
- -->
- <pluginExecutionFilter>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <versionRange>[0.11,)</versionRange>
- <goals>
- <goal>check</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
-
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.xenei</groupId>
- <artifactId>contract-test-maven-plugin</artifactId>
- <versionRange>[0.1.5,)</versionRange>
- <goals>
- <goal>contract-test</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
-
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.1.0</version>
+ </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <reporting>
- <!-- <outputDirectory>${project.build.directory}/site</outputDirectory> -->
-
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <configuration>
- <outputDirectory>${project.basedir}/target/surefire-reports-html</outputDirectory>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.7</version>
- <configuration>
- <instrumentation>
- <ignores>
- <ignore>org.slf4j.*</ignore>
- </ignores>
- </instrumentation>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.0</version>
+ <configuration>
+ <showDeprecation>false</showDeprecation>
+ <encoding>UTF-8</encoding>
+ <debug>true</debug>
+ <debuglevel>source,lines,vars</debuglevel>
+ <optimize>true</optimize>
+ <source>${jdk.version}</source>
+ <target>${jdk.version}</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.22.1</version>
+ <!--
+ Bug: SUREFIRE-1588
+ https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911925
+ -->
+ <configuration>
+ <useSystemClassLoader>false</useSystemClassLoader>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ <!-- Only needed in some jars <execution> <id>attach-sources-test</id>
+ <goals> <goal>test-jar-no-fork</goal> </goals> </execution> -->
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.0.1</version>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <!-- Java 10
+ <additionalOptions>-html5</additionalOptions>
+ -->
+ <quiet>true</quiet>
+ <doclint>none</doclint>
+ <!-- To allow the build to keep going despite javadoc problems:
+ <failOnError>false</failOnError>
+ -->
+ <version>true</version>
+ <show>public</show>
+ <encoding>UTF-8</encoding>
+ <windowtitle>${project.name} ${project.version}</windowtitle>
+ <doctitle>${project.name} ${project.version}</doctitle>
+ <bottom>Licensed under the Apache License, Version 2.0</bottom>
+ <links>
+ <link>http://jena.apache.org/documentation/javadoc/jena/</link>
+ <link>http://jena.apache.org/documentation/javadoc/arq/</link>
+ <link>http://jena.apache.org/documentation/javadoc/tdb/</link>
+ <link>http://jena.apache.org/documentation/javadoc/text/</link>
+ <link>http://jena.apache.org/documentation/javadoc/rdfconnection/</link>
+ <link>http://jena.apache.org/documentation/javadoc/fuseki2/</link>
+ <link>http://jena.apache.org/documentation/javadoc/permissions/</link>
+ <link>http://jena.apache.org/documentation/javadoc/jdbc/</link>
+ </links>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+
+ <!-- Temp fix for remote-resources while waiting for remote-resources >1.5
+ 1.6 should fix this - SNAPSHOT already does.
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.5</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-filtering</artifactId>
+ <version>1.2</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <configuration>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteIfNewer>true</overWriteIfNewer>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>3.0.0-M1</version>
+ <executions>
+ <execution>
+ <id>enforce</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <rules>
+ <requirePluginVersions>
+ <message>Best practice is to always define plugin versions!</message>
+ <banLatest>true</banLatest>
+ <banRelease>true</banRelease>
+ </requirePluginVersions>
+ <requireReleaseDeps>
+ <message>No SNAPSHOT dependencies are allowed!</message>
+ <onlyWhenRelease>true</onlyWhenRelease>
+ </requireReleaseDeps>
+ <DependencyConvergence />
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.5.3</version>
+ <extensions>true</extensions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>3.2.0</version>
+ </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>2.5</version>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>3.2.0</version>
+ </plugin>
+
+ <!--
+ Avoid the warnings and errors from m2e.
+ This plugin's configuration is used to store Eclipse m2e settings only.
+ It has no influence on the Maven build itself.
+ -->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <!--
+ Warning:
+ "maven-remote-resources-plugin (goal "process") is ignored by m2e."
+ -->
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <versionRange>[1.0.0,)</versionRange>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <!--
+ Warning:
+ "maven-enforcer-plugin (goal "enforce") is ignored by m2e."
+ -->
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <versionRange>[1.0.0,)</versionRange>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+
+ <pluginExecution>
+ <!--
+ Error:
+ Plugin execution not covered by lifecycle configuration
+ -->
+ <pluginExecutionFilter>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <versionRange>[0.11,)</versionRange>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.xenei</groupId>
+ <artifactId>contract-test-maven-plugin</artifactId>
+ <versionRange>[0.1.5,)</versionRange>
+ <goals>
+ <goal>contract-test</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <reporting>
+ <!-- <outputDirectory>${project.build.directory}/site</outputDirectory> -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>3.8</version>
- <configuration>
- <linkXref>true</linkXref>
- <sourceEncoding>utf-8</sourceEncoding>
- <minimumTokens>100</minimumTokens>
- </configuration>
- </plugin>
+ <plugins>
- <plugin>
- <groupId>com.github.spotbugs</groupId>
- <artifactId>spotbugs-maven-plugin</artifactId>
- <version>3.1.1</version>
- </plugin>
- </plugins>
- </reporting>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <configuration>
+ <outputDirectory>${project.basedir}/target/surefire-reports-html</outputDirectory>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.7</version>
+ <configuration>
+ <instrumentation>
+ <ignores>
+ <ignore>org.slf4j.*</ignore>
+ </ignores>
+ </instrumentation>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.17</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>3.8</version>
+ <configuration>
+ <linkXref>true</linkXref>
+ <sourceEncoding>utf-8</sourceEncoding>
+ <minimumTokens>100</minimumTokens>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
+ <version>3.1.1</version>
+ </plugin>
+ </plugins>
+ </reporting>
</project>