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 2021/08/24 09:06:00 UTC
[jena] branch main updated: JENA-1948: Include Titanium and
dependencies
This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
The following commit(s) were added to refs/heads/main by this push:
new ffa535a JENA-1948: Include Titanium and dependencies
new 0474381b Merge pull request #1050 from afs/jsonld-3
ffa535a is described below
commit ffa535a2b14a9501b76fa350437c51b8187a8565
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Thu Aug 19 21:39:24 2021 +0100
JENA-1948: Include Titanium and dependencies
---
apache-jena/dist/LICENSE | 12 ++++++++++++
jena-arq/pom.xml | 5 +----
jena-fuseki2/apache-jena-fuseki/dist/LICENSE | 12 +++++++++++-
pom.xml | 5 +----
4 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/apache-jena/dist/LICENSE b/apache-jena/dist/LICENSE
index 03cb600..99cc918 100644
--- a/apache-jena/dist/LICENSE
+++ b/apache-jena/dist/LICENSE
@@ -272,3 +272,15 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
+Jakarta JSON Processing (JSON-P)
+https://eclipse-ee4j.github.io/jsonp/
+
+is licensed under the Eclipse Public License 2.0.
+http://www.eclipse.org/legal/epl-2.0
+
+org.glassfish:jakarta.json
+is licensed under the Eclipse Public License 2.0.
+http://www.eclipse.org/legal/epl-2.0
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
diff --git a/jena-arq/pom.xml b/jena-arq/pom.xml
index c7e2ece..31c0241 100644
--- a/jena-arq/pom.xml
+++ b/jena-arq/pom.xml
@@ -74,19 +74,16 @@
<!-- Apache License -->
<groupId>com.apicatalog</groupId>
<artifactId>titanium-json-ld</artifactId>
- <scope>provided</scope>
</dependency>
<!-- Eclipse Public License 2.0 (category-B) -->
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-api</artifactId>
- <scope>provided</scope>
</dependency>
- <!-- And an implementation : Eclipse Public License 2.0 (category-B) -->
+ <!-- Eclipse Public License 2.0 (category-B) -->
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.json</artifactId>
- <scope>provided</scope>
</dependency>
<!-- End Titanium JSON-LD 1.1 -->
diff --git a/jena-fuseki2/apache-jena-fuseki/dist/LICENSE b/jena-fuseki2/apache-jena-fuseki/dist/LICENSE
index 10474ab..2214770 100644
--- a/jena-fuseki2/apache-jena-fuseki/dist/LICENSE
+++ b/jena-fuseki2/apache-jena-fuseki/dist/LICENSE
@@ -230,6 +230,16 @@ http://www.slf4j.org/license.html
- - - - - - - - - - - - - - - - - - - - - - -
+Jakarta JSON Processing (JSON-P)
+https://eclipse-ee4j.github.io/jsonp/
+
+is licensed under the Eclipse Public License 2.0.
+http://www.eclipse.org/legal/epl-2.0
+
+org.glassfish:jakarta.json
+is licensed under the Eclipse Public License 2.0.
+http://www.eclipse.org/legal/epl-2.0
+
==============================================================
Jetty Web Container
Copyright 1995-2012 Mort Bay Consulting Pty Ltd.
@@ -614,4 +624,4 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+---
diff --git a/pom.xml b/pom.xml
index 1ecd377..853f0e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -438,27 +438,24 @@
</dependency>
<!-- JSON-LD 1.1 read support -->
- <!-- Titanium JSON-LD scope=provided -->
+ <!-- Titanium JSON-LD -->
<dependency>
<!-- Apache License -->
<groupId>com.apicatalog</groupId>
<artifactId>titanium-json-ld</artifactId>
<version>1.1.0</version>
- <scope>provided</scope>
</dependency>
<!-- Eclipse Public License 2.0 (category-B) -->
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-api</artifactId>
<version>2.0.1</version>
- <scope>provided</scope>
</dependency>
<!-- Eclipse Public License 2.0 (category-B) -->
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.json</artifactId>
<version>2.0.1</version>
- <scope>provided</scope>
</dependency>
<!-- End JSON-LD 1.1 read support -->