Repository: clerezza Updated Branches: refs/heads/master 8af2875d3 -> c256030e8
CLEREZZA-1000: prepared partial release 201508 Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/c256030e Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/c256030e Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/c256030e Branch: refs/heads/master Commit: c256030e85f8305a2321e58b4ee1906339fe7ff6 Parents: 8af2875 Author: Reto Gmür <[email protected]> Authored: Sat Sep 5 13:58:05 2015 +0200 Committer: Reto Gmür <[email protected]> Committed: Sat Sep 5 13:58:05 2015 +0200 ---------------------------------------------------------------------- provisioning/jaxrs-whiteboard/pom.xml | 10 ++- .../src/main/feature/feature.xml | 2 + provisioning/launchers/content-launcher/pom.xml | 8 +- .../launchers/linked-data-launcher/pom.xml | 4 +- .../integration/tests/UploadAndAccessTest.java | 2 +- provisioning/rdf.tdb/pom.xml | 8 +- provisioning/rdf/pom.xml | 28 +++--- releases/201508/README.md | 15 ++++ releases/201508/pom.xml | 95 ++++++++++++++++++++ releases/201508/src/assembly/source-release.xml | 84 +++++++++++++++++ 10 files changed, 233 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/clerezza/blob/c256030e/provisioning/jaxrs-whiteboard/pom.xml ---------------------------------------------------------------------- diff --git a/provisioning/jaxrs-whiteboard/pom.xml b/provisioning/jaxrs-whiteboard/pom.xml index baadb3d..ffa175f 100644 --- a/provisioning/jaxrs-whiteboard/pom.xml +++ b/provisioning/jaxrs-whiteboard/pom.xml @@ -52,7 +52,7 @@ <dependency> <groupId>org.apache.clerezza</groupId> <artifactId>jaxrs.whiteboard.jersey</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>0.1</version> </dependency> <dependency> @@ -79,6 +79,11 @@ <version>2.21</version> </dependency> <dependency> + <groupId>org.glassfish.jersey.media</groupId> + <artifactId>jersey-media-jaxb</artifactId> + <version>2.21</version> + </dependency> + <dependency> <groupId>org.glassfish.hk2</groupId> <artifactId>hk2-api</artifactId> <version>2.4.0-b31</version> @@ -157,6 +162,9 @@ <plugin> <groupId>org.wymiwyg.karaf.tooling</groupId> <artifactId>karaf-sling-maven-plugin</artifactId> + <configuration> + <startLevel>24</startLevel> + </configuration> </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/clerezza/blob/c256030e/provisioning/jaxrs-whiteboard/src/main/feature/feature.xml ---------------------------------------------------------------------- diff --git a/provisioning/jaxrs-whiteboard/src/main/feature/feature.xml b/provisioning/jaxrs-whiteboard/src/main/feature/feature.xml index 3863ebb..688cb93 100644 --- a/provisioning/jaxrs-whiteboard/src/main/feature/feature.xml +++ b/provisioning/jaxrs-whiteboard/src/main/feature/feature.xml @@ -24,6 +24,8 @@ <bundle start-level="1">mvn:javax.annotation/javax.annotation-api/1.2</bundle> <!-- to prevent "No generator was provided and there is no default generator registered" Exception, see https://java.net/jira/browse/JERSEY-2788 --> <bundle start-level="15">mvn:org.glassfish.hk2/osgi-resource-locator/1.0.1</bundle> + <!-- because of jersey ServiceLoader mechanism all of it's bundles should be activated before jersey is used --> + <bundle start-level="25">mvn:org.apache.clerezza/jaxrs.whiteboard.jersey/0.1</bundle> </feature> </features> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/clerezza/blob/c256030e/provisioning/launchers/content-launcher/pom.xml ---------------------------------------------------------------------- diff --git a/provisioning/launchers/content-launcher/pom.xml b/provisioning/launchers/content-launcher/pom.xml index 5698622..07112b5 100644 --- a/provisioning/launchers/content-launcher/pom.xml +++ b/provisioning/launchers/content-launcher/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.apache.clerezza</groupId> <artifactId>clerezza</artifactId> - <version>8-SNAPSHOT</version> + <version>7</version> <relativePath>../../../parent</relativePath> </parent> <groupId>org.apache.clerezza.provisioning</groupId> @@ -230,14 +230,14 @@ <dependency> <groupId>org.apache.clerezza.provisioning</groupId> <artifactId>rdf</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <type>partialbundlelist</type> </dependency> <dependency> <groupId>org.apache.clerezza.provisioning</groupId> <artifactId>rdf.tdb</artifactId> - <version>1.0.0</version> + <version>1.1.0-SNAPSHOT</version> <type>partialbundlelist</type> </dependency> @@ -268,7 +268,7 @@ <dependency> <groupId>org.apache.clerezza.provisioning</groupId> <artifactId>rdf.web</artifactId> - <version>1.0.0</version> + <version>1.0.1-SNAPSHOT</version> <type>partialbundlelist</type> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/clerezza/blob/c256030e/provisioning/launchers/linked-data-launcher/pom.xml ---------------------------------------------------------------------- diff --git a/provisioning/launchers/linked-data-launcher/pom.xml b/provisioning/launchers/linked-data-launcher/pom.xml index c54e92e..109c867 100644 --- a/provisioning/launchers/linked-data-launcher/pom.xml +++ b/provisioning/launchers/linked-data-launcher/pom.xml @@ -230,14 +230,14 @@ <dependency> <groupId>org.apache.clerezza.provisioning</groupId> <artifactId>rdf</artifactId> - <version>1.0.0</version> + <version>1.1.0-SNAPSHOT</version> <type>partialbundlelist</type> </dependency> <dependency> <groupId>org.apache.clerezza.provisioning</groupId> <artifactId>rdf.tdb</artifactId> - <version>1.0.0</version> + <version>1.1.0-SNAPSHOT</version> <type>partialbundlelist</type> </dependency> http://git-wip-us.apache.org/repos/asf/clerezza/blob/c256030e/provisioning/launchers/tests/content-launcher-tests/src/test/java/org/apache/clerezza/integration/tests/UploadAndAccessTest.java ---------------------------------------------------------------------- diff --git a/provisioning/launchers/tests/content-launcher-tests/src/test/java/org/apache/clerezza/integration/tests/UploadAndAccessTest.java b/provisioning/launchers/tests/content-launcher-tests/src/test/java/org/apache/clerezza/integration/tests/UploadAndAccessTest.java index 1470c74..6df1bc6 100644 --- a/provisioning/launchers/tests/content-launcher-tests/src/test/java/org/apache/clerezza/integration/tests/UploadAndAccessTest.java +++ b/provisioning/launchers/tests/content-launcher-tests/src/test/java/org/apache/clerezza/integration/tests/UploadAndAccessTest.java @@ -45,7 +45,7 @@ public class UploadAndAccessTest extends BaseTest { @Test public void uploadAndQuery() throws Exception { - smallGraphTurtle = "<"+RestAssured.baseURI+"/test-resource> <http://www.w3.org/2000/01/rdf-schema#comment> \"A test resource\"."; + smallGraphTurtle = "<"+RestAssured.baseURI+"/test-resource> <http://www.w3.org/2000/01/rdf-schema#comment> \"A test resource\"^^<http://www.w3.org/2001/XMLSchema#string>."; smallGraph = Parser.getInstance().parse(new ByteArrayInputStream(smallGraphTurtle.getBytes("utf-8")), "text/turtle"); uploadTurtle(); sparqlAsk(); http://git-wip-us.apache.org/repos/asf/clerezza/blob/c256030e/provisioning/rdf.tdb/pom.xml ---------------------------------------------------------------------- diff --git a/provisioning/rdf.tdb/pom.xml b/provisioning/rdf.tdb/pom.xml index 105b09c..6998c4c 100644 --- a/provisioning/rdf.tdb/pom.xml +++ b/provisioning/rdf.tdb/pom.xml @@ -25,13 +25,13 @@ <parent> <artifactId>clerezza</artifactId> <groupId>org.apache.clerezza</groupId> - <version>8-SNAPSHOT</version> + <version>7</version> <relativePath>../../parent</relativePath> </parent> <groupId>org.apache.clerezza.provisioning</groupId> <artifactId>rdf.tdb</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <packaging>feature</packaging> <name>Clerezza - Provisioning - Jena TDB Storage</name> @@ -46,13 +46,13 @@ <dependency> <groupId>org.apache.clerezza</groupId> <artifactId>rdf.jena.tdb.storage</artifactId> - <version>1.0.0</version> + <version>1.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.clerezza.ext</groupId> <artifactId>org.apache.jena.jena-tdb</artifactId> - <version>1.0.1_1</version> + <version>1.1.2_1-SNAPSHOT</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/clerezza/blob/c256030e/provisioning/rdf/pom.xml ---------------------------------------------------------------------- diff --git a/provisioning/rdf/pom.xml b/provisioning/rdf/pom.xml index 08a20a6..e14202a 100644 --- a/provisioning/rdf/pom.xml +++ b/provisioning/rdf/pom.xml @@ -25,13 +25,13 @@ <parent> <artifactId>clerezza</artifactId> <groupId>org.apache.clerezza</groupId> - <version>8-SNAPSHOT</version> + <version>7</version> <relativePath>../../parent</relativePath> </parent> <groupId>org.apache.clerezza.provisioning</groupId> <artifactId>rdf</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <packaging>feature</packaging> <name>Clerezza - Provisioning - RDF</name> @@ -47,6 +47,12 @@ <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> </dependency> + <!-- needed by jena/arq --> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.4</version> + </dependency> <dependency> <groupId>org.apache.clerezza.ext</groupId> <artifactId>com.ibm.icu</artifactId> @@ -118,12 +124,12 @@ <dependency> <groupId>org.apache.clerezza</groupId> <artifactId>rdf.jena.commons</artifactId> - <version>1.0.0</version> + <version>1.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.clerezza</groupId> <artifactId>rdf.jena.facade</artifactId> - <version>1.0.0</version> + <version>1.1.0-SNAPSHOT</version> </dependency> <!-- requirws an older version jena-iri <dependency> @@ -144,22 +150,22 @@ <dependency> <groupId>org.apache.clerezza</groupId> <artifactId>rdf.jena.serializer</artifactId> - <version>1.0.0</version> + <version>1.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.clerezza</groupId> <artifactId>rdf.jena.parser</artifactId> - <version>1.0.0</version> + <version>1.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.clerezza</groupId> <artifactId>rdf.jena.sparql</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.clerezza</groupId> <artifactId>rdf.jena.storage</artifactId> - <version>1.0.0</version> + <version>1.1.0-SNAPSHOT</version> </dependency> <!-- <dependency> <groupId>org.apache.clerezza</groupId> @@ -174,17 +180,17 @@ <dependency> <groupId>org.apache.clerezza.ext</groupId> <artifactId>org.apache.jena.jena-iri</artifactId> - <version>1.0.1_1</version> + <version>1.1.2_1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.clerezza.ext</groupId> <artifactId>org.apache.jena.jena-core</artifactId> - <version>2.11.1_1</version> + <version>2.13.0_1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.clerezza.ext</groupId> <artifactId>org.apache.jena.jena-arq</artifactId> - <version>2.11.1_1</version> + <version>2.13.0_1-SNAPSHOT</version> </dependency> <!-- <dependency> <groupId>org.apache.clerezza.ext</groupId> http://git-wip-us.apache.org/repos/asf/clerezza/blob/c256030e/releases/201508/README.md ---------------------------------------------------------------------- diff --git a/releases/201508/README.md b/releases/201508/README.md new file mode 100644 index 0000000..7818e2d --- /dev/null +++ b/releases/201508/README.md @@ -0,0 +1,15 @@ +# CLEREZZA 201508 release + +This is a partial relase of clerezza. + +To build it run + + mvn install + +from the folder + + releases/201508/ + +after that will have several launchers in the target directories below + + provisioning/launchers/ http://git-wip-us.apache.org/repos/asf/clerezza/blob/c256030e/releases/201508/pom.xml ---------------------------------------------------------------------- diff --git a/releases/201508/pom.xml b/releases/201508/pom.xml new file mode 100644 index 0000000..39584a6 --- /dev/null +++ b/releases/201508/pom.xml @@ -0,0 +1,95 @@ +<?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.releases</groupId> + <artifactId>201508</artifactId> + <version>1-SNAPSHOT</version> + <packaging>pom</packaging> + <name>Clerezza - Release 201508</name> + + <modules> + <module>../../ext</module> + <module>../../rdf/jena</module> + <module>../../rdf/rdfjson</module> + <module>../../rdf/web/rdf.web.core</module> + <!-- this is not yet used in launcher (as it needs to be listed inthe feature.xml --> + <module>../../jaxrs.whiteboard.jersey</module> + <module>../../provisioning/jaxrs-whiteboard</module> + <module>../../provisioning/rdf</module> + <module>../../provisioning/rdf.tdb</module> + <module>../../provisioning/rdf.web</module> + <module>../../provisioning/launchers/content-launcher</module> + <module>../../provisioning/launchers/linked-data-launcher</module> + <module>../../provisioning/launchers/tests/content-launcher-tests</module> + </modules> + <scm> + <connection>scm:git:git://git.apache.org/clerezza.git</connection> + <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/clerezza.git</developerConnection> + <url>http://git.apache.org/clerezza.git</url> + </scm> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.5.4</version> + <executions> + <execution> + <id>distro-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/assembly/source-release.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <version>2.5.2</version> + <configuration> + <updateDependencies>false</updateDependencies> + </configuration> + </plugin> + </plugins> + </build> +</project> http://git-wip-us.apache.org/repos/asf/clerezza/blob/c256030e/releases/201508/src/assembly/source-release.xml ---------------------------------------------------------------------- diff --git a/releases/201508/src/assembly/source-release.xml b/releases/201508/src/assembly/source-release.xml new file mode 100644 index 0000000..fb879e1 --- /dev/null +++ b/releases/201508/src/assembly/source-release.xml @@ -0,0 +1,84 @@ +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd";> + <id>src</id> + <formats> + + <format>zip</format> + + </formats> + + <baseDirectory>clerezza</baseDirectory> + + <fileSets> + <fileSet> + <directory>../../</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>jaxrs.rdf.providers/**</include> + <include>rdf/**</include> + <include>templating/**</include> + <include>templating.seedsnipe/**</include> + <include>parent/**</include> + <include>platform/config/**</include> + <include>platform/config.gui/**</include> + <include>platform/content/**</include> + <include>platform/content.default404/**</include> + <include>platform/content.fsadaptor/**</include> + <include>platform/globalmenu.api/**</include> + <include>platform/platform/**</include> + <include>platform/style.default/**</include> + <include>platform/typehandlerspace/**</include> + <include>platform/typehandlerspace.jaxrs2/**</include> + <include>platform/typerendering/**</include> + <include>platform/typerendering.scala/**</include> + <include>platform/typerendering.scalaserverpages/**</include> + <include>platform/typerendering.seedsnipe/**</include> + <include>platform/typerendering.gui/**</include> + <include>platform/editor/**</include> + <include>platform/graphnodeprovider/**</include> + <include>platform/graphprovider.content/**</include> + <include>platform/documentation/**</include> + <include>platform/documentation.viewer/**</include> + <include>platform/users/**</include> + <include>platform/usermanager/**</include> + <include>platform/typepriority/**</include> + <include>provisioning/felixosgi/**</include> + <include>provisioning/felixweb/**</include> + <include>provisioning/jaxrs-whiteboard/**</include> + <include>provisioning/launchers/content-launcher/**</include> + <include>provisioning/launchers/linked-data-launcher/**</include> + <include>provisioning/launchers/typerendering-launcher/**</include> + <include>provisioning/launchers/website-launcher/**</include> + <include>provisioning/platform.content/**</include> + <include>provisioning/platform.graphnodeprovider/**</include> + <include>provisioning/rdf/**</include> + <include>provisioning/rdf.tdb/**</include> + <include>provisioning/rdf.web/**</include> + <include>provisioning/site.tools/**</include> + <include>provisioning/typehandlerspace/**</include> + <include>provisioning/typerendering/**</include> + <include>scala-scripting/**</include> + <include>site/**</include> + <include>tools.offline/**</include> + <include>web.fileserver/**</include> + <include>releases/201505/**</include> + </includes> + <excludes> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*]</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory> + <outputDirectory>/</outputDirectory> + </fileSet> + <!-- license, readme, etc. calculated at build time --> + <fileSet> + <directory>./</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>README.md</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file
