You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2015/03/22 18:31:10 UTC

[6/9] clerezza git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/clerezza into rdf-commons

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/clerezza into rdf-commons


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

Branch: refs/heads/rdf-commons
Commit: 5332bd2dea447756ce0bc43807c8a88e7676f4db
Parents: be4be80 6ba32de
Author: Reto Gmuer <re...@apache.org>
Authored: Sun Mar 22 17:11:47 2015 +0000
Committer: Reto Gmuer <re...@apache.org>
Committed: Sun Mar 22 17:11:47 2015 +0000

----------------------------------------------------------------------
 parent/pom.xml   | 2 +-
 rdf/core/pom.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/clerezza/blob/5332bd2d/rdf/core/pom.xml
----------------------------------------------------------------------
diff --cc rdf/core/pom.xml
index f62e55d,0000000..9e134ea
mode 100644,000000..100644
--- a/rdf/core/pom.xml
+++ b/rdf/core/pom.xml
@@@ -1,136 -1,0 +1,136 @@@
 +<?xml version="1.0" encoding="UTF-8" standalone="no"?><!--
 +
 + 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>
 +    <parent>
 +        <artifactId>clerezza</artifactId>
 +        <groupId>org.apache.clerezza</groupId>
-         <version>1.0.0-SNAPSHOT</version>
++        <version>7-SNAPSHOT</version>
 +        <relativePath>../parent</relativePath>
 +    </parent>
 +    <groupId>org.apache.clerezza</groupId>
 +    <artifactId>rdf.core</artifactId>
 +    <packaging>bundle</packaging>
 +    <version>1.0.0-SNAPSHOT</version>
 +    <name>Clerezza - RDF - Core</name>
 +    <description>Interfaces and utilities to access RDF Graphs</description>
 +    <dependencies>
 +        <dependency>
 +            <groupId>org.apache.clerezza.commons-rdf</groupId>
 +            <artifactId>commons-rdf-api</artifactId>
 +            <version>0.1-SNAPSHOT</version>
 +        </dependency>
 +        <dependency>
 +            <groupId>org.apache.clerezza.commons-rdf</groupId>
 +            <artifactId>commons-rdf-impl-utils</artifactId>
 +            <version>0.1-SNAPSHOT</version>
 +        </dependency>
 +        <dependency>
 +            <groupId>org.osgi</groupId>
 +            <artifactId>org.osgi.core</artifactId>
 +        </dependency>
 +        <dependency>
 +            <groupId>org.osgi</groupId>
 +            <artifactId>org.osgi.compendium</artifactId>
 +        </dependency>
 +        <dependency>
 +            <groupId>org.apache.felix</groupId>
 +            <artifactId>org.apache.felix.scr.annotations</artifactId>
 +        </dependency>
 +        <dependency>
 +            <groupId>org.apache.felix</groupId>
 +            <artifactId>org.apache.felix.scr.ds-annotations</artifactId>
 +            <version>1.2.8</version>
 +        </dependency>
 +        <dependency>
 +            <groupId>org.apache.clerezza</groupId>
 +            <artifactId>utils</artifactId>
 +            <version>0.2</version>
 +        </dependency>
 +        <dependency>
 +            <groupId>junit</groupId>
 +            <artifactId>junit</artifactId>
 +            <scope>test</scope>
 +        </dependency>
 +		    <dependency>
 +			      <groupId>org.mockito</groupId>
 +			      <artifactId>mockito-core</artifactId>
 +			      <version>1.9.5</version>
 +			      <scope>test</scope>
 +		    </dependency>
 +    </dependencies>
 +    <build>
 +        <plugins>
 +            <plugin>
 +                <groupId>org.codehaus.mojo</groupId>
 +                <artifactId>javacc-maven-plugin</artifactId>
 +                <version>2.5</version>
 +                <executions>
 +                    <execution>
 +                        <id>javacc</id>
 +                        <goals>
 +                            <goal>javacc</goal>
 +                        </goals>
 +                    </execution>
 +                </executions>
 +            </plugin>
 +            <plugin>
 +                <groupId>org.codehaus.xsite</groupId>
 +                <artifactId>xsite-maven-plugin</artifactId>
 +                <configuration>
 +                    <sourceDirectoryPath>${basedir}/src/site/xsite</sourceDirectoryPath>
 +                    <sitemapPath>content/sitemap.xml</sitemapPath>
 +                    <skinPath>templates/skin.html</skinPath>
 +                    <outputDirectoryPath>${basedir}/target/site/documentation</outputDirectoryPath>
 +                </configuration>
 +                <executions>
 +                    <execution>
 +                        <phase>site</phase>
 +                        <goals>
 +                            <goal>run</goal>
 +                        </goals>
 +                    </execution>
 +                </executions>
 +            </plugin>
 +            <plugin>
 +                <groupId>org.apache.felix</groupId>
 +                <artifactId>maven-bundle-plugin</artifactId>
 +                <extensions>true</extensions>
 +                <configuration>
 +                    <instructions>
 +                        <Export-Package>org.apache.clerezza.rdf.core.*</Export-Package>
 +                    </instructions>
 +                </configuration>
 +            </plugin>
 +            <plugin>
 +                <groupId>org.apache.felix</groupId>
 +                <artifactId>maven-scr-plugin</artifactId>
 +                <executions>
 +                    <execution>
 +                        <id>generate-scr-scrdescriptor</id>
 +                        <goals>
 +                            <goal>scr</goal>
 +                        </goals>
 +                    </execution>
 +                </executions>
 +            </plugin>
 +        </plugins>
 +    </build>
- </project>
++</project>