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 2018/04/18 15:44:48 UTC
[1/4] jena git commit: [JENA-1525] Add to
for each jar module
Repository: jena
Updated Branches:
refs/heads/master 5a4883e39 -> 58a942b24
[JENA-1525] Add <Automatic-Module-Name> to <manifestEntries> for each jar module
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/188e00e3
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/188e00e3
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/188e00e3
Branch: refs/heads/master
Commit: 188e00e3be792e71e4839d5db269fbde71468c4c
Parents: bea3495
Author: Christopher Hanna Johnson <ch...@gmail.com>
Authored: Sun Apr 15 20:32:11 2018 +0200
Committer: Christopher Hanna Johnson <ch...@gmail.com>
Committed: Sun Apr 15 20:48:22 2018 +0200
----------------------------------------------------------------------
jena-arq/pom.xml | 27 +++++++++++++++++----------
jena-base/pom.xml | 11 +++++++++++
jena-cmds/pom.xml | 10 +++++++++-
jena-core/pom.xml | 8 ++++++++
jena-csv/pom.xml | 8 ++++++++
jena-db/pom.xml | 13 ++++++++++++-
jena-rdfconnection/pom.xml | 11 +++++++++++
jena-spatial/pom.xml | 8 ++++++++
jena-tdb/pom.xml | 8 ++++++++
jena-text-es/pom.xml | 8 ++++++++
jena-text/pom.xml | 8 ++++++++
11 files changed, 108 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/188e00e3/jena-arq/pom.xml
----------------------------------------------------------------------
diff --git a/jena-arq/pom.xml b/jena-arq/pom.xml
index 26431db..78d16c5 100644
--- a/jena-arq/pom.xml
+++ b/jena-arq/pom.xml
@@ -35,6 +35,7 @@
<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.arq</automatic.module.name>
</properties>
<dependencies>
@@ -66,7 +67,7 @@
<artifactId>jena-shaded-guava</artifactId>
<version>3.8.0-SNAPSHOT</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
@@ -82,15 +83,15 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient-cache</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
</dependency>
- <!--
- Intercept any uses of Jakarta Commons Logging
- e.g. Apache Common HTTP client.
+ <!--
+ Intercept any uses of Jakarta Commons Logging
+ e.g. Apache Common HTTP client.
-->
<dependency>
<groupId>org.slf4j</groupId>
@@ -140,10 +141,10 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
- <!--
- The test collections TC_General, TC_Riot, TC_Atlas
- are development support that collect the relevant
- tests for partial testing during development.
+ <!--
+ The test collections TC_General, TC_Riot, TC_Atlas
+ are development support that collect the relevant
+ tests for partial testing during development.
-->
<include>**/TS_*.java</include>
<include>**/TC_Scripted.java</include>
@@ -177,6 +178,13 @@
<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>
@@ -210,7 +218,6 @@
<bottom>Licenced under the Apache License, Version 2.0</bottom>
</configuration>
</plugin>
-
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/jena/blob/188e00e3/jena-base/pom.xml
----------------------------------------------------------------------
diff --git a/jena-base/pom.xml b/jena-base/pom.xml
index 5945802..6f77c48 100644
--- a/jena-base/pom.xml
+++ b/jena-base/pom.xml
@@ -32,6 +32,10 @@
This module contains non-RDF library code and the common system runtime.
</description>
+ <properties>
+ <automatic.module.name>org.apache.jena.base</automatic.module.name>
+ </properties>
+
<dependencies>
<dependency>
@@ -86,6 +90,13 @@
<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>
http://git-wip-us.apache.org/repos/asf/jena/blob/188e00e3/jena-cmds/pom.xml
----------------------------------------------------------------------
diff --git a/jena-cmds/pom.xml b/jena-cmds/pom.xml
index 3db2b74..58f8e70 100644
--- a/jena-cmds/pom.xml
+++ b/jena-cmds/pom.xml
@@ -49,7 +49,8 @@
<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>
+ <build.time.xsd>${maven.build.timestamp}</build.time.xsd>
+ <automatic.module.name>org.apache.jena.cmds</automatic.module.name>
</properties>
<dependencies>
@@ -162,6 +163,13 @@
<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>
http://git-wip-us.apache.org/repos/asf/jena/blob/188e00e3/jena-core/pom.xml
----------------------------------------------------------------------
diff --git a/jena-core/pom.xml b/jena-core/pom.xml
index 37648ff..48de2b1 100644
--- a/jena-core/pom.xml
+++ b/jena-core/pom.xml
@@ -36,6 +36,7 @@
<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.core</automatic.module.name>
</properties>
<dependencies>
@@ -214,6 +215,13 @@
<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>
http://git-wip-us.apache.org/repos/asf/jena/blob/188e00e3/jena-csv/pom.xml
----------------------------------------------------------------------
diff --git a/jena-csv/pom.xml b/jena-csv/pom.xml
index 8d5e047..c0b7d77 100644
--- a/jena-csv/pom.xml
+++ b/jena-csv/pom.xml
@@ -35,6 +35,7 @@
<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.csv</automatic.module.name>
</properties>
<dependencies>
@@ -93,6 +94,13 @@
<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>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/jena/blob/188e00e3/jena-db/pom.xml
----------------------------------------------------------------------
diff --git a/jena-db/pom.xml b/jena-db/pom.xml
index 6338b98..363d2a9 100644
--- a/jena-db/pom.xml
+++ b/jena-db/pom.xml
@@ -32,7 +32,11 @@
<version>3.8.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
-
+
+ <properties>
+ <automatic.module.name>org.apache.jena.db</automatic.module.name>
+ </properties>
+
<licenses>
<license>
<name>Apache License 2.0</name>
@@ -75,6 +79,13 @@
<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>
http://git-wip-us.apache.org/repos/asf/jena/blob/188e00e3/jena-rdfconnection/pom.xml
----------------------------------------------------------------------
diff --git a/jena-rdfconnection/pom.xml b/jena-rdfconnection/pom.xml
index 5d8ceb1..e7ee1ec 100644
--- a/jena-rdfconnection/pom.xml
+++ b/jena-rdfconnection/pom.xml
@@ -43,6 +43,10 @@
</license>
</licenses>
+ <properties>
+ <automatic.module.name>org.apache.jena.rdfconnection</automatic.module.name>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.jena</groupId>
@@ -136,6 +140,13 @@
<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>
http://git-wip-us.apache.org/repos/asf/jena/blob/188e00e3/jena-spatial/pom.xml
----------------------------------------------------------------------
diff --git a/jena-spatial/pom.xml b/jena-spatial/pom.xml
index eb03d1a..1d0143a 100644
--- a/jena-spatial/pom.xml
+++ b/jena-spatial/pom.xml
@@ -35,6 +35,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<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.spatial</automatic.module.name>
</properties>
<dependencies>
@@ -137,6 +138,13 @@
<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>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/jena/blob/188e00e3/jena-tdb/pom.xml
----------------------------------------------------------------------
diff --git a/jena-tdb/pom.xml b/jena-tdb/pom.xml
index c445f53..f61d75c 100644
--- a/jena-tdb/pom.xml
+++ b/jena-tdb/pom.xml
@@ -35,6 +35,7 @@
<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.tdb</automatic.module.name>
</properties>
<dependencies>
@@ -129,6 +130,13 @@
<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>
http://git-wip-us.apache.org/repos/asf/jena/blob/188e00e3/jena-text-es/pom.xml
----------------------------------------------------------------------
diff --git a/jena-text-es/pom.xml b/jena-text-es/pom.xml
index 61c6374..7cd18c5 100644
--- a/jena-text-es/pom.xml
+++ b/jena-text-es/pom.xml
@@ -34,6 +34,7 @@
<maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
<build.time.xsd>${maven.build.timestamp}</build.time.xsd>
<es.startup.timeout>90</es.startup.timeout>
+ <automatic.module.name>org.apache.jena.text.es</automatic.module.name>
</properties>
<dependencies>
@@ -171,6 +172,13 @@
<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>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/jena/blob/188e00e3/jena-text/pom.xml
----------------------------------------------------------------------
diff --git a/jena-text/pom.xml b/jena-text/pom.xml
index cd60067..c29ce30 100644
--- a/jena-text/pom.xml
+++ b/jena-text/pom.xml
@@ -33,6 +33,7 @@
<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.text</automatic.module.name>
</properties>
<dependencies>
@@ -128,6 +129,13 @@
<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>
</plugin>
<plugin>
[3/4] jena git commit: JENA-1525: Automatic module name for jena-iri
Posted by an...@apache.org.
JENA-1525: Automatic module name for jena-iri
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/ea336dff
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/ea336dff
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/ea336dff
Branch: refs/heads/master
Commit: ea336dff9364c8928b81f960beeee86843b4f8e7
Parents: f5cd5b0
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Apr 18 16:23:31 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Apr 18 16:44:14 2018 +0100
----------------------------------------------------------------------
jena-iri/pom.xml | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/ea336dff/jena-iri/pom.xml
----------------------------------------------------------------------
diff --git a/jena-iri/pom.xml b/jena-iri/pom.xml
index be13d02..b659439 100644
--- a/jena-iri/pom.xml
+++ b/jena-iri/pom.xml
@@ -35,6 +35,10 @@
The IRI module provides an implementation of the IRI and URI specifications (RFC 3987 and 3986) which are used across Jena in order to comply with relevant W3C specifications for RDF and SPARQL which require conformance to these specifications.
</description>
+ <properties>
+ <automatic.module.name>org.apache.jena.iri</automatic.module.name>
+ </properties>
+
<dependencies>
<dependency>
@@ -65,6 +69,18 @@
<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>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
[4/4] jena git commit: JENA-1525: Default module name o.a.j.jena-dboe;
own name for TDB2
Posted by an...@apache.org.
JENA-1525: Default module name o.a.j.jena-dboe; own name for TDB2
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/58a942b2
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/58a942b2
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/58a942b2
Branch: refs/heads/master
Commit: 58a942b24d35e245841a1007efb70e4b308e89be
Parents: ea336df
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Apr 18 16:44:37 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Apr 18 16:44:37 2018 +0100
----------------------------------------------------------------------
jena-db/jena-tdb2/pom.xml | 21 ++++++++++++++++++++-
jena-db/pom.xml | 5 ++++-
2 files changed, 24 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/58a942b2/jena-db/jena-tdb2/pom.xml
----------------------------------------------------------------------
diff --git a/jena-db/jena-tdb2/pom.xml b/jena-db/jena-tdb2/pom.xml
index 5e85252..1f61961 100644
--- a/jena-db/jena-tdb2/pom.xml
+++ b/jena-db/jena-tdb2/pom.xml
@@ -31,6 +31,11 @@
<version>3.8.0-SNAPSHOT</version>
</parent>
+ <properties>
+ <automatic.module.name>org.apache.jena.tdb2</automatic.module.name>
+ </properties>
+
+
<dependencies>
<dependency>
@@ -66,7 +71,20 @@
</dependencies>
<build>
- <plugins>
+ <plugins>
+
+ <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>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
@@ -76,6 +94,7 @@
</includes>
</configuration>
</plugin>
+
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/jena/blob/58a942b2/jena-db/pom.xml
----------------------------------------------------------------------
diff --git a/jena-db/pom.xml b/jena-db/pom.xml
index 363d2a9..694c8c9 100644
--- a/jena-db/pom.xml
+++ b/jena-db/pom.xml
@@ -34,7 +34,10 @@
</parent>
<properties>
- <automatic.module.name>org.apache.jena.db</automatic.module.name>
+ <!-- Default module name : override in a specific POM if not part of the "dboe" module.
+ e.g. jena-tdb2.
+ -->
+ <automatic.module.name>org.apache.jena.dboe</automatic.module.name>
</properties>
<licenses>
[2/4] jena git commit: JENA-1525: Merge commit 'refs/pull/400/head'
of https://github.com/apache/jena
Posted by an...@apache.org.
JENA-1525: Merge commit 'refs/pull/400/head' of https://github.com/apache/jena
This closes #400.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f5cd5b0d
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f5cd5b0d
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f5cd5b0d
Branch: refs/heads/master
Commit: f5cd5b0d1a6c4ea6b7cb254dd458987bb2a52141
Parents: 5a4883e 188e00e
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Apr 18 16:17:00 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Apr 18 16:17:00 2018 +0100
----------------------------------------------------------------------
jena-arq/pom.xml | 27 +++++++++++++++++----------
jena-base/pom.xml | 11 +++++++++++
jena-cmds/pom.xml | 10 +++++++++-
jena-core/pom.xml | 8 ++++++++
jena-csv/pom.xml | 8 ++++++++
jena-db/pom.xml | 13 ++++++++++++-
jena-rdfconnection/pom.xml | 11 +++++++++++
jena-spatial/pom.xml | 8 ++++++++
jena-tdb/pom.xml | 8 ++++++++
jena-text-es/pom.xml | 8 ++++++++
jena-text/pom.xml | 8 ++++++++
11 files changed, 108 insertions(+), 12 deletions(-)
----------------------------------------------------------------------