clerezza-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [2/4] clerezza git commit: CLEREZZA-1004: removed ext.clerezza bundles and using the bundle provided by jena instead
Date Tue, 17 Nov 2015 22:16:20 GMT
CLEREZZA-1004: removed ext.clerezza bundles and using the bundle provided by jena instead


Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/5bd4c7c9
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/5bd4c7c9
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/5bd4c7c9

Branch: refs/heads/master
Commit: 5bd4c7c949388ba1ead3c1173b1971089748ae13
Parents: b860b50
Author: Reto Gmür <reto@apache.org>
Authored: Tue Nov 17 22:23:45 2015 +0100
Committer: Reto Gmür <reto@apache.org>
Committed: Tue Nov 17 22:23:45 2015 +0100

----------------------------------------------------------------------
 ext/bundles-pom/pom.xml                         | 246 -------------------
 ext/jena-arq/pom.xml                            | 119 ---------
 .../src/main/resources/OSGI_INFO/bundle.info    |  11 -
 ext/jena-core/pom.xml                           | 118 ---------
 .../src/main/resources/OSGI_INFO/bundle.info    |  11 -
 ext/jena-iri/pom.xml                            | 111 ---------
 .../src/main/resources/OSGI_INFO/bundle.info    |  11 -
 ext/jena-tdb/pom.xml                            | 113 ---------
 .../src/main/resources/OSGI_INFO/bundle.info    |  11 -
 ext/pom.xml                                     |  53 ----
 pom.xml                                         |   2 +-
 provisioning/rdf.tdb/pom.xml                    |   5 -
 provisioning/rdf/pom.xml                        |  48 ++--
 13 files changed, 35 insertions(+), 824 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/clerezza/blob/5bd4c7c9/ext/bundles-pom/pom.xml
----------------------------------------------------------------------
diff --git a/ext/bundles-pom/pom.xml b/ext/bundles-pom/pom.xml
deleted file mode 100644
index af11ef2..0000000
--- a/ext/bundles-pom/pom.xml
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-
-    <!--
-
-        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.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.clerezza</groupId>
-        <artifactId>clerezza</artifactId>
-        <version>7</version>
-        <relativePath>../../parent</relativePath>
-    </parent>
-
-    <groupId>org.apache.clerezza.ext</groupId>
-    <artifactId>bundles-pom</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0.0-SNAPSHOT</version>
-    <name>Apache clerezza :: Ext Bundles :: Parent</name>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <clerezza.osgi.export>${clerezza.osgi.export.pkg}*;version=${pkgVersion};-split-package:=merge-first
-        </clerezza.osgi.export>
-        <clerezza.osgi.export.pkg />
-        <clerezza.osgi.import.pkg />
-        <clerezza.osgi.private.pkg />
-        <clerezza.osgi.dynamicimport.pkg />
-        <clerezza.osgi.failok>false</clerezza.osgi.failok>
-        <clerezza.osgi.embed.dependency />
-        <clerezza.osgi.fragment.host />
-    </properties>
-
-    <build>
-        <defaultGoal>install</defaultGoal>
-        <resources>
-            <resource>
-                <directory>${project.basedir}/src/main/resources</directory>
-                <filtering>true</filtering>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-        </resources>
-
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <version>2.5.2</version>
-                    <configuration>
-                        <useReleaseProfile>false</useReleaseProfile>
-                        <preparationGoals>clean install</preparationGoals>
-                        <goals>deploy</goals>
-                        <arguments>-Prelease</arguments>
-                        <autoVersionSubmodules>true</autoVersionSubmodules>
-                        <remoteTagging>false</remoteTagging>
-                        <!-- avoid remote tagging as it requires an <scm /> section for every bundle -->
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.18.1</version>
-                    <configuration>
-                        <skip>true</skip>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-shade-plugin</artifactId>
-                    <version>2.4.1</version>
-                    <executions>
-                        <execution>
-                            <id>sources</id>
-                            <phase>package</phase>
-                            <goals>
-                                <goal>shade</goal>
-                            </goals>
-                            <configuration>
-                                <artifactSet>
-                                    <includes>
-                                        <include>*:*:*:sources</include>
-                                        <include>${project.groupId}:${project.artifactId}:*:sources</include>
-                                    </includes>
-                                </artifactSet>
-                                <filters>
-                                    <filter>
-                                        <artifact>*:*</artifact>
-                                        <excludes>
-                                            <exclude>**/*.class</exclude>
-                                        </excludes>
-                                    </filter>
-                                </filters>
-                                <transformers>
-                                    <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                        <manifestEntries>
-                                            <Bundle-SymbolicName>${project.artifactId}.source</Bundle-SymbolicName>
-                                            <Eclipse-SourceBundle>${project.artifactId};version="${project.version}"</Eclipse-SourceBundle>
-                                        </manifestEntries>
-                                    </transformer>
-                                </transformers>
-                                <promoteTransitiveDependencies>false</promoteTransitiveDependencies>
-                                <shadedArtifactAttached>true</shadedArtifactAttached>
-                                <shadedClassifierName>sources</shadedClassifierName>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-source-plugin</artifactId>
-                    <version>2.4</version>
-                    <executions>
-                        <execution>
-                            <phase>generate-sources</phase>
-                            <goals>
-                                <goal>jar</goal>
-                            </goals>
-                            <configuration>
-                                <includePom>true</includePom>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-antrun-plugin</artifactId>
-                    <version>1.8</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-jarsigner-plugin</artifactId>
-                    <version>1.4</version>
-                </plugin>
-                <!-- <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.3</version>
-                    <configuration>
-                        <source>1.5</source>
-                        <target>1.5</target>
-                    </configuration>
-                </plugin> -->
-            </plugins>
-
-        </pluginManagement>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <!-- with newer (2.5.x) versions we get an error "Can not parse name from bundle native code header" -->
-                <!-- with 2.4.0 we get "The default package ‘.’ is not permitted by the Import-Package syntax.” -->
-                <version>2.3.7</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Bundle-Description>${project.description}</Bundle-Description>
-                        <Export-Package>${clerezza.osgi.export}</Export-Package>
-                        <Import-Package>${clerezza.osgi.import.pkg}</Import-Package>
-                        <Private-Package>${clerezza.osgi.private.pkg}</Private-Package>
-                        <DynamicImport-Package>${clerezza.osgi.dynamicimport.pkg}</DynamicImport-Package>
-                        <Embed-Dependency>${clerezza.osgi.embed.dependency}</Embed-Dependency>
-                        <Bundle-NativeCode>${clerezza.osgi.native}</Bundle-NativeCode>
-                        <Bundle-Activator>${clerezza.osgi.activator}</Bundle-Activator>
-                        <Fragment-Host>${clerezza.osgi.fragment.host}</Fragment-Host>
-                        <_failok>${clerezza.osgi.failok}</_failok>
-                        <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
-                        <_removeheaders>Ignore-Package,Include-Resource,Private-Package,Embed-Dependency
-                        </_removeheaders>
-                    </instructions>
-                    <unpackBundle>true</unpackBundle>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-remote-resources-plugin</artifactId>
-                <version>1.3</version>
-                <executions>
-                    <execution>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <configuration>
-                            <resourceBundles>
-                                <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
-                            </resourceBundles>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>release</id>
-            <build>
-                <plugins>
-                    <!-- We want to deploy the artifact to a staging location for perusal -->
-                    <plugin>
-                        <inherited>true</inherited>
-                        <artifactId>maven-deploy-plugin</artifactId>
-                        <version>2.7</version>
-                        <configuration>
-                            <updateReleaseInfo>true</updateReleaseInfo>
-                        </configuration>
-                    </plugin>
-                    <!-- We want to sign the artifact, the POM, and all attached artifacts -->
-                    <plugin>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.4</version>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/clerezza/blob/5bd4c7c9/ext/jena-arq/pom.xml
----------------------------------------------------------------------
diff --git a/ext/jena-arq/pom.xml b/ext/jena-arq/pom.xml
deleted file mode 100644
index 13eac8e..0000000
--- a/ext/jena-arq/pom.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
-
-    <!--
-
-        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.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.clerezza.ext</groupId>
-        <artifactId>bundles-pom</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../parent</relativePath>
-    </parent>
-
-    <groupId>org.apache.clerezza.ext</groupId>
-    <artifactId>org.apache.jena.jena-arq</artifactId>
-    <packaging>bundle</packaging>
-    <version>2.13.0_1-SNAPSHOT</version>
-    <name>Apache Clerezza :: Ext Bundles :: ${pkgArtifactId}</name>
-    <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
-
-    <properties>
-        <pkgGroupId>org.apache.jena</pkgGroupId>
-        <pkgArtifactId>jena-arq</pkgArtifactId>
-        <pkgVersion>2.13.0</pkgVersion>
-        <clerezza.osgi.export.pkg>
-            com.hp.hpl.jena.query;version=${pkgVersion};-split-package:=merge-first,
-            com.hp.hpl.jena.sparql.*;version=${pkgVersion};-split-package:=merge-first,
-            com.hp.hpl.jena.update;version=${pkgVersion};-split-package:=merge-first,
-            org.apache.jena.atlas.*;version=${pkgVersion};-split-package:=merge-first,
-            org.apache.jena.riot.*;version=${pkgVersion};-split-package:=merge-first,
-            org.apache.jena.web;version=${pkgVersion};-split-package:=merge-first,
-            org.openjena.riot;version=${pkgVersion};-split-package:=merge-first,
-            arq.*;version=${pkgVersion};-split-package:=merge-first,
-            riotcmd
-        </clerezza.osgi.export.pkg>
-        <clerezza.osgi.import.pkg>
-            *
-        </clerezza.osgi.import.pkg>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>${pkgArtifactId}</artifactId>
-            <version>${pkgVersion}</version>
-            <optional>true</optional>
-        </dependency>
-
-        <!-- sources -->
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>${pkgArtifactId}</artifactId>
-            <version>${pkgVersion}</version>
-            <classifier>sources</classifier>
-            <optional>true</optional>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <inherited>true</inherited>
-                <configuration>
-                    <instructions>
-                        <Embed-Transitive>true</Embed-Transitive>
-                    </instructions>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <artifactSet>
-                                <includes>
-                                    <include>${pkgGroupId}:${pkgArtifactId}</include>
-                                </includes>
-                            </artifactSet>
-                            <filters>
-                                <filter>
-                                    <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
-                            <createDependencyReducedPom>true</createDependencyReducedPom>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

http://git-wip-us.apache.org/repos/asf/clerezza/blob/5bd4c7c9/ext/jena-arq/src/main/resources/OSGI_INFO/bundle.info
----------------------------------------------------------------------
diff --git a/ext/jena-arq/src/main/resources/OSGI_INFO/bundle.info b/ext/jena-arq/src/main/resources/OSGI_INFO/bundle.info
deleted file mode 100644
index 0a9581a..0000000
--- a/ext/jena-arq/src/main/resources/OSGI_INFO/bundle.info
+++ /dev/null
@@ -1,11 +0,0 @@
-\u001B[1mSYNOPSIS\u001B[0m
-    ${project.description}
-
-    Original Maven URL:
-        \u001B[33mmvn:${pkgGroupId}/${pkgArtifactId}/${pkgVersion}\u001B[0m
-
-\u001B[1mDESCRIPTION\u001B[0m
-    Jena ARQ
-
-\u001B[1mSEE ALSO\u001B[0m
-    \u001B[36mhttp://jena.apache.org\u001B[0m
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/clerezza/blob/5bd4c7c9/ext/jena-core/pom.xml
----------------------------------------------------------------------
diff --git a/ext/jena-core/pom.xml b/ext/jena-core/pom.xml
deleted file mode 100644
index ac1fadd..0000000
--- a/ext/jena-core/pom.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
-
-    <!--
-
-        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.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.clerezza.ext</groupId>
-        <artifactId>bundles-pom</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../parent</relativePath>
-    </parent>
-
-    <groupId>org.apache.clerezza.ext</groupId>
-    <artifactId>org.apache.jena.jena-core</artifactId>
-    <packaging>bundle</packaging>
-    <version>2.13.0_1-SNAPSHOT</version>
-    <name>Apache Clerezza :: Ext Bundles :: ${pkgArtifactId}</name>
-    <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
-
-    <properties>
-        <pkgGroupId>org.apache.jena</pkgGroupId>
-        <pkgArtifactId>jena-core</pkgArtifactId>
-        <pkgVersion>2.13.0</pkgVersion>
-        <clerezza.osgi.export.pkg>
-            com.hp.hpl.jena.*;version=${pkgVersion};-split-package:=merge-first,
-            jena.*;version=${pkgVersion};-split-package:=merge-first
-        </clerezza.osgi.export.pkg>
-        <clerezza.osgi.dynamicimport.pkg>
-            org.apache.jena.riot,
-            org.apache.jena.riot.adapters,
-            com.hp.hpl.jena.grddl.GRDDLReader
-        </clerezza.osgi.dynamicimport.pkg>
-        <clerezza.osgi.import.pkg>
-            org.apache.jena.iri,
-            *
-        </clerezza.osgi.import.pkg>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>${pkgArtifactId}</artifactId>
-            <version>${pkgVersion}</version>
-            <optional>true</optional>
-        </dependency>
-
-        <!-- sources -->
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>${pkgArtifactId}</artifactId>
-            <version>${pkgVersion}</version>
-            <classifier>sources</classifier>
-            <optional>true</optional>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <inherited>true</inherited>
-                <configuration>
-                    <instructions>
-                        <Embed-Transitive>true</Embed-Transitive>
-                    </instructions>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <artifactSet>
-                                <includes>
-                                    <include>${pkgGroupId}:${pkgArtifactId}</include>
-                                </includes>
-                            </artifactSet>
-                            <filters>
-                                <filter>
-                                    <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
-                            <createDependencyReducedPom>true</createDependencyReducedPom>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

http://git-wip-us.apache.org/repos/asf/clerezza/blob/5bd4c7c9/ext/jena-core/src/main/resources/OSGI_INFO/bundle.info
----------------------------------------------------------------------
diff --git a/ext/jena-core/src/main/resources/OSGI_INFO/bundle.info b/ext/jena-core/src/main/resources/OSGI_INFO/bundle.info
deleted file mode 100644
index 89888bd..0000000
--- a/ext/jena-core/src/main/resources/OSGI_INFO/bundle.info
+++ /dev/null
@@ -1,11 +0,0 @@
-\u001B[1mSYNOPSIS\u001B[0m
-    ${project.description}
-
-    Original Maven URL:
-        \u001B[33mmvn:${pkgGroupId}/${pkgArtifactId}/${pkgVersion}\u001B[0m
-
-\u001B[1mDESCRIPTION\u001B[0m
-    Jena core
-
-\u001B[1mSEE ALSO\u001B[0m
-    \u001B[36mhttp://jena.apache.org\u001B[0m
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/clerezza/blob/5bd4c7c9/ext/jena-iri/pom.xml
----------------------------------------------------------------------
diff --git a/ext/jena-iri/pom.xml b/ext/jena-iri/pom.xml
deleted file mode 100644
index cfd1b22..0000000
--- a/ext/jena-iri/pom.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
-
-    <!--
-
-        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.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.clerezza.ext</groupId>
-        <artifactId>bundles-pom</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../parent</relativePath>
-    </parent>
-
-    <groupId>org.apache.clerezza.ext</groupId>
-    <artifactId>org.apache.jena.jena-iri</artifactId>
-    <packaging>bundle</packaging>
-    <version>1.1.2_1-SNAPSHOT</version>
-    <name>Apache Clerezza :: Ext Bundles :: ${pkgArtifactId}</name>
-    <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
-
-    <properties>
-        <pkgGroupId>org.apache.jena</pkgGroupId>
-        <pkgArtifactId>jena-iri</pkgArtifactId>
-        <pkgVersion>1.1.2</pkgVersion>
-        <clerezza.osgi.export.pkg>
-            org.apache.jena.iri
-        </clerezza.osgi.export.pkg>
-        <clerezza.osgi.import.pkg>
-            *
-        </clerezza.osgi.import.pkg>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>${pkgArtifactId}</artifactId>
-            <version>${pkgVersion}</version>
-            <optional>true</optional>
-        </dependency>
-
-        <!-- sources -->
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>${pkgArtifactId}</artifactId>
-            <version>${pkgVersion}</version>
-            <classifier>sources</classifier>
-            <optional>true</optional>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <inherited>true</inherited>
-                <configuration>
-                    <instructions>
-                        <Embed-Transitive>true</Embed-Transitive>
-                    </instructions>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <artifactSet>
-                                <includes>
-                                    <include>${pkgGroupId}:${pkgArtifactId}</include>
-                                </includes>
-                            </artifactSet>
-                            <filters>
-                                <filter>
-                                    <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
-                            <createDependencyReducedPom>true</createDependencyReducedPom>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

http://git-wip-us.apache.org/repos/asf/clerezza/blob/5bd4c7c9/ext/jena-iri/src/main/resources/OSGI_INFO/bundle.info
----------------------------------------------------------------------
diff --git a/ext/jena-iri/src/main/resources/OSGI_INFO/bundle.info b/ext/jena-iri/src/main/resources/OSGI_INFO/bundle.info
deleted file mode 100644
index b09c5e0..0000000
--- a/ext/jena-iri/src/main/resources/OSGI_INFO/bundle.info
+++ /dev/null
@@ -1,11 +0,0 @@
-\u001B[1mSYNOPSIS\u001B[0m
-    ${project.description}
-
-    Original Maven URL:
-        \u001B[33mmvn:${pkgGroupId}/${pkgArtifactId}/${pkgVersion}\u001B[0m
-
-\u001B[1mDESCRIPTION\u001B[0m
-    Jena IRI
-
-\u001B[1mSEE ALSO\u001B[0m
-    \u001B[36mhttp://jena.apache.org\u001B[0m
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/clerezza/blob/5bd4c7c9/ext/jena-tdb/pom.xml
----------------------------------------------------------------------
diff --git a/ext/jena-tdb/pom.xml b/ext/jena-tdb/pom.xml
deleted file mode 100644
index cf366fb..0000000
--- a/ext/jena-tdb/pom.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
-
-    <!--
-
-        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.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.clerezza.ext</groupId>
-        <artifactId>bundles-pom</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../parent</relativePath>
-    </parent>
-
-    <groupId>org.apache.clerezza.ext</groupId>
-    <artifactId>org.apache.jena.jena-tdb</artifactId>
-    <packaging>bundle</packaging>
-    <version>1.1.2_1-SNAPSHOT</version>
-    <name>Apache Clerezza :: Ext Bundles :: ${pkgArtifactId}</name>
-    <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
-
-    <properties>
-        <pkgGroupId>org.apache.jena</pkgGroupId>
-        <pkgArtifactId>jena-tdb</pkgArtifactId>
-        <pkgVersion>1.1.2</pkgVersion>
-        <clerezza.osgi.export.pkg>
-            com.hp.hpl.jena.tdb.*;version=${pkgVersion};-split-package:=merge-first,
-            org.apache.jena.tdb.*;version=${pkgVersion};-split-package:=merge-first,
-            tdb.*;version=${pkgVersion};-split-package:=merge-first
-        </clerezza.osgi.export.pkg>
-        <clerezza.osgi.import.pkg>
-            *
-        </clerezza.osgi.import.pkg>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>${pkgArtifactId}</artifactId>
-            <version>${pkgVersion}</version>
-            <optional>true</optional>
-        </dependency>
-
-        <!-- sources -->
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>${pkgArtifactId}</artifactId>
-            <version>${pkgVersion}</version>
-            <classifier>sources</classifier>
-            <optional>true</optional>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <inherited>true</inherited>
-                <configuration>
-                    <instructions>
-                        <Embed-Transitive>true</Embed-Transitive>
-                    </instructions>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <artifactSet>
-                                <includes>
-                                    <include>${pkgGroupId}:${pkgArtifactId}</include>
-                                </includes>
-                            </artifactSet>
-                            <filters>
-                                <filter>
-                                    <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
-                            <createDependencyReducedPom>true</createDependencyReducedPom>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

http://git-wip-us.apache.org/repos/asf/clerezza/blob/5bd4c7c9/ext/jena-tdb/src/main/resources/OSGI_INFO/bundle.info
----------------------------------------------------------------------
diff --git a/ext/jena-tdb/src/main/resources/OSGI_INFO/bundle.info b/ext/jena-tdb/src/main/resources/OSGI_INFO/bundle.info
deleted file mode 100644
index d8142fd..0000000
--- a/ext/jena-tdb/src/main/resources/OSGI_INFO/bundle.info
+++ /dev/null
@@ -1,11 +0,0 @@
-\u001B[1mSYNOPSIS\u001B[0m
-    ${project.description}
-
-    Original Maven URL:
-        \u001B[33mmvn:${pkgGroupId}/${pkgArtifactId}/${pkgVersion}\u001B[0m
-
-\u001B[1mDESCRIPTION\u001B[0m
-    Jena TDB
-
-\u001B[1mSEE ALSO\u001B[0m
-    \u001B[36mhttp://jena.apache.org\u001B[0m
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/clerezza/blob/5bd4c7c9/ext/pom.xml
----------------------------------------------------------------------
diff --git a/ext/pom.xml b/ext/pom.xml
deleted file mode 100644
index 685028c..0000000
--- a/ext/pom.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-
-    <!--
-
-        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.
-    -->
-
-    <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-         !!!!!!                                !!!!!!
-         !!!!!!    This pom is only provided   !!!!!!
-         !!!!!!   for build convenience and    !!!!!!
-         !!!!!!   should not be released       !!!!!!
-         !!!!!!                                !!!!!!
-         !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-
-    <modelVersion>4.0.0</modelVersion>
-    
-    <parent>
-        <groupId>org.apache.clerezza</groupId>
-        <artifactId>clerezza</artifactId>
-        <version>7</version>
-        <relativePath>../parent</relativePath>
-     </parent>
-
-    <groupId>org.apache.clerezza.ext</groupId>
-    <artifactId>org.apache.clerezza.ext.reactor</artifactId>
-    <version>2-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <name>Apache Clerezza :: Ext Bundles :: Reactor</name>
-
-    <modules>
-        <module>bundles-pom</module>
-        <module>jena-iri</module>
-        <module>jena-core</module>
-        <module>jena-arq</module>
-        <module>jena-tdb</module>
-    </modules>
-
-</project>

http://git-wip-us.apache.org/repos/asf/clerezza/blob/5bd4c7c9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2a463e3..a1cb9c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,6 @@
             <modules>
                 <module>parent</module>
                 <module>clerezza-jar-resource-bundle</module>
-                <module>ext</module>
                 <module>ext.com.ibm.icu</module>
                 <module>ext.javax.mail</module>
                 <module>ext.org.ops4j.pax.swissbox.tinybundles</module>
@@ -73,6 +72,7 @@
                 <module>rdf.locking</module>
                 <module>shell</module>
                 <module>shell.felixshellcommand</module>
+                <module>site</module>
                 <module>bundledevtool</module>
                 <module>sshshell</module>
                 <module>templating</module>

http://git-wip-us.apache.org/repos/asf/clerezza/blob/5bd4c7c9/provisioning/rdf.tdb/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/rdf.tdb/pom.xml b/provisioning/rdf.tdb/pom.xml
index 6998c4c..1286351 100644
--- a/provisioning/rdf.tdb/pom.xml
+++ b/provisioning/rdf.tdb/pom.xml
@@ -49,11 +49,6 @@
             <version>1.1.0-SNAPSHOT</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.clerezza.ext</groupId>            
-            <artifactId>org.apache.jena.jena-tdb</artifactId>
-            <version>1.1.2_1-SNAPSHOT</version>
-        </dependency>
 
     </dependencies>
 

http://git-wip-us.apache.org/repos/asf/clerezza/blob/5bd4c7c9/provisioning/rdf/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/rdf/pom.xml b/provisioning/rdf/pom.xml
index e14202a..c9d0190 100644
--- a/provisioning/rdf/pom.xml
+++ b/provisioning/rdf/pom.xml
@@ -178,25 +178,45 @@
             <version>1.0.0</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.clerezza.ext</groupId>            
-            <artifactId>org.apache.jena.jena-iri</artifactId>
-            <version>1.1.2_1-SNAPSHOT</version>
+            <groupId>org.apache.jena</groupId>
+            <artifactId>jena-osgi</artifactId>
+            <version>2.13.0</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.clerezza.ext</groupId>            
-            <artifactId>org.apache.jena.jena-core</artifactId>
-            <version>2.13.0_1-SNAPSHOT</version>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.6.3</version>            
         </dependency>
         <dependency>
-            <groupId>org.apache.clerezza.ext</groupId>            
-            <artifactId>org.apache.jena.jena-arq</artifactId>
-            <version>2.13.0_1-SNAPSHOT</version>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.6.3</version>            
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>2.6.3</version>            
+        </dependency>
+        <dependency>
+            <groupId>com.github.jsonld-java</groupId>
+            <artifactId>jsonld-java</artifactId>
+            <version>0.7.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.thrift</groupId>
+            <artifactId>libthrift</artifactId>
+            <version>0.9.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-csv</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient-osgi</artifactId>
+            <version>4.5.1</version>
         </dependency>
-        <!-- <dependency>
-            <groupId>org.apache.clerezza.ext</groupId>            
-            <artifactId>org.apache.jena.jena-tdb</artifactId>
-            <version>1.0.1_1-SNAPSHOT</version>
-        </dependency> -->
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>


Mime
View raw message