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 16:29:18 UTC
jena git commit: JENA-1525: More Automatic-Module-Name
Repository: jena
Updated Branches:
refs/heads/master 58a942b24 -> 928e70ff1
JENA-1525: More Automatic-Module-Name
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/928e70ff
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/928e70ff
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/928e70ff
Branch: refs/heads/master
Commit: 928e70ff11c96feb2096adbdf49ebb3fa194d11d
Parents: 58a942b
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Apr 18 17:26:58 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Apr 18 17:26:58 2018 +0100
----------------------------------------------------------------------
jena-db/jena-tdb2/pom.xml | 1 -
jena-elephas/pom.xml | 14 +-
jena-fuseki1/pom.xml | 9 +-
jena-jdbc/pom.xml | 15 ++
jena-permissions/pom.xml | 387 +++++++++++++++++++++--------------------
jena-sdb/pom.xml | 13 +-
jena-shaded-guava/pom.xml | 12 +-
7 files changed, 259 insertions(+), 192 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/928e70ff/jena-db/jena-tdb2/pom.xml
----------------------------------------------------------------------
diff --git a/jena-db/jena-tdb2/pom.xml b/jena-db/jena-tdb2/pom.xml
index 1f61961..ee9d512 100644
--- a/jena-db/jena-tdb2/pom.xml
+++ b/jena-db/jena-tdb2/pom.xml
@@ -35,7 +35,6 @@
<automatic.module.name>org.apache.jena.tdb2</automatic.module.name>
</properties>
-
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/jena/blob/928e70ff/jena-elephas/pom.xml
----------------------------------------------------------------------
diff --git a/jena-elephas/pom.xml b/jena-elephas/pom.xml
index cb44067..88d9f8a 100644
--- a/jena-elephas/pom.xml
+++ b/jena-elephas/pom.xml
@@ -42,6 +42,7 @@ limitations under the License.
<plugin.compiler.version>2.6.0</plugin.compiler.version>
<mrunit.version>1.1.0</mrunit.version>
<airline.version>2.1.1</airline.version>
+ <automatic.module.name>org.apache.jena.elephas</automatic.module.name>
</properties>
<!-- Profiles to allow building for different Hadoop versions -->
@@ -59,7 +60,18 @@ limitations under the License.
</profiles>
<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-enforcer-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/jena/blob/928e70ff/jena-fuseki1/pom.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki1/pom.xml b/jena-fuseki1/pom.xml
index 8ed2180..b2d45ec 100644
--- a/jena-fuseki1/pom.xml
+++ b/jena-fuseki1/pom.xml
@@ -57,7 +57,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>
-
+ <automatic.module.name>org.apache.jena.fuseki1</automatic.module.name>
</properties>
<dependencies>
@@ -262,6 +262,13 @@
</goals>
</execution>
</executions>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Automatic-Module-Name>${automatic.module.name}</Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
+ </configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/jena/blob/928e70ff/jena-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/jena-jdbc/pom.xml b/jena-jdbc/pom.xml
index cdbc1d7..76338ca 100644
--- a/jena-jdbc/pom.xml
+++ b/jena-jdbc/pom.xml
@@ -33,6 +33,10 @@
<relativePath>..</relativePath>
</parent>
+ <properties>
+ <automatic.module.name>org.apache.jena.jdbc</automatic.module.name>
+ </properties>
+
<modules>
<module>jena-jdbc-core</module>
<module>jena-jdbc-driver-remote</module>
@@ -63,6 +67,17 @@
</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>
+ </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jena/blob/928e70ff/jena-permissions/pom.xml
----------------------------------------------------------------------
diff --git a/jena-permissions/pom.xml b/jena-permissions/pom.xml
index c8571b6..0362d34 100644
--- a/jena-permissions/pom.xml
+++ b/jena-permissions/pom.xml
@@ -22,10 +22,7 @@
<groupId>org.apache.jena</groupId>
<artifactId>jena-permissions</artifactId>
<version>3.8.0-SNAPSHOT</version>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- </properties>
+
<name>Apache Jena - Security Permissions</name>
<description>Security Permissions wrapper around Jena RDF implementation.</description>
<url>http://jena.apache.org/documentation/security</url>
@@ -37,188 +34,204 @@
<version>3.8.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <issueManagement>
- <url>http://issues.apache.org/jira/browse/JENA</url>
- <system>JIRA</system>
- </issueManagement>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.9.1</version>
- <executions>
- <execution>
- <id>add-example-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>src/example/java</source>
- </sources>
- </configuration>
- </execution>
- <execution>
- <id>add-example-resource</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-resource</goal>
- </goals>
- <configuration>
- <resources>
- <resource>
- <directory>src/example/resources</directory>
- <targetPath>${project.build.outputDirectory}</targetPath>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <excludePackageNames>org.apache.jena.security.example:org.apache.jena.security.example.*</excludePackageNames>
- <tags>
- <tag>
- <name>sec.graph</name>
- <!-- tag for all places -->
- <placement>a</placement>
- <head>Required graph permissions:</head>
- </tag>
- <tag>
- <name>sec.triple</name>
- <!-- tag for all places -->
- <placement>a</placement>
- <head>Required triple permissions:</head>
- </tag>
- </tags>
- <overview>${basedir}/src/main/overview.html</overview>
-
- </configuration>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>org/apache/jena/security/example/**</exclude>
- </excludes>
- </configuration>
- <executions>
- <execution>
- <id>create-test-jar</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- <execution>
- <id>create-example-jar</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <classedDirectory>target</classedDirectory>
- <classifier>example</classifier>
- <includes>
- <include>../src/example/**</include>
- <include>../src/example</include>
- <include>META-INF/**</include>
- <include>org/apache/jena/security/example/**</include>
- </includes>
- <excludes>
- <exclude>META-INF/DEPENDENCIES</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <!--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>
- <pluginExecutionFilter>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>
- build-helper-maven-plugin
- </artifactId>
- <versionRange>[1.9.1,)</versionRange>
- <goals>
- <goal>add-resource</goal>
- <goal>add-source</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
+
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <issueManagement>
+ <url>http://issues.apache.org/jira/browse/JENA</url>
+ <system>JIRA</system>
+ </issueManagement>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <automatic.module.name>org.apache.jena.permissions</automatic.module.name>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.9.1</version>
+ <executions>
+ <execution>
+ <id>add-example-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>src/example/java</source>
+ </sources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>add-example-resource</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-resource</goal>
+ </goals>
+ <configuration>
+ <resources>
+ <resource>
+ <directory>src/example/resources</directory>
+ <targetPath>${project.build.outputDirectory}</targetPath>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <excludePackageNames>org.apache.jena.security.example:org.apache.jena.security.example.*</excludePackageNames>
+ <tags>
+ <tag>
+ <name>sec.graph</name>
+ <!-- tag for all places -->
+ <placement>a</placement>
+ <head>Required graph permissions:</head>
+ </tag>
+ <tag>
+ <name>sec.triple</name>
+ <!-- tag for all places -->
+ <placement>a</placement>
+ <head>Required triple permissions:</head>
+ </tag>
+ </tags>
+ <overview>${basedir}/src/main/overview.html</overview>
+
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</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>
+ <excludes>
+ <exclude>org/apache/jena/security/example/**</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <id>create-test-jar</id>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>create-example-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <classedDirectory>target</classedDirectory>
+ <classifier>example</classifier>
+ <includes>
+ <include>../src/example/**</include>
+ <include>../src/example</include>
+ <include>META-INF/**</include>
+ <include>org/apache/jena/security/example/**</include>
+ </includes>
+ <excludes>
+ <exclude>META-INF/DEPENDENCIES</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <!--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>
+ <pluginExecutionFilter>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>
+ build-helper-maven-plugin
+ </artifactId>
+ <versionRange>[1.9.1,)</versionRange>
+ <goals>
+ <goal>add-resource</goal>
+ <goal>add-source</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-collections4</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>apache-jena-libs</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-core</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-core</artifactId>
- <version>1.2.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>apache-jena-libs</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-core</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-core</artifactId>
+ <version>1.2.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ </dependency>
+ </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/jena/blob/928e70ff/jena-sdb/pom.xml
----------------------------------------------------------------------
diff --git a/jena-sdb/pom.xml b/jena-sdb/pom.xml
index 8789722..b8703ea 100644
--- a/jena-sdb/pom.xml
+++ b/jena-sdb/pom.xml
@@ -36,6 +36,7 @@
<this.root>${project.artifactId}-${project.version}</this.root>
<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.sdb</automatic.module.name>
</properties>
<dependencies>
@@ -128,7 +129,17 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</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>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/jena/blob/928e70ff/jena-shaded-guava/pom.xml
----------------------------------------------------------------------
diff --git a/jena-shaded-guava/pom.xml b/jena-shaded-guava/pom.xml
index 072945d..92dbf83 100644
--- a/jena-shaded-guava/pom.xml
+++ b/jena-shaded-guava/pom.xml
@@ -37,6 +37,7 @@
re-package them under the package name
org.apache.jena.ext.com.google....
</description>
+
<dependencies>
@@ -49,7 +50,9 @@
<version>21.0</version>
</dependency>
</dependencies>
-
+ <properties>
+ <automatic.module.name>org.apache.jena.ext.com.google</automatic.module.name>
+ </properties>
<build>
<plugins>
<plugin>
@@ -64,6 +67,13 @@
</execution>
</executions>
<configuration>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+ <manifestEntries>
+ <Automatic-Module-Name>${automatic.module.name}</Automatic-Module-Name>
+ </manifestEntries>
+ </transformer>
+ </transformers>
<createSourcesJar>true</createSourcesJar>
<artifactSet>
<includes>