incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject svn commit: r1514598 - in /sling/whiteboard/bdelacretaz: ./ bdelacretaz-oak-server/pom.xml it-repository/pom.xml it-repository/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java pom.xml
Date Fri, 16 Aug 2013 07:27:00 GMT
Author: bdelacretaz
Date: Fri Aug 16 07:26:59 2013
New Revision: 1514598

URL: http://svn.apache.org/r1514598
Log:
SLING-3016 - variable Oak version

Added:
    sling/whiteboard/bdelacretaz/pom.xml   (with props)
Modified:
    sling/whiteboard/bdelacretaz/   (props changed)
    sling/whiteboard/bdelacretaz/bdelacretaz-oak-server/pom.xml
    sling/whiteboard/bdelacretaz/it-repository/pom.xml
    sling/whiteboard/bdelacretaz/it-repository/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java

Propchange: sling/whiteboard/bdelacretaz/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Aug 16 07:26:59 2013
@@ -0,0 +1,16 @@
+target
+sling
+bin
+logs
+jackrabbit
+derby.log
+*.iml
+*.ipr
+*.iws
+.settings
+.project
+.classpath
+.externalToolBuilders
+maven-eclipse.xml
+
+

Modified: sling/whiteboard/bdelacretaz/bdelacretaz-oak-server/pom.xml
URL: http://svn.apache.org/viewvc/sling/whiteboard/bdelacretaz/bdelacretaz-oak-server/pom.xml?rev=1514598&r1=1514597&r2=1514598&view=diff
==============================================================================
--- sling/whiteboard/bdelacretaz/bdelacretaz-oak-server/pom.xml (original)
+++ sling/whiteboard/bdelacretaz/bdelacretaz-oak-server/pom.xml Fri Aug 16 07:26:59 2013
@@ -38,6 +38,7 @@
 
     <properties>
         <sling.java.version>6</sling.java.version>
+        <oak.version>0.8</oak.version>
     </properties>
 
     <build>
@@ -83,13 +84,13 @@
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>oak-jcr</artifactId>
-            <version>0.8</version>
+            <version>${oak.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>oak-core</artifactId>
-            <version>0.8</version>
+            <version>${oak.version}</version>
             <scope>provided</scope>
         </dependency>
         

Modified: sling/whiteboard/bdelacretaz/it-repository/pom.xml
URL: http://svn.apache.org/viewvc/sling/whiteboard/bdelacretaz/it-repository/pom.xml?rev=1514598&r1=1514597&r2=1514598&view=diff
==============================================================================
--- sling/whiteboard/bdelacretaz/it-repository/pom.xml (original)
+++ sling/whiteboard/bdelacretaz/it-repository/pom.xml Fri Aug 16 07:26:59 2013
@@ -26,11 +26,22 @@
         <exam.version>3.2.0</exam.version>
         <url.version>1.5.2</url.version>
         <org.ops4j.pax.logging.DefaultServiceLog.level>INFO</org.ops4j.pax.logging.DefaultServiceLog.level>
+        <oak.version>0.8</oak.version>
     </properties>
 
     <build>
         <plugins>
-            <plugin>
+           <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <argLine>-Xmx1024m -XX:MaxPermSize=368m</argLine>
+                    <systemPropertyVariables>
+                        <oak.version>${oak.version}</oak.version>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+             <plugin>
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <executions>
                   <execution>
@@ -50,6 +61,10 @@
                             <name>org.osgi.service.http.port</name>
                             <value>${http.port}</value>
                         </property>
+                        <property>
+                            <name>oak.version</name>
+                            <value>${oak.version}</value>
+                        </property>
                     </systemProperties>
                     <argLine>
                         -Xmx1024m -XX:MaxPermSize=256m

Modified: sling/whiteboard/bdelacretaz/it-repository/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/bdelacretaz/it-repository/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java?rev=1514598&r1=1514597&r2=1514598&view=diff
==============================================================================
--- sling/whiteboard/bdelacretaz/it-repository/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java
(original)
+++ sling/whiteboard/bdelacretaz/it-repository/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java
Fri Aug 16 07:26:59 2013
@@ -37,6 +37,7 @@ public class OakRepositoryIT extends Sli
     @org.ops4j.pax.exam.Configuration
     public Option[] config() {
         final String localRepo = System.getProperty("maven.repo.local", "");
+        final String oakVersion = System.getProperty("oak.version", "NO_OAK_VERSION??");
 
         return options(
                 when( localRepo.length() > 0 ).useOptions(
@@ -102,12 +103,12 @@ public class OakRepositoryIT extends Sli
                 mavenBundle("org.apache.jackrabbit", "jackrabbit-api", "2.7.0"),
                 mavenBundle("org.apache.jackrabbit", "jackrabbit-jcr-commons", "2.7.0"),
                 mavenBundle("org.apache.jackrabbit", "jackrabbit-jcr-rmi", "2.4.2"),
-                mavenBundle("org.apache.jackrabbit", "oak-core", "0.8"),
-                //mavenBundle("org.apache.jackrabbit", "oak-jcr", "0.8"),
-                mavenBundle("org.apache.jackrabbit", "oak-commons", "0.8"),
-                mavenBundle("org.apache.jackrabbit", "oak-mk", "0.8"),
-                mavenBundle("org.apache.jackrabbit", "oak-mk-api", "0.8"),
-                mavenBundle("org.apache.jackrabbit", "oak-mk-remote", "0.8"),
+                mavenBundle("org.apache.jackrabbit", "oak-core", oakVersion),
+                //mavenBundle("org.apache.jackrabbit", "oak-jcr", oakVersion),
+                mavenBundle("org.apache.jackrabbit", "oak-commons", oakVersion),
+                mavenBundle("org.apache.jackrabbit", "oak-mk", oakVersion),
+                mavenBundle("org.apache.jackrabbit", "oak-mk-api", oakVersion),
+                mavenBundle("org.apache.jackrabbit", "oak-mk-remote", oakVersion),
 
                 // Testing
                 mavenBundle("org.apache.sling", "org.apache.sling.testing.tools", "1.0.6"),

Added: sling/whiteboard/bdelacretaz/pom.xml
URL: http://svn.apache.org/viewvc/sling/whiteboard/bdelacretaz/pom.xml?rev=1514598&view=auto
==============================================================================
--- sling/whiteboard/bdelacretaz/pom.xml (added)
+++ sling/whiteboard/bdelacretaz/pom.xml Fri Aug 16 07:26:59 2013
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    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>
+        <groupId>org.apache.sling</groupId>
+        <artifactId>sling</artifactId>
+        <version>15</version>
+    </parent>
+
+    <artifactId>org.apache.sling.whiteboard.bdelacretaz.reactor</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>Apache Sling WHITEBOARD REACTOR</name>
+
+    <modules>
+        <module>bdelacretaz-oak-server</module>
+        <module>it-repository</module>
+    </modules>
+</project>

Propchange: sling/whiteboard/bdelacretaz/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message