Author: reto
Date: Thu Jan 26 09:41:50 2012
New Revision: 1236116
URL: http://svn.apache.org/viewvc?rev=1236116&view=rev
Log:
CLEREZZA-536: Applied patch Florent
Modified:
incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/pom.xml
incubator/clerezza/trunk/parent/platform.accountcontrolpanel/pom.xml
incubator/clerezza/trunk/parent/platform.content/pom.xml
incubator/clerezza/trunk/parent/platform.graphnodeprovider/pom.xml
incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/pom.xml
incubator/clerezza/trunk/parent/pom.xml
incubator/clerezza/trunk/parent/rdf.storage.web/pom.xml
incubator/clerezza/trunk/parent/shell/pom.xml
incubator/clerezza/trunk/parent/slf4j-scala-api/pom.xml
Modified:
incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/pom.xml?rev=1236116&r1=1236115&r2=1236116&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/pom.xml
(original)
+++
incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/pom.xml
Thu Jan 26 09:41:50 2012
@@ -135,10 +135,10 @@
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.config</artifactId>
</dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.typerendering.scala</artifactId>
@@ -171,9 +171,9 @@
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.security.foafssl.ontologies</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.clerezza.ext</groupId>
- <artifactId>slf4j-scala-api</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza.ext</groupId>
+ <artifactId>slf4j-scala-api</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: incubator/clerezza/trunk/parent/platform.accountcontrolpanel/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.accountcontrolpanel/pom.xml?rev=1236116&r1=1236115&r2=1236116&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/platform.accountcontrolpanel/pom.xml
(original)
+++ incubator/clerezza/trunk/parent/platform.accountcontrolpanel/pom.xml Thu
Jan 26 09:41:50 2012
@@ -31,8 +31,7 @@
<packaging>pom</packaging>
<version>0.9-incubating-SNAPSHOT</version>
<name>Clerezza - Platform Account Control Panel</name>
- <description>A web interface that provides functions to configure the
account
- of a platform user.</description>
+ <description>A web interface that provides functions to configure the
account of a platform user.</description>
<modules>
<module>platform.accountcontrolpanel.ontologies</module>
Modified: incubator/clerezza/trunk/parent/platform.content/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.content/pom.xml?rev=1236116&r1=1236115&r2=1236116&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/platform.content/pom.xml (original)
+++ incubator/clerezza/trunk/parent/platform.content/pom.xml Thu Jan 26
09:41:50 2012
@@ -128,6 +128,10 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.clerezza.ext</groupId>
+ <artifactId>slf4j-scala-api</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
Modified: incubator/clerezza/trunk/parent/platform.graphnodeprovider/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.graphnodeprovider/pom.xml?rev=1236116&r1=1236115&r2=1236116&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/platform.graphnodeprovider/pom.xml
(original)
+++ incubator/clerezza/trunk/parent/platform.graphnodeprovider/pom.xml Thu Jan
26 09:41:50 2012
@@ -61,7 +61,7 @@
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.usermanager</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.ontologies</artifactId>
</dependency>
@@ -77,10 +77,14 @@
<groupId>org.apache.clerezza</groupId>
<artifactId>osgi.services</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.clerezza.ext</groupId>
+ <artifactId>slf4j-scala-api</artifactId>
+ </dependency>
</dependencies>
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
Modified:
incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/pom.xml?rev=1236116&r1=1236115&r2=1236116&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/pom.xml
(original)
+++
incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/pom.xml
Thu Jan 26 09:41:50 2012
@@ -81,5 +81,9 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.clerezza.ext</groupId>
+ <artifactId>slf4j-scala-api</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: incubator/clerezza/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/pom.xml?rev=1236116&r1=1236115&r2=1236116&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/pom.xml (original)
+++ incubator/clerezza/trunk/parent/pom.xml Thu Jan 26 09:41:50 2012
@@ -366,7 +366,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0.1</version>
+ <version>2.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -541,10 +541,6 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.clerezza.ext</groupId>
- <artifactId>slf4j-scala-api</artifactId>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
Modified: incubator/clerezza/trunk/parent/rdf.storage.web/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/rdf.storage.web/pom.xml?rev=1236116&r1=1236115&r2=1236116&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/rdf.storage.web/pom.xml (original)
+++ incubator/clerezza/trunk/parent/rdf.storage.web/pom.xml Thu Jan 26 09:41:50
2012
@@ -57,14 +57,18 @@
<groupId>org.apache.clerezza</groupId>
<artifactId>osgi.services</artifactId>
</dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza.ext</groupId>
+ <artifactId>slf4j-scala-api</artifactId>
+ </dependency>
</dependencies>
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
Modified: incubator/clerezza/trunk/parent/shell/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/shell/pom.xml?rev=1236116&r1=1236115&r2=1236116&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/shell/pom.xml (original)
+++ incubator/clerezza/trunk/parent/shell/pom.xml Thu Jan 26 09:41:50 2012
@@ -64,6 +64,10 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.clerezza.ext</groupId>
+ <artifactId>slf4j-scala-api</artifactId>
+ </dependency>
</dependencies>
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
Modified: incubator/clerezza/trunk/parent/slf4j-scala-api/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/slf4j-scala-api/pom.xml?rev=1236116&r1=1236115&r2=1236116&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/slf4j-scala-api/pom.xml (original)
+++ incubator/clerezza/trunk/parent/slf4j-scala-api/pom.xml Thu Jan 26 09:41:50
2012
@@ -23,9 +23,9 @@
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";>
<parent>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-parent</artifactId>
- <version>1.6.1</version>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>clerezza</artifactId>
+ <version>0.2-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -43,19 +43,16 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <scala.version>2.8.1</scala.version>
</properties>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.1</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
- <version>${scala.version}</version>
</dependency>
<dependency>
<groupId>org.scala-tools.testing</groupId>
@@ -72,13 +69,11 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.6.1</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -89,7 +84,6 @@
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
- <version>2.14.1</version>
<configuration>
<scalaVersion>${scala.version}</scalaVersion>
<charset>${project.build.sourceEncoding}</charset>
@@ -114,7 +108,6 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
<configuration>
<includes>
<include>**/*Spec.java</include>
@@ -126,15 +119,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.1.0</version>
<extensions>true</extensions>
- <!--executions>
- <execution>
- <goals>
- <goal>bundle</goal>
- </goals>
- </execution>
- </executions-->
<configuration>
<instructions>
<Bundle-RequiredExecutionEnvironment>J2SE-1.5,JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
@@ -148,90 +133,7 @@
</configuration>
</plugin>
- <!--plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>once</forkMode>
- <reportFormat>plain</reportFormat>
- <trimStackTrace>false</trimStackTrace>
- <excludes>
- <exclude>**/AllTest.java</exclude>
- <exclude>**/PackageTest.java</exclude>
- </excludes>
- </configuration>
- </plugin-->
-
- <!--plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
- <Bundle-Description>${project.description}</Bundle-Description>
-
<Implementation-Version>${project.version}</Implementation-Version>
- </manifestEntries>
-
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- <executions>
- <execution>
- <id>bundle-test-jar</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin-->
-
- <!--plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-classes</phase>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <tasks>
- <echo>Removing slf4j-api's dummy StaticLoggerBinder and
StaticMarkerBinder</echo>
- <delete dir="target/classes/org/slf4j/impl"/>
- </tasks>
- </configuration>
- </plugin-->
-
</plugins>
</build>
- <distributionManagement>
- <!-- where to deploy the artifacts -->
- <repository>
- <id>apache.releases.https</id>
- <name>Apache Release Distribution Repository</name>
-
<url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
- </repository>
- <snapshotRepository>
- <id>apache.snapshots.https</id>
- <name>Apache Development Snapshot Repository</name>
-
<url>https://repository.apache.org/content/repositories/snapshots</url>
- </snapshotRepository>
- </distributionManagement>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
- <configuration>
- <comparisonVersion>1.5.6</comparisonVersion>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
</project>
