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/17 18:36:23 UTC
[jena] branch geosparql updated (c2a8f30 -> 2f25e41)
This is an automated email from the ASF dual-hosted git repository.
andy pushed a change to branch geosparql
in repository https://gitbox.apache.org/repos/asf/jena.git.
from c2a8f30 JENA-664: Move module jena-fuseki-geosparql under jena-fuseki2
new 57f446b JENA-664: Code NOTICE and dist NOTICE
new 2f25e41 JENA-664: Run tests only for java8
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
NOTICE | 3 +
.../src/main/resources/META-INF/NOTICE | 22 ++
jena-geosparql/pom.xml | 308 +++++++++++----------
3 files changed, 192 insertions(+), 141 deletions(-)
copy jena-fuseki2/{jena-fuseki-server => jena-fuseki-geosparql}/src/main/resources/META-INF/NOTICE (87%)
[jena] 02/02: JENA-664: Run tests only for java8
Posted by an...@apache.org.
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 2f25e4111ea4719dc1b8baf27f5fee05a44258bc
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Fri May 17 19:36:10 2019 +0100
JENA-664: Run tests only for java8
---
jena-geosparql/pom.xml | 308 +++++++++++++++++++++++++++----------------------
1 file changed, 167 insertions(+), 141 deletions(-)
diff --git a/jena-geosparql/pom.xml b/jena-geosparql/pom.xml
index 78fd230..c792d49 100644
--- a/jena-geosparql/pom.xml
+++ b/jena-geosparql/pom.xml
@@ -15,149 +15,175 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jena-geosparql</artifactId>
- <packaging>jar</packaging>
- <name>Apache Jena - GeoSPARQL Engine</name>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jena-geosparql</artifactId>
+ <packaging>jar</packaging>
+ <name>Apache Jena - GeoSPARQL Engine</name>
+ <version>3.12.0-SNAPSHOT</version>
+
+ <parent>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena</artifactId>
<version>3.12.0-SNAPSHOT</version>
-
- <parent>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena</artifactId>
- <version>3.12.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
-
- <description>GeoSPARQL implementation for Apache Jena</description>
-
- <properties>
- <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
- <build.time.xsd>${maven.build.timestamp}</build.time.xsd>
- <automatic.module.name>org.apache.jena.jena-geosparql</automatic.module.name>
- </properties>
-
- <dependencies>
-
- <!-- Non-free; testing only -->
- <dependency>
- <groupId>org.apache.sis.non-free</groupId>
- <artifactId>sis-embedded-data</artifactId>
- <version>0.8</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.3.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-arq</artifactId>
- <version>3.12.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.sis.core</groupId>
- <artifactId>sis-referencing</artifactId>
- <version>0.8</version>
- </dependency>
-
- <dependency>
- <groupId>org.locationtech.jts</groupId>
- <artifactId>jts-core</artifactId>
- <version>1.16.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jdom2</artifactId>
- <version>2.0.6</version>
- </dependency>
-
- <dependency>
- <groupId>io.github.galbiston</groupId>
- <artifactId>expiring-map</artifactId>
- <version>1.0.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-collections4</artifactId>
- </dependency>
-
- </dependencies>
-
- <build>
-
+ <relativePath>..</relativePath>
+ </parent>
+
+ <description>GeoSPARQL implementation for Apache Jena</description>
+
+ <properties>
+ <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
+ <build.time.xsd>${maven.build.timestamp}</build.time.xsd>
+ <automatic.module.name>org.apache.jena.jena-geosparql</automatic.module.name>
+ </properties>
+
+ <dependencies>
+
+ <!-- Non-free; testing only -->
+ <dependency>
+ <groupId>org.apache.sis.non-free</groupId>
+ <artifactId>sis-embedded-data</artifactId>
+ <version>0.8</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-arq</artifactId>
+ <version>3.12.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.sis.core</groupId>
+ <artifactId>sis-referencing</artifactId>
+ <version>0.8</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.locationtech.jts</groupId>
+ <artifactId>jts-core</artifactId>
+ <version>1.16.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom2</artifactId>
+ <version>2.0.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>io.github.galbiston</groupId>
+ <artifactId>expiring-map</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ </dependency>
+
+ </dependencies>
+
+ <profiles>
+ <!-- Tests: Java8 only
+ A change in the doubles is current resulting in
+ test failures on precision but the test is string based
+ of WKT.
+ -->
+ <profile>
+ <id>java-after-8</id>
+ <activation>
+ <jdk>[1.9,)</jdk>
+ </activation>
+ <build>
<plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
-
- <executions>
- <execution>
- <id>attach-sources</id>
- <!-- <phase>package</phase> package is the default -->
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- <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-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <Automatic-Module-Name>${automatic.module.name}</Automatic-Module-Name>
- </manifestEntries>
- </archive>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <version>true</version>
- <show>public</show>
- <quiet>true</quiet>
- <encoding>UTF-8</encoding>
- <windowtitle>Apache Jena GeoSPARQL</windowtitle>
- <doctitle>Apache Jena GeoSPARQL ${project.version}</doctitle>
- <bottom>Licenced under the Apache License, Version 2.0</bottom>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
- </build>
+ </build>
+ </profile>
+ </profiles>
+
+ <build>
+
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ </plugin>
+
+ <!-- See profile. -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <!-- <phase>package</phase> package is the default -->
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ <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-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Automatic-Module-Name>${automatic.module.name}</Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <version>true</version>
+ <show>public</show>
+ <quiet>true</quiet>
+ <encoding>UTF-8</encoding>
+ <windowtitle>Apache Jena GeoSPARQL</windowtitle>
+ <doctitle>Apache Jena GeoSPARQL ${project.version}</doctitle>
+ <bottom>Licenced under the Apache License, Version 2.0</bottom>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
[jena] 01/02: JENA-664: Code NOTICE and dist NOTICE
Posted by an...@apache.org.
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 57f446b6f4a05f7b2550391eca5888037d345c7a
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Fri May 17 19:35:41 2019 +0100
JENA-664: Code NOTICE and dist NOTICE
---
NOTICE | 3 +
.../src/main/resources/META-INF/NOTICE | 176 +++++++++++++++++++++
2 files changed, 179 insertions(+)
diff --git a/NOTICE b/NOTICE
index 7cac6f2..1d403ae 100644
--- a/NOTICE
+++ b/NOTICE
@@ -19,3 +19,6 @@ This product includes software developed by Mort Bay Consulting Pty. Ltd.
Portions of this software are from Apache Xerces and were originally based on the following:
- software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
- software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
+
+This product includes software developed at the Open Geospatial Consortium:
+http://www.opengeospatial.org/ogc/software
diff --git a/jena-fuseki2/jena-fuseki-geosparql/src/main/resources/META-INF/NOTICE b/jena-fuseki2/jena-fuseki-geosparql/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000..c54f5f2
--- /dev/null
+++ b/jena-fuseki2/jena-fuseki-geosparql/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,176 @@
+- - - - - - - - - - - - - - - - - - - - - - -
+
+This product bundles "Simple Logging Facade for Java (SLF4J)", which is available under an
+MIT license (MIT). See https://www.slf4j.org/license.html
+
+- - - - - - - - - - - - - - - - - - - - - - -
+
+This product bundles "LatencyUtils"
+which is available under a "BSD 2-Clause License" (BSD-2-Clause).
+See https://github.com/LatencyUtils/LatencyUtils/blob/master/LICENSE
+
+This product bundles "HdrHistogram"
+which is available under a "BSD 2-Clause License" (BSD-2-Clause).
+See https://github.com/HdrHistogram/HdrHistogram/blob/master/LICENSE.txt
+
+- - - - - - - - - - - - - - - - - - - - - - -
+
+This product bundles "jsonld-java" , which is available under a
+BSD licnese (BSD-3-Clause). See
+https://github.com/jsonld-java/jsonld-java/blob/master/LICENCE
+
+- - - - - - - - - - - - - - - - - - - - - - -
+
+This product bundles "Dexx Collections", which is available under an
+MIT license (MIT). See https://github.com/andrewoma/dexx/blob/master/LICENSE.txt
+
+"Dexx Collections" includes following NOTICE
+----------
+Portions based on code from the Scala standard library.
+Copyright (c) 2002-2014 EPFL
+Copyright (c) 2011-2014 Typesafe, Inc.
+Licensed under BSD-style license (see licenses/LICENSE_Scala.txt)
+----------
+
+- - - - - - - - - - - - - - - - - - - - - - -
+
+This product includes the following binary code:
+
+javax.xml.bind:jaxb-api
+Licensed under CDDL-1.1 (https://spdx.org/licenses/CDDL-1.1.html)
+
+javax.activation:javax.activation-api
+Licensed under CDDL-1.0 (https://spdx.org/licenses/CDDL-1.0.html)
+
+javax.measure:unit-api
+Licensed under BSD-3-Clause
+https://github.com/unitsofmeasurement/unit-api/LICENSE
+
+Open Geospatial Consortium - software license
+http://www.opengeospatial.org/ogc/software
+ org.opengis:geoapi:jar
+ geosparql_vocab_all_v1_0_1_updated.rdf
+
+org.jdom:jdom2
+License https://github.com/hunterhacker/jdom/blob/master/LICENSE.txt
+
+- - - - - - - - - - - - - - - - - - - - - - -
+
+==============================================================
+ Jetty Web Container
+ Copyright 1995-2019 Mort Bay Consulting Pty Ltd.
+==============================================================
+
+The Jetty Web Container is Copyright Mort Bay Consulting Pty Ltd
+unless otherwise noted.
+
+Jetty is dual licensed under both
+
+ * The Apache 2.0 License
+ http://www.apache.org/licenses/LICENSE-2.0.html
+
+ and
+
+ * The Eclipse Public 1.0 License
+ http://www.eclipse.org/legal/epl-v10.html
+
+Jetty may be distributed under either license.
+
+------
+Eclipse
+
+The following artifacts are EPL.
+ * org.eclipse.jetty.orbit:org.eclipse.jdt.core
+
+The following artifacts are EPL and ASL2.
+ * org.eclipse.jetty.orbit:javax.security.auth.message
+
+
+The following artifacts are EPL and CDDL 1.0.
+ * org.eclipse.jetty.orbit:javax.mail.glassfish
+
+
+------
+Oracle
+
+The following artifacts are CDDL + GPLv2 with classpath exception.
+https://glassfish.dev.java.net/nonav/public/CDDL+GPL.html
+
+ * javax.servlet:javax.servlet-api
+ * javax.annotation:javax.annotation-api
+ * javax.transaction:javax.transaction-api
+ * javax.websocket:javax.websocket-api
+
+------
+Oracle OpenJDK
+
+If ALPN is used to negotiate HTTP/2 connections, then the following
+artifacts may be included in the distribution or downloaded when ALPN
+module is selected.
+
+ * java.sun.security.ssl
+
+These artifacts replace/modify OpenJDK classes. The modififications
+are hosted at github and both modified and original are under GPL v2 with
+classpath exceptions.
+http://openjdk.java.net/legal/gplv2+ce.html
+
+
+------
+OW2
+
+The following artifacts are licensed by the OW2 Foundation according to the
+terms of http://asm.ow2.org/license.html
+
+org.ow2.asm:asm-commons
+org.ow2.asm:asm
+
+
+------
+Apache
+
+The following artifacts are ASL2 licensed.
+
+org.apache.taglibs:taglibs-standard-spec
+org.apache.taglibs:taglibs-standard-impl
+
+
+------
+MortBay
+
+The following artifacts are ASL2 licensed. Based on selected classes from
+following Apache Tomcat jars, all ASL2 licensed.
+
+org.mortbay.jasper:apache-jsp
+ org.apache.tomcat:tomcat-jasper
+ org.apache.tomcat:tomcat-juli
+ org.apache.tomcat:tomcat-jsp-api
+ org.apache.tomcat:tomcat-el-api
+ org.apache.tomcat:tomcat-jasper-el
+ org.apache.tomcat:tomcat-api
+ org.apache.tomcat:tomcat-util-scan
+ org.apache.tomcat:tomcat-util
+
+org.mortbay.jasper:apache-el
+ org.apache.tomcat:tomcat-jasper-el
+ org.apache.tomcat:tomcat-el-api
+
+
+------
+Mortbay
+
+The following artifacts are CDDL + GPLv2 with classpath exception.
+
+https://glassfish.dev.java.net/nonav/public/CDDL+GPL.html
+
+org.eclipse.jetty.toolchain:jetty-schemas
+
+------
+Assorted
+
+The UnixCrypt.java code implements the one way cryptography used by
+Unix systems for simple password protection. Copyright 1996 Aki Yoshida,
+modified April 2001 by Iris Van den Broeke, Daniel Deville.
+Permission to use, copy, modify and distribute UnixCrypt
+for non-commercial or commercial purposes and without fee is
+granted provided that the copyright notice appears in all copies.