Repository: jena
Updated Branches:
refs/heads/master 619efad91 -> e41eb73cf
`jena-osgi` instead of `jena-bundle`
naming style matches other Apache projects, e.g.:
stain@biggie-mint ~/.m2/repository $ find . -name *-osgi
./org/apache/batik/batik-osgi
./org/apache/maven/shared/maven-osgi
./org/apache/httpcomponents/httpcore-osgi
./org/apache/httpcomponents/httpclient-osgi
./org/springframework/osgi/spring-osgi
vs.
stain@biggie-mint ~/.m2/repository $ find . -name *-bundle
./org/apache/apache-jar-resource-bundle
./org/apache/jena/jena-bundle
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/8ae9f6cb
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/8ae9f6cb
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/8ae9f6cb
Branch: refs/heads/master
Commit: 8ae9f6cb875efd562f5ae52fbd123d703cfad42c
Parents: 7366e97
Author: Stian Soiland-Reyes <[email protected]>
Authored: Wed Oct 29 01:56:43 2014 +0000
Committer: Stian Soiland-Reyes <[email protected]>
Committed: Mon Jan 12 01:19:14 2015 +0000
----------------------------------------------------------------------
jena-bundle/pom.xml | 189 -----------------------------------------------
jena-osgi/pom.xml | 189 +++++++++++++++++++++++++++++++++++++++++++++++
pom.xml | 2 +-
3 files changed, 190 insertions(+), 190 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/8ae9f6cb/jena-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/jena-bundle/pom.xml b/jena-bundle/pom.xml
deleted file mode 100644
index 5cea768..0000000
--- a/jena-bundle/pom.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<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>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-bundle</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Jena - OSGi bundle</name>
- <url>http://jena.apache.org/</url>
- <version>2.12.2-SNAPSHOT</version>
- <description>
- Embedding all Jena modules in a single OSGi bundle.
- This works around classloader issues such as Jena's use of
- Class.forName(), but does not yet support other OSGi bundles
- to easily plug in 3rd party Jena implementations of say readers
- and writers.
- </description>
- <parent>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-parent</artifactId>
- <version>12-SNAPSHOT</version>
- <relativePath>../jena-parent</relativePath>
- </parent>
-
- <properties>
- <!-- TODO: Move to jena-parent? -->
- <ver.jena>2.12.2-SNAPSHOT</ver.jena>
- <ver.jena-tdb>1.1.2-SNAPSHOT</ver.jena-tdb>
- <ver.jena-sdb>1.5.2-SNAPSHOT</ver.jena-sdb>
- <ver.jena-iri>1.1.2-SNAPSHOT</ver.jena-iri>
- <ver.httpcore>4.2.5</ver.httpcore>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-arq</artifactId>
- <version>${ver.jena}</version>
- <scope>provided</scope>
- <exclusions>
- <!-- These are all embedded within httpclient-osgi -->
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpmime</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient-cache</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>fluent-hc</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-core</artifactId>
- <version>${ver.jena}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-tdb</artifactId>
- <version>${ver.jena-tdb}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-sdb</artifactId>
- <version>${ver.jena-sdb}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-iri</artifactId>
- <version>${ver.jena-iri}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- Disabled as this is not included in apache-jena distribution
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-fuseki</artifactId>
- <version>${ver.fuseki}</version>
- <scope>provided</scope>
- </dependency>
- -->
-
- <!-- OSGi versions of Jena dependencies -->
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient-osgi</artifactId>
- <version>${ver.httpclient}</version>
- <exclusions>
- <!-- These are all embedded within httpclient-osgi -->
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpmime</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient-cache</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>fluent-hc</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore-osgi</artifactId>
- <version>${ver.httpcore}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore-osgi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore-osgi-nio</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.github.jsonld-java</groupId>
- <artifactId>jsonld-java</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-csv</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
-
<Export-Package>com.hp.hpl.jena.*,org.apache.jena.*</Export-Package>
-
<Embed-Dependency>*;scope=provided;groupId=!org.apache.httpcomponents;groupId=!org.apache.commons.csv;groupId=!org.apache.thrift;artifactId=!commons-lang3</Embed-Dependency>
- <Embed-Transitive>true</Embed-Transitive>
-
<Import-Package>!sun.io,!org.apache.avalon.framework.logger,!com.ibm.uvm.tools,!com.sun.jdmk.comm,!org.apache.log,*</Import-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/jena/blob/8ae9f6cb/jena-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/jena-osgi/pom.xml b/jena-osgi/pom.xml
new file mode 100644
index 0000000..32f1097
--- /dev/null
+++ b/jena-osgi/pom.xml
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<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>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-osgi</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Jena - OSGi bundle</name>
+ <url>http://jena.apache.org/</url>
+ <version>2.12.2-SNAPSHOT</version>
+ <description>
+ Embedding all Jena modules in a single OSGi bundle.
+ This works around classloader issues such as Jena's use of
+ Class.forName(), but does not yet support other OSGi bundles
+ to easily plug in 3rd party Jena implementations of say readers
+ and writers.
+ </description>
+ <parent>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-parent</artifactId>
+ <version>12-SNAPSHOT</version>
+ <relativePath>../jena-parent</relativePath>
+ </parent>
+
+ <properties>
+ <!-- TODO: Move to jena-parent? -->
+ <ver.jena>2.12.2-SNAPSHOT</ver.jena>
+ <ver.jena-tdb>1.1.2-SNAPSHOT</ver.jena-tdb>
+ <ver.jena-sdb>1.5.2-SNAPSHOT</ver.jena-sdb>
+ <ver.jena-iri>1.1.2-SNAPSHOT</ver.jena-iri>
+ <ver.httpcore>4.2.5</ver.httpcore>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-arq</artifactId>
+ <version>${ver.jena}</version>
+ <scope>provided</scope>
+ <exclusions>
+ <!-- These are all embedded within httpclient-osgi -->
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-cache</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>fluent-hc</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-core</artifactId>
+ <version>${ver.jena}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-tdb</artifactId>
+ <version>${ver.jena-tdb}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-sdb</artifactId>
+ <version>${ver.jena-sdb}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-iri</artifactId>
+ <version>${ver.jena-iri}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Disabled as this is not included in apache-jena distribution
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-fuseki</artifactId>
+ <version>${ver.fuseki}</version>
+ <scope>provided</scope>
+ </dependency>
+ -->
+
+ <!-- OSGi versions of Jena dependencies -->
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-osgi</artifactId>
+ <version>${ver.httpclient}</version>
+ <exclusions>
+ <!-- These are all embedded within httpclient-osgi -->
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-cache</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>fluent-hc</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore-osgi</artifactId>
+ <version>${ver.httpcore}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore-osgi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore-osgi-nio</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.github.jsonld-java</groupId>
+ <artifactId>jsonld-java</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-csv</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+
<Export-Package>com.hp.hpl.jena.*,org.apache.jena.*</Export-Package>
+
<Embed-Dependency>*;scope=provided;groupId=!org.apache.httpcomponents;groupId=!org.apache.commons.csv;groupId=!org.apache.thrift;artifactId=!commons-lang3</Embed-Dependency>
+ <Embed-Transitive>true</Embed-Transitive>
+
<Import-Package>!sun.io,!org.apache.avalon.framework.logger,!com.ibm.uvm.tools,!com.sun.jdmk.comm,!org.apache.log,*</Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/jena/blob/8ae9f6cb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dda1bd7..ef635f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,7 +117,7 @@
<module>apache-jena-libs</module>
<module>apache-jena</module>
<module>jena-extras</module>
- <module>jena-bundle</module>
+ <module>jena-osgi</module>
</modules>
</profile>
</profiles>
