Jenkins build is still unstable: sling-trunk-1.8 #1737

2015-10-09 Thread Apache Jenkins Server 
See

Jenkins build is still unstable: sling-trunk-1.7 #2458

2015-10-09 Thread Apache Jenkins Server 
See

Jenkins build became unstable: sling-trunk-1.7 #2457

2015-10-09 Thread Apache Jenkins Server 
See

Jenkins build is still unstable: sling-trunk-1.8 #1736

2015-10-09 Thread Apache Jenkins Server 
See

Jenkins build is still unstable: sling-contrib-1.7 #451

2015-10-09 Thread Apache Jenkins Server 
See

Jenkins build is back to stable : sling-trunk-1.7 #2456

2015-10-09 Thread Apache Jenkins Server 
See

Jenkins build is still unstable: sling-trunk-1.8 #1735

2015-10-09 Thread Apache Jenkins Server 
See

Jenkins build is unstable: sling-trunk-1.8 #1734

2015-10-09 Thread Apache Jenkins Server 
See

Jenkins build is unstable: sling-contrib-1.7 #450

2015-10-09 Thread Apache Jenkins Server 
See

Jenkins build is unstable: sling-trunk-1.7 #2455

2015-10-09 Thread Apache Jenkins Server 
See

svn commit: r1707755 - in /sling/trunk/tooling/ide: ./ eclipse-sightly-core/ eclipse-sightly-core/META-INF/ eclipse-sightly-core/src/ eclipse-sightly-core/src/org/ eclipse-sightly-core/src/org/apache/

2015-10-09 Thread rombert 
Author: rombert
Date: Fri Oct  9 15:09:46 2015
New Revision: 1707755

URL: http://svn.apache.org/viewvc?rev=1707755&view=rev
Log:
SLING-4189 - Add basic code completion for Sightly 

Add a basic Sightly feature which includes

- create a Sightly facet, which activates all Sightly-related features
- proposal completion for tag names and attribute names
- ensures that using the 'sly' tag is not a validation error

Added:
sling/trunk/tooling/ide/eclipse-sightly-core/
sling/trunk/tooling/ide/eclipse-sightly-core/.options
sling/trunk/tooling/ide/eclipse-sightly-core/META-INF/
sling/trunk/tooling/ide/eclipse-sightly-core/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/eclipse-sightly-core/build.properties
sling/trunk/tooling/ide/eclipse-sightly-core/plugin.xml
sling/trunk/tooling/ide/eclipse-sightly-core/pom.xml
sling/trunk/tooling/ide/eclipse-sightly-core/src/
sling/trunk/tooling/ide/eclipse-sightly-core/src/org/
sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/
sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/
sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/

sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/

sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/

sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/FacetHelper.java

sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/

sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/Activator.java

sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/SightlyFacetInstallDelegate.java

sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/SightlyFacetUninstallDelegate.java

sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/Validator.java

sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/model/

sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/model/Attribute.java

sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/model/ModelElements.java

sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/model/ProposalDescription.java

sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/model/Tag.java

sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/model/messages.properties

sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/validation/

sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/validation/ValidatorReporter.java
sling/trunk/tooling/ide/eclipse-sightly-ui/
sling/trunk/tooling/ide/eclipse-sightly-ui/.options
sling/trunk/tooling/ide/eclipse-sightly-ui/META-INF/
sling/trunk/tooling/ide/eclipse-sightly-ui/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/eclipse-sightly-ui/build.properties
sling/trunk/tooling/ide/eclipse-sightly-ui/icons/
sling/trunk/tooling/ide/eclipse-sightly-ui/icons/obj16/
sling/trunk/tooling/ide/eclipse-sightly-ui/icons/obj16/sightly.gif
sling/trunk/tooling/ide/eclipse-sightly-ui/plugin.xml
sling/trunk/tooling/ide/eclipse-sightly-ui/pom.xml
sling/trunk/tooling/ide/eclipse-sightly-ui/src/
sling/trunk/tooling/ide/eclipse-sightly-ui/src/org/
sling/trunk/tooling/ide/eclipse-sightly-ui/src/org/apache/
sling/trunk/tooling/ide/eclipse-sightly-ui/src/org/apache/sling/
sling/trunk/tooling/ide/eclipse-sightly-ui/src/org/apache/sling/ide/
sling/trunk/tooling/ide/eclipse-sightly-ui/src/org/apache/sling/ide/eclipse/

sling/trunk/tooling/ide/eclipse-sightly-ui/src/org/apache/sling/ide/eclipse/sightly/

sling/trunk/tooling/ide/eclipse-sightly-ui/src/org/apache/sling/ide/eclipse/sightly/ui/

sling/trunk/tooling/ide/eclipse-sightly-ui/src/org/apache/sling/ide/eclipse/sightly/ui/internal/

sling/trunk/tooling/ide/eclipse-sightly-ui/src/org/apache/sling/ide/eclipse/sightly/ui/internal/ProposalComputer.java

sling/trunk/tooling/ide/eclipse-sightly-ui/src/org/apache/sling/ide/eclipse/sightly/ui/internal/SharedImages.java

sling/trunk/tooling/ide/eclipse-sightly-ui/src/org/apache/sling/ide/eclipse/sightly/ui/internal/TotalValidator.java
sling/trunk/tooling/ide/sightly-feature/
sling/trunk/tooling/ide/sightly-feature/META-INF/
sling/trunk/tooling/ide/sightly-feature/META-INF/LICENSE
sling/trunk/tooling/ide/sightly-feature/META-INF/NOTICE
sling/trunk/tooling/ide/sightly-feature/build.properties
sling/trunk/tooling/ide/sightly-feature/feature.xml
sling/trunk/tooling/ide/sightly-feature/pom.xml
Modified:
sling/trunk/too

svn commit: r1707757 - /sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ConfigurationHelper.java

2015-10-09 Thread rombert 
Author: rombert
Date: Fri Oct  9 15:09:55 2015
New Revision: 1707757

URL: http://svn.apache.org/viewvc?rev=1707757&view=rev
Log:
SLING-4189 - Add basic code completion for Sightly 

Install the Sightly facet when configuring a content project.

Modified:

sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ConfigurationHelper.java

Modified: 
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ConfigurationHelper.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ConfigurationHelper.java?rev=1707757&r1=1707756&r2=1707757&view=diff
==
--- 
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ConfigurationHelper.java
 (original)
+++ 
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ConfigurationHelper.java
 Fri Oct  9 15:09:55 2015
@@ -28,14 +28,23 @@ import org.eclipse.wst.common.project.fa
 
 public class ConfigurationHelper {
 
-   public static void convertToContentPackageProject(IProject 
aContentProject,
-   IProgressMonitor monitor, IPath jcr_root) throws 
CoreException {
-   IProjectFacet slingContentFacet = 
ProjectFacetsManager.getProjectFacet("sling.content");
-   IFacetedProject fp2 = 
ProjectFacetsManager.create(aContentProject, true, null);
-   fp2.installProjectFacet(slingContentFacet.getLatestVersion(), 
null, null);
+   public static void convertToContentPackageProject(IProject project,
+   IProgressMonitor monitor, IPath contentSyncRoot) throws 
CoreException {
+
+   IFacetedProject facetedProject = 
ProjectFacetsManager.create(project, true, null);
+   
+   // install content facet
+   IProjectFacet slingContentFacet = 
ProjectFacetsManager.getProjectFacet("sling.content");
+   
facetedProject.installProjectFacet(slingContentFacet.getLatestVersion(), null, 
null);
+   ProjectUtil.setSyncDirectoryPath(project, contentSyncRoot);
+   
+   // also install sightly facet 1.1 by default
+   IProjectFacet sightlyFacet = 
ProjectFacetsManager.getProjectFacet("sightly");
+   if ( sightlyFacet != null ) {
+   
facetedProject.installProjectFacet(sightlyFacet.getLatestVersion(), null, null);
+   }

-   ProjectUtil.setSyncDirectoryPath(aContentProject, jcr_root);
-   aContentProject.refreshLocal(IResource.DEPTH_INFINITE, new 
NullProgressMonitor());
+   project.refreshLocal(IResource.DEPTH_INFINITE, new 
NullProgressMonitor());
}
 
public static void convertToBundleProject(IProject aBundleProject)

svn commit: r1707756 - in /sling/trunk/tooling/ide/eclipse-sightly-core: META-INF/MANIFEST.MF src/org/apache/sling/ide/eclipse/sightly/internal/SightlyFacetInstallDelegate.java

2015-10-09 Thread rombert 
Author: rombert
Date: Fri Oct  9 15:09:51 2015
New Revision: 1707756

URL: http://svn.apache.org/viewvc?rev=1707756&view=rev
Log:
SLING-4189 - Add basic code completion for Sightly 

Disable the HTML validator when installing the Sightly nature in order
to prevent it from marking Sightly-specific constructs as invalid.

Modified:
sling/trunk/tooling/ide/eclipse-sightly-core/META-INF/MANIFEST.MF

sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/SightlyFacetInstallDelegate.java

Modified: sling/trunk/tooling/ide/eclipse-sightly-core/META-INF/MANIFEST.MF
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-sightly-core/META-INF/MANIFEST.MF?rev=1707756&r1=1707755&r2=1707756&view=diff
==
--- sling/trunk/tooling/ide/eclipse-sightly-core/META-INF/MANIFEST.MF (original)
+++ sling/trunk/tooling/ide/eclipse-sightly-core/META-INF/MANIFEST.MF Fri Oct  
9 15:09:51 2015
@@ -18,7 +18,9 @@ Import-Package: org.eclipse.jface.resour
  org.eclipse.wst.sse.core.internal.provisional.text,
  org.eclipse.wst.sse.core.internal.validate,
  org.eclipse.wst.validation,
+ org.eclipse.wst.validation.internal,
  org.eclipse.wst.validation.internal.core,
+ org.eclipse.wst.validation.internal.model,
  org.eclipse.wst.validation.internal.provisional.core,
  org.eclipse.wst.xml.core.internal.provisional.document,
  org.eclipse.wst.xml.core.internal.regions

Modified: 
sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/SightlyFacetInstallDelegate.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/SightlyFacetInstallDelegate.java?rev=1707756&r1=1707755&r2=1707756&view=diff
==
--- 
sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/SightlyFacetInstallDelegate.java
 (original)
+++ 
sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/SightlyFacetInstallDelegate.java
 Fri Oct  9 15:09:51 2015
@@ -21,13 +21,55 @@ import org.eclipse.core.runtime.CoreExce
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.wst.common.project.facet.core.IDelegate;
 import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+import org.eclipse.wst.validation.Validator;
+import org.eclipse.wst.validation.internal.ValManager;
+import org.eclipse.wst.validation.internal.ValPrefManagerProject;
+import org.eclipse.wst.validation.internal.ValidatorMutable;
+import org.eclipse.wst.validation.internal.model.ProjectPreferences;
 
+/**
+ * The SightlyFacetInstallDelegate ensures that the HTML validator is 
not active
+ * 
+ * Since the Sightly validators delegate to the HTML counterparts and also 
ensure that 
+ * Sightly-specific constructs do not trigger validation problems it is 
completely safe
+ * to disable the HTML validator 
+ */
+@SuppressWarnings("restriction")
 public class SightlyFacetInstallDelegate implements IDelegate {
 
+private static final String HTML_VALIDATOR_ID = 
"org.eclipse.wst.html.core.HTMLValidator";
+
 @Override
 public void execute(IProject project, IProjectFacetVersion version, Object 
config, IProgressMonitor monitor)
 throws CoreException {
 
+Validator[] validators = 
ValManager.getDefault().getValidators(project);
+ValidatorMutable[] mutis = new ValidatorMutable[validators.length];
+for ( int i = 0 ; i < validators.length; i++) {
+mutis[i] = new ValidatorMutable(validators[i]);
+}
+
+boolean changed = false;
 
+for ( ValidatorMutable validator : mutis ) {
+if ( HTML_VALIDATOR_ID.equals(validator.getId()) ) {
+if ( validator.isManualValidation() || 
validator.isBuildValidation() ) {
+validator.setBuildValidation(false);
+validator.setManualValidation(false);
+changed = true;
+}
+}
+}
+
+ProjectPreferences projectPreferences = 
ValManager.getDefault().getProjectPreferences(project);
+if ( !projectPreferences.getOverride() ) {
+projectPreferences = new ProjectPreferences(project, true, 
projectPreferences.getSuspend(), null);
+}
+
+if ( changed || !projectPreferences.getOverride() ) {
+ValPrefManagerProject prefManager = new 
ValPrefManagerProject(project);
+prefManager.savePreferences(projectPreferences, mutis);
+}
+   
 }
 }

svn commit: r1707754 - /sling/trunk/tooling/ide/m2e-feature/feature.xml

2015-10-09 Thread rombert 
Author: rombert
Date: Fri Oct  9 15:09:15 2015
New Revision: 1707754

URL: http://svn.apache.org/viewvc?rev=1707754&view=rev
Log:
Clarify m2e-feature name

Modified:
sling/trunk/tooling/ide/m2e-feature/feature.xml

Modified: sling/trunk/tooling/ide/m2e-feature/feature.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/m2e-feature/feature.xml?rev=1707754&r1=1707753&r2=1707754&view=diff
==
--- sling/trunk/tooling/ide/m2e-feature/feature.xml (original)
+++ sling/trunk/tooling/ide/m2e-feature/feature.xml Fri Oct  9 15:09:15 2015
@@ -17,13 +17,12 @@
 -->
 
 
http://www.apache.org/licenses/LICENSE-2.0";>
-
- Apache License
+  Apache License
Version 2.0, January 2004
 http://www.apache.org/licenses/
 
@@ -31,38 +30,38 @@
 
1. Definitions.
 
-  "License" shall mean the terms and conditions for use, reproduction,
+  "License" shall mean the terms and conditions for use, 
reproduction,
   and distribution as defined by Sections 1 through 9 of this document.
 
-  "Licensor" shall mean the copyright owner or entity authorized by
+  "Licensor" shall mean the copyright owner or entity authorized 
by
   the copyright owner that is granting the License.
 
-  "Legal Entity" shall mean the union of the acting entity and all
+  "Legal Entity" shall mean the union of the acting entity and 
all
   other entities that control, are controlled by, or are under common
   control with that entity. For the purposes of this definition,
-  "control" means (i) the power, direct or indirect, to cause the
+  "control" means (i) the power, direct or indirect, to cause the
   direction or management of such entity, whether by contract or
   otherwise, or (ii) ownership of fifty percent (50%) or more of the
   outstanding shares, or (iii) beneficial ownership of such entity.
 
-  "You" (or "Your") shall mean an individual or Legal Entity
+  "You" (or "Your") shall mean an individual or Legal 
Entity
   exercising permissions granted by this License.
 
-  "Source" form shall mean the preferred form for making modifications,
+  "Source" form shall mean the preferred form for making 
modifications,
   including but not limited to software source code, documentation
   source, and configuration files.
 
-  "Object" form shall mean any form resulting from mechanical
+  "Object" form shall mean any form resulting from mechanical
   transformation or translation of a Source form, including but
   not limited to compiled object code, generated documentation,
   and conversions to other media types.
 
-  "Work" shall mean the work of authorship, whether in Source or
+  "Work" shall mean the work of authorship, whether in Source or
   Object form, made available under the License, as indicated by a
   copyright notice that is included in or attached to the work
   (an example is provided in the Appendix below).
 
-  "Derivative Works" shall mean any work, whether in Source or Object
+  "Derivative Works" shall mean any work, whether in Source or 
Object
   form, that is based on (or derived from) the Work and for which the
   editorial revisions, annotations, elaborations, or other modifications
   represent, as a whole, an original work of authorship. For the purposes
@@ -70,21 +69,21 @@
   separable from, or merely link (or bind by name) to the interfaces of,
   the Work and Derivative Works thereof.
 
-  "Contribution" shall mean any work of authorship, including
+  "Contribution" shall mean any work of authorship, including
   the original version of the Work and any modifications or additions
   to that Work or Derivative Works thereof, that is intentionally
   submitted to Licensor for inclusion in the Work by the copyright owner
   or by an individual or Legal Entity authorized to submit on behalf of
-  the copyright owner. For the purposes of this definition, "submitted"
+  the copyright owner. For the purposes of this definition, 
"submitted"
   means any form of electronic, verbal, or written communication sent
   to the Licensor or its representatives, including but not limited to
   communication on electronic mailing lists, source code control systems,
   and issue tracking systems that are managed by, or on behalf of, the
   Licensor for the purpose of discussing and improving the Work, but
   excluding communication that is conspicuously marked or otherwise
-  designated in writing by the copyright owner as "Not a Contribution."
+  designated in writing by the copyright owner as "Not a 
Contribution."
 
-  "Contributor" shall mean Licensor and any individual or Legal Entity
+  "Contributor" shall mean Licensor and any individua

svn commit: r1707737 - in /sling/trunk/samples/slingshot: pom.xml src/test/java/org/apache/sling/sample/slingshot/impl/SetupServiceTest.java

2015-10-09 Thread sseifert 
Author: sseifert
Date: Fri Oct  9 14:35:51 2015
New Revision: 1707737

URL: http://svn.apache.org/viewvc?rev=1707737&view=rev
Log:
update to released versions of sling mocks
switch to sling-mock-oak because i did not get sling-mock-jackrabbit test to 
run at windows.
no need any longer to manually register sling node types with latest sling-mock 
version.

Modified:
sling/trunk/samples/slingshot/pom.xml

sling/trunk/samples/slingshot/src/test/java/org/apache/sling/sample/slingshot/impl/SetupServiceTest.java

Modified: sling/trunk/samples/slingshot/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/pom.xml?rev=1707737&r1=1707736&r2=1707737&view=diff
==
--- sling/trunk/samples/slingshot/pom.xml (original)
+++ sling/trunk/samples/slingshot/pom.xml Fri Oct  9 14:35:51 2015
@@ -132,6 +132,15 @@
 
 
 
+
+
+
+org.apache.sling
+org.apache.sling.testing.sling-mock-oak
+1.0.0
+test
+
+
 
 org.osgi
 org.osgi.core
@@ -194,19 +203,13 @@
 
 org.apache.sling
 org.apache.sling.testing.osgi-mock
-1.5.1-SNAPSHOT
+1.6.0
 test
 
 
 org.apache.sling
 org.apache.sling.testing.sling-mock
-1.5.1-SNAPSHOT
-test
-
-
-org.apache.sling
-
org.apache.sling.testing.sling-mock-jackrabbit
-0.1.3-SNAPSHOT
+1.6.0
 test
 
 

Modified: 
sling/trunk/samples/slingshot/src/test/java/org/apache/sling/sample/slingshot/impl/SetupServiceTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/test/java/org/apache/sling/sample/slingshot/impl/SetupServiceTest.java?rev=1707737&r1=1707736&r2=1707737&view=diff
==
--- 
sling/trunk/samples/slingshot/src/test/java/org/apache/sling/sample/slingshot/impl/SetupServiceTest.java
 (original)
+++ 
sling/trunk/samples/slingshot/src/test/java/org/apache/sling/sample/slingshot/impl/SetupServiceTest.java
 Fri Oct  9 14:35:51 2015
@@ -27,23 +27,15 @@ import static org.mockito.Matchers.anySt
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import java.io.File;
-import java.io.IOException;
-
 import javax.jcr.Session;
 import javax.jcr.SimpleCredentials;
 
-import org.apache.commons.io.FileUtils;
 import org.apache.jackrabbit.api.security.user.UserManager;
 import org.apache.sling.api.resource.Resource;
-import org.apache.sling.commons.testing.jcr.RepositoryUtil;
 import org.apache.sling.jcr.base.util.AccessControlUtil;
 import org.apache.sling.sample.slingshot.SlingshotConstants;
-import org.apache.sling.sample.slingshot.impl.InternalConstants;
-import org.apache.sling.sample.slingshot.impl.SetupService;
 import org.apache.sling.testing.mock.sling.ResourceResolverType;
 import org.apache.sling.testing.mock.sling.junit.SlingContext;
-import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.osgi.service.cm.Configuration;
@@ -52,18 +44,11 @@ import org.osgi.service.cm.Configuration
 public class SetupServiceTest {
 
 @Rule
-public SlingContext context = new 
SlingContext(ResourceResolverType.JCR_JACKRABBIT);
-
-@Before
-public void cleanupIfNeeded() throws IOException {
-FileUtils.deleteDirectory(new File("target/repository"));
-}
+public SlingContext context = new 
SlingContext(ResourceResolverType.JCR_OAK);
 
 @Test
 public void setup() throws Exception{
 
-
RepositoryUtil.registerSlingNodeTypes(context.resourceResolver().adaptTo(Session.class));
-
 // create expected content structure
 context.load().json("/slingshot.json", 
SlingshotConstants.APP_ROOT_PATH);

svn commit: r1707736 - in /sling/trunk/samples/slingshot/src: main/java/org/apache/sling/sample/slingshot/ratings/impl/RatingPostServlet.java test/java/org/apache/sling/sample/slingshot/ratings/impl/R

2015-10-09 Thread sseifert 
Author: sseifert
Date: Fri Oct  9 14:33:27 2015
New Revision: 1707736

URL: http://svn.apache.org/viewvc?rev=1707736&view=rev
Log:
RatingPostServlet did not run under windows because of platform-dependent line 
ending: remove line ending in json response

Modified:

sling/trunk/samples/slingshot/src/main/java/org/apache/sling/sample/slingshot/ratings/impl/RatingPostServlet.java

sling/trunk/samples/slingshot/src/test/java/org/apache/sling/sample/slingshot/ratings/impl/RatingPostServletTest.java

Modified: 
sling/trunk/samples/slingshot/src/main/java/org/apache/sling/sample/slingshot/ratings/impl/RatingPostServlet.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/java/org/apache/sling/sample/slingshot/ratings/impl/RatingPostServlet.java?rev=1707736&r1=1707735&r2=1707736&view=diff
==
--- 
sling/trunk/samples/slingshot/src/main/java/org/apache/sling/sample/slingshot/ratings/impl/RatingPostServlet.java
 (original)
+++ 
sling/trunk/samples/slingshot/src/main/java/org/apache/sling/sample/slingshot/ratings/impl/RatingPostServlet.java
 Fri Oct  9 14:33:27 2015
@@ -95,7 +95,7 @@ public class RatingPostServlet extends S
 pw.print("{ ");
 pw.print(" \"rating\" : ");
 
pw.print(String.valueOf(ratingsService.getRating(request.getResource(;
-pw.println("}");
+pw.print("}");
 }
 
 }

Modified: 
sling/trunk/samples/slingshot/src/test/java/org/apache/sling/sample/slingshot/ratings/impl/RatingPostServletTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/test/java/org/apache/sling/sample/slingshot/ratings/impl/RatingPostServletTest.java?rev=1707736&r1=1707735&r2=1707736&view=diff
==
--- 
sling/trunk/samples/slingshot/src/test/java/org/apache/sling/sample/slingshot/ratings/impl/RatingPostServletTest.java
 (original)
+++ 
sling/trunk/samples/slingshot/src/test/java/org/apache/sling/sample/slingshot/ratings/impl/RatingPostServletTest.java
 Fri Oct  9 14:33:27 2015
@@ -61,7 +61,7 @@ public class RatingPostServletTest {
 assertThat(response.getStatus(), Matchers.equalTo(SC_OK));
 String output = response.getOutputAsString();
 
-assertThat(output, equalTo("{  \"rating\" : 0}\n"));
+assertThat(output, equalTo("{  \"rating\" : 0}"));
 
 }

svn commit: r1707734 - /sling/trunk/bundles/jcr/contentloader/pom.xml

2015-10-09 Thread sseifert 
Author: sseifert
Date: Fri Oct  9 14:21:51 2015
New Revision: 1707734

URL: http://svn.apache.org/viewvc?rev=1707734&view=rev
Log:
update to released versions of sling mocks

Modified:
sling/trunk/bundles/jcr/contentloader/pom.xml

Modified: sling/trunk/bundles/jcr/contentloader/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/pom.xml?rev=1707734&r1=1707733&r2=1707734&view=diff
==
--- sling/trunk/bundles/jcr/contentloader/pom.xml (original)
+++ sling/trunk/bundles/jcr/contentloader/pom.xml Fri Oct  9 14:21:51 2015
@@ -268,7 +268,7 @@
 
 org.apache.sling
 org.apache.sling.testing.osgi-mock
-1.5.1-SNAPSHOT
+1.6.0
 test
 
 
@@ -280,13 +280,13 @@
 
 org.apache.sling
 org.apache.sling.testing.sling-mock
-1.5.1-SNAPSHOT
+1.6.0
 test
 
 
 org.apache.sling
 org.apache.sling.testing.sling-mock-oak
-0.1.0-SNAPSHOT
+1.0.0
 test

svn commit: r1707732 - in /sling/trunk/testing/mocks: sling-mock-jackrabbit/pom.xml sling-mock-oak/pom.xml sling-mock/pom.xml

2015-10-09 Thread sseifert 
Author: sseifert
Date: Fri Oct  9 14:20:05 2015
New Revision: 1707732

URL: http://svn.apache.org/viewvc?rev=1707732&view=rev
Log:
switch back to released versions of dependency

Modified:
sling/trunk/testing/mocks/sling-mock-jackrabbit/pom.xml
sling/trunk/testing/mocks/sling-mock-oak/pom.xml
sling/trunk/testing/mocks/sling-mock/pom.xml

Modified: sling/trunk/testing/mocks/sling-mock-jackrabbit/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock-jackrabbit/pom.xml?rev=1707732&r1=1707731&r2=1707732&view=diff
==
--- sling/trunk/testing/mocks/sling-mock-jackrabbit/pom.xml (original)
+++ sling/trunk/testing/mocks/sling-mock-jackrabbit/pom.xml Fri Oct  9 14:20:05 
2015
@@ -45,14 +45,14 @@
 
 org.apache.sling
 org.apache.sling.testing.sling-mock
-1.6.1-SNAPSHOT
+1.6.0
 compile
 
 
 
 org.apache.sling
 org.apache.sling.testing.sling-mock
-1.6.1-SNAPSHOT
+1.6.0
 tests
 test
 

Modified: sling/trunk/testing/mocks/sling-mock-oak/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock-oak/pom.xml?rev=1707732&r1=1707731&r2=1707732&view=diff
==
--- sling/trunk/testing/mocks/sling-mock-oak/pom.xml (original)
+++ sling/trunk/testing/mocks/sling-mock-oak/pom.xml Fri Oct  9 14:20:05 2015
@@ -50,14 +50,14 @@
 
 org.apache.sling
 org.apache.sling.testing.sling-mock
-1.6.1-SNAPSHOT
+1.6.0
 compile
 
 
 
 org.apache.sling
 org.apache.sling.testing.sling-mock
-1.6.1-SNAPSHOT
+1.6.0
 tests
 test
 

Modified: sling/trunk/testing/mocks/sling-mock/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/pom.xml?rev=1707732&r1=1707731&r2=1707732&view=diff
==
--- sling/trunk/testing/mocks/sling-mock/pom.xml (original)
+++ sling/trunk/testing/mocks/sling-mock/pom.xml Fri Oct  9 14:20:05 2015
@@ -45,7 +45,7 @@
 
 org.apache.sling
 org.apache.sling.testing.osgi-mock
-1.6.1-SNAPSHOT
+1.6.0
 compile

svn commit: r968313 - in /websites/staging/sling/trunk/content: ./ downloads.html news.html

2015-10-09 Thread buildbot 
Author: buildbot
Date: Fri Oct  9 14:11:45 2015
New Revision: 968313

Log:
Staging update by buildbot for sling

Modified:
websites/staging/sling/trunk/content/   (props changed)
websites/staging/sling/trunk/content/downloads.html
websites/staging/sling/trunk/content/news.html

Propchange: websites/staging/sling/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Fri Oct  9 14:11:45 2015
@@ -1 +1 @@
-1707530
+1707731

Modified: websites/staging/sling/trunk/content/downloads.html
==
--- websites/staging/sling/trunk/content/downloads.html (original)
+++ websites/staging/sling/trunk/content/downloads.html Fri Oct  9 14:11:45 2015
@@ -1134,9 +1134,9 @@ h2:hover > .headerlink, h3:hover > .head
 
 
 Testing OSGi Mock
-1.5.0
-Bundle
 (http://www.apache.org/dist/sling/org.apache.sling.testing.osgi-mock-1.5.0.jar.asc";>asc,
 http://www.apache.org/dist/sling/org.apache.sling.testing.osgi-mock-1.5.0.jar.md5";>md5)
-Source
 ZIP (http://www.apache.org/dist/sling/org.apache.sling.testing.osgi-mock-1.5.0-source-release.zip.asc";>asc,
 http://www.apache.org/dist/sling/org.apache.sling.testing.osgi-mock-1.5.0-source-release.zip.md5";>md5)
+1.6.0
+Bundle
 (http://www.apache.org/dist/sling/org.apache.sling.testing.osgi-mock-1.6.0.jar.asc";>asc,
 http://www.apache.org/dist/sling/org.apache.sling.testing.osgi-mock-1.6.0.jar.md5";>md5)
+Source
 ZIP (http://www.apache.org/dist/sling/org.apache.sling.testing.osgi-mock-1.6.0-source-release.zip.asc";>asc,
 http://www.apache.org/dist/sling/org.apache.sling.testing.osgi-mock-1.6.0-source-release.zip.md5";>md5)
 
 
 Testing Resource Resolver Mock
@@ -1146,15 +1146,21 @@ h2:hover > .headerlink, h3:hover > .head
 
 
 Testing Sling Mock Jackrabbit
-0.1.2
-Bundle
 (http://www.apache.org/dist/sling/org.apache.sling.testing.sling-mock-jackrabbit-0.1.2.jar.asc";>asc,
 http://www.apache.org/dist/sling/org.apache.sling.testing.sling-mock-jackrabbit-0.1.2.jar.md5";>md5)
-Source
 ZIP (http://www.apache.org/dist/sling/org.apache.sling.testing.sling-mock-jackrabbit-0.1.2-source-release.zip.asc";>asc,
 http://www.apache.org/dist/sling/org.apache.sling.testing.sling-mock-jackrabbit-0.1.2-source-release.zip.md5";>md5)
+1.0.0
+Bundle
 (http://www.apache.org/dist/sling/org.apache.sling.testing.sling-mock-jackrabbit-1.0.0.jar.asc";>asc,
 http://www.apache.org/dist/sling/org.apache.sling.testing.sling-mock-jackrabbit-1.0.0.jar.md5";>md5)
+Source
 ZIP (http://www.apache.org/dist/sling/org.apache.sling.testing.sling-mock-jackrabbit-1.0.0-source-release.zip.asc";>asc,
 http://www.apache.org/dist/sling/org.apache.sling.testing.sling-mock-jackrabbit-1.0.0-source-release.zip.md5";>md5)
+
+
+Testing Sling Mock Oak
+1.0.0
+Bundle
 (http://www.apache.org/dist/sling/org.apache.sling.testing.sling-mock-oak-1.0.0.jar.asc";>asc,
 http://www.apache.org/dist/sling/org.apache.sling.testing.sling-mock-oak-1.0.0.jar.md5";>md5)
+Source
 ZIP (http://www.apache.org/dist/sling/org.apache.sling.testing.sling-mock-oak-1.0.0-source-release.zip.asc";>asc,
 http://www.apache.org/dist/sling/org.apache.sling.testing.sling-mock-oak-1.0.0-source-release.zip.md5";>md5)
 
 
 Testing Sling Mock
-1.5.0
-Bundle
 (http://www.apache.org/dist/sling/org.apache.sling.testing.sling-mock-1.5.0.jar.asc";>asc,
 http://www.apache.org/dist/sling/org.apache.sling.testing.sling-mock-1.5.0.jar.md5";>md5)
-Source
 ZIP (http://www.apache.org/dist/sling/org.apache.sling.testing.sling-mock-1.5.0-source-release.zip.asc";>asc,
 http://www.apache.org/dist/sling/org.apache.sling.testing.sling-mock-1.5.0-source-release.zip.md5";>md5)
+1.6.0
+Bundle
 (http://www.apache.org/dist/sling/org.apache.sling.testing.sling-mock-1.6.0.jar.asc";>asc,
 http://www.apache.org/dist/sling/org.apache.sling.testing.sling-mock-1.6.0.jar.md5";>md5)
+Source
 ZIP (http://www.apache.org/dist/sling/org.apache.sling.testing.sling-mock-1.6.0-source-release.zip.asc";>asc,
 http://www.apache.org/dist/sling/org.apache.sling.testing.sling-mock-1.6.0-source-release.zip.md5";>md5)
 
 
 Testing Tools
@@ -1252,7 +1258,7 @@ h2:hover > .headerlink, h3:hover > .head
 
 
   
-Rev. 1707530 by rombert on Thu, 8 Oct 2015 13:21:26 +
+Rev. 1707731 by sseifert on Fri, 9 Oct 2015 14:11:29 +
   

 Apache Sling, Sling, Apache, the Apache feather logo, and the Apache 
Sling project

Modified: websites/staging/sling/trunk/content/news.html
==
--- websites/staging/sling/trunk/content/news.html (original)
+++ websites/staging/sling/trunk/content/news.html Fri Oct  9 14:11:45 2015
@@ -114,6 +114,7 @@ h2:hover > .headerlink, h3:hover > .head
 }
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, 
h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, 
dt:hover > .element

svn commit: r1707731 - in /sling/site/trunk/content: downloads.list news.mdtext

2015-10-09 Thread sseifert 
Author: sseifert
Date: Fri Oct  9 14:11:29 2015
New Revision: 1707731

URL: http://svn.apache.org/viewvc?rev=1707731&view=rev
Log:
Release: Apache Sling Testing OSGi Mock 1.6.0, Sling Mock 1.6.0, Sling Mock 
Jackrabbit 1.0.0, Sling Mock Oak 1.0.0

Modified:
sling/site/trunk/content/downloads.list
sling/site/trunk/content/news.mdtext

Modified: sling/site/trunk/content/downloads.list
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1707731&r1=1707730&r2=1707731&view=diff
==
--- sling/site/trunk/content/downloads.list (original)
+++ sling/site/trunk/content/downloads.list Fri Oct  9 14:11:29 2015
@@ -164,10 +164,11 @@ System Bundle Extension: XML APIs|org.ap
 Tenant|org.apache.sling.tenant|1.0.2
 Testing JCR Mock|org.apache.sling.testing.jcr-mock|1.1.10
 Testing Logging Mock|org.apache.sling.testing.logging-mock|1.0.0
-Testing OSGi Mock|org.apache.sling.testing.osgi-mock|1.5.0
+Testing OSGi Mock|org.apache.sling.testing.osgi-mock|1.6.0
 Testing Resource Resolver 
Mock|org.apache.sling.testing.resourceresolver-mock|1.1.10
-Testing Sling Mock|org.apache.sling.testing.sling-mock|1.5.0
-Testing Sling Mock 
Jackrabbit|org.apache.sling.testing.sling-mock-jackrabbit|0.1.2
+Testing Sling Mock|org.apache.sling.testing.sling-mock|1.6.0
+Testing Sling Mock 
Jackrabbit|org.apache.sling.testing.sling-mock-jackrabbit|1.0.0
+Testing Sling Mock Oak|org.apache.sling.testing.sling-mock-oak|1.0.0
 Tooling Support Install|org.apache.sling.tooling.support.install|1.0.2
 Testing Tools|org.apache.sling.testing.tools|1.0.10
 URL Rewriter|org.apache.sling.urlrewriter|0.0.2

Modified: sling/site/trunk/content/news.mdtext
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1707731&r1=1707730&r2=1707731&view=diff
==
--- sling/site/trunk/content/news.mdtext (original)
+++ sling/site/trunk/content/news.mdtext Fri Oct  9 14:11:29 2015
@@ -1,5 +1,6 @@
 Title: News
 
+* New Releases: Apache Sling Testing OSGi Mock 1.6.0, Sling Mock 1.6.0, Sling 
Mock Jackrabbit 1.0.0, Sling Mock Oak 1.0.0 (October 9th, 2015)
 * New Release: Apache Sling Servlets Resolver 2.3.8, and Apache Sling Parent 
25 (October 5th, 2015)
 * New Release: Apache Sling Discovery Impl 1.1.8, and Apache Sling Distributed 
Event Admin 1.0.4 (September 30th, 2015)
 * New Releases: Apache Sling JUnit Core 1.0.12, Apache Sling JUnit Tests 
Teleporter 1.0.2 (September 28th, 2015)

Nexus: Promotion Completed

2015-10-09 Thread Nexus Repository Manager 
Message from: https://repository.apache.orgDeployer properties:"userAgent" = "Apache-Maven/3.3.3 (Java 1.8.0_25; Windows 7 6.1)""userId" = "sseifert""ip" = "80.150.190.130"Details:The following artifacts have been promoted to the "Releases" [id=releases] repository/org/apache/sling/org.apache.sling.testing.osgi-mock/1.6.0/org.apache.sling.testing.osgi-mock-1.6.0-sources.jar.asc(SHA1: 81e3d0c561b4e617e80dd16bd40edd8ecc8cf883)/org/apache/sling/org.apache.sling.testing.osgi-mock/1.6.0/org.apache.sling.testing.osgi-mock-1.6.0.pom(SHA1: 9f4c0ba52f9e01832d8062b459d7faf7bd82d165)/org/apache/sling/org.apache.sling.testing.osgi-mock/1.6.0/org.apache.sling.testing.osgi-mock-1.6.0-source-release.zip(SHA1: 81e4a2354f1554b372959ba1dca1339377135d94)/org/apache/sling/org.apache.sling.testing.osgi-mock/1.6.0/org.apache.sling.testing.osgi-mock-1.6.0.pom.asc(SHA1: 3ff3bbaf65ed98b1e5def0ffc5096ae20704497e)/org/apache/sling/org.apache.sling.testing.osgi-mock/1.6.0/org.apache.sling.testing.osgi-mock-1.6.0-source-release.zip.asc(SHA1: 38567d6ca3a86aa9c19fdca251bb0ff38e3793f2)/org/apache/sling/org.apache.sling.testing.osgi-mock/1.6.0/org.apache.sling.testing.osgi-mock-1.6.0-javadoc.jar(SHA1: 4ebee962b042c87835171348f97e9c0c92cd29a0)/org/apache/sling/org.apache.sling.testing.osgi-mock/1.6.0/org.apache.sling.testing.osgi-mock-1.6.0-sources.jar(SHA1: b626bfe5c8f67cbbed51f024a938e8f18511ed62)/org/apache/sling/org.apache.sling.testing.osgi-mock/1.6.0/org.apache.sling.testing.osgi-mock-1.6.0.jar(SHA1: 9ea47386b417f6af5272e84578e2c857c0ddf874)/org/apache/sling/org.apache.sling.testing.osgi-mock/1.6.0/org.apache.sling.testing.osgi-mock-1.6.0-javadoc.jar.asc(SHA1: c3845ef58aac6a8d77b43c9f7e95a6410c5524d9)/org/apache/sling/org.apache.sling.testing.osgi-mock/1.6.0/org.apache.sling.testing.osgi-mock-1.6.0.jar.asc(SHA1: 0fb770f87c4da9964cf346474664fffb07acf055)/org/apache/sling/org.apache.sling.testing.sling-mock-jackrabbit/1.0.0/org.apache.sling.testing.sling-mock-jackrabbit-1.0.0-sources.jar.asc(SHA1: 450bc116d795850ca3b723996eb0919a50952b88)/org/apache/sling/org.apache.sling.testing.sling-mock-jackrabbit/1.0.0/org.apache.sling.testing.sling-mock-jackrabbit-1.0.0.pom(SHA1: 1c4dfd0c0dea00090d9eac3bc874186b27ecb2a8)/org/apache/sling/org.apache.sling.testing.sling-mock-jackrabbit/1.0.0/org.apache.sling.testing.sling-mock-jackrabbit-1.0.0-javadoc.jar.asc(SHA1: 7b276b57964a7b7a7863f73b83d4dd2548cf519b)/org/apache/sling/org.apache.sling.testing.sling-mock-jackrabbit/1.0.0/org.apache.sling.testing.sling-mock-jackrabbit-1.0.0-tests.jar(SHA1: 0d2cf2c73f4c152e1807be76583a4d87f707df5f)/org/apache/sling/org.apache.sling.testing.sling-mock-jackrabbit/1.0.0/org.apache.sling.testing.sling-mock-jackrabbit-1.0.0.jar(SHA1: 7c7055055f51308cdad38df77706f67d4c0146b5)/org/apache/sling/org.apache.sling.testing.sling-mock-jackrabbit/1.0.0/org.apache.sling.testing.sling-mock-jackrabbit-1.0.0-javadoc.jar(SHA1: baf70d88594a52432e823bcef1cd34e9d4f208fd)/org/apache/sling/org.apache.sling.testing.sling-mock-jackrabbit/1.0.0/org.apache.sling.testing.sling-mock-jackrabbit-1.0.0-source-release.zip(SHA1: 0c52b767c7393dbfe6a35f83c507b3b8f4d1b995)/org/apache/sling/org.apache.sling.testing.sling-mock-jackrabbit/1.0.0/org.apache.sling.testing.sling-mock-jackrabbit-1.0.0-source-release.zip.asc(SHA1: c2f38aa9532d78f0d9af2889b6800c80e1fe689d)/org/apache/sling/org.apache.sling.testing.sling-mock-jackrabbit/1.0.0/org.apache.sling.testing.sling-mock-jackrabbit-1.0.0.jar.asc(SHA1: f917848a34b8512f91fea86ab96e9cc890b053be)/org/apache/sling/org.apache.sling.testing.sling-mock-jackrabbit/1.0.0/org.apache.sling.testing.sling-mock-jackrabbit-1.0.0.pom.asc(SHA1: 280e5c0d809461cf2191949b9dd62658852d3674)/org/apache/sling/org.apache.sling.testing.sling-mock-jackrabbit/1.0.0/org.apache.sling.testing.sling-mock-jackrabbit-1.0.0-sources.jar(SHA1: 5da52c2ac849f3aa3b19170b1f778c6856103eb9)/org/apache/sling/org.apache.sling.testing.sling-mock-jackrabbit/1.0.0/org.apache.sling.testing.sling-mock-jackrabbit-1.0.0-tests.jar.asc(SHA1: d8fe8ef8476caf5b21037fcf74cfa671ebb28cf1)/org/apache/sling/org.apache.sling.testing.sling-mock/1.6.0/org.apache.sling.testing.sling-mock-1.6.0-tests.jar.asc(SHA1: 243e902015ec1ae52a0e8ad0ff20b3ed27bae150)/org/apache/sling/org.apache.sling.testing.sling-mock/1.6.0/org.apache.sling.testing.sling-mock-1.6.0-source-release.zip(SHA1: aca6fdf3ced4a22f250c0f8e03a75875292aa440)/org/apache/sling/org.apache.sling.testing.sling-mock/1.6.0/org.apache.sling.testing.sling-mock-1.6.0-javadoc.jar.asc(SHA1: 0ba02fff6a6a890c06054617a522f593f29f2251)/org/apache/sling/org.apache.sling.testing.sling-mock/1.6.0/org.apache.sling.testing.sling-mock-1.6.0-source-release.zip.asc(SHA1: 211e088349ae751bf8a1d67491a50c2e2503edb5)/org/apache/sling/org.apache.sling.testing.sling-mock/1.6.0/org.apache.sling.testing.sling-mock-1.6.0-sources.jar(SHA1: f5dc8ac218b1e3d9d6879a825003663824019e0e)/org/apache/sling/org.apache.sling.testing.sling-mock/1.6.0/org.apache.sling.testing.sling-mock-1.6.0.pom(SHA1: 0bf

svn commit: r1707708 - /sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-jackrabbit-derby-integration-tests/

2015-10-09 Thread olli 
Author: olli
Date: Fri Oct  9 12:46:35 2015
New Revision: 1707708

URL: http://svn.apache.org/viewvc?rev=1707708&view=rev
Log:
SLING-5132 remove Jackrabbit Server and Launchpad features and tests

Removed:

sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-jackrabbit-derby-integration-tests/

svn commit: r1707702 - /sling/trunk/launchpad/builder/src/main/provisioning/sling.txt

2015-10-09 Thread olli 
Author: olli
Date: Fri Oct  9 12:24:54 2015
New Revision: 1707702

URL: http://svn.apache.org/viewvc?rev=1707702&view=rev
Log:
SLING-5133 Update Jackrabbit to 2.11.0 in Launchpad

Modified:
sling/trunk/launchpad/builder/src/main/provisioning/sling.txt

Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/sling.txt?rev=1707702&r1=1707701&r2=1707702&view=diff
==
--- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Fri Oct  9 
12:24:54 2015
@@ -109,12 +109,12 @@
 org.apache.sling/org.apache.sling.jcr.api/2.3.0
 org.apache.sling/org.apache.sling.jcr.base/2.3.0
 org.apache.sling/org.apache.sling.jcr.registration/1.0.2
-org.apache.jackrabbit/jackrabbit-api/2.10.1
-org.apache.jackrabbit/jackrabbit-jcr-commons/2.10.1
-org.apache.jackrabbit/jackrabbit-spi/2.10.1
-org.apache.jackrabbit/jackrabbit-spi-commons/2.10.1
+org.apache.jackrabbit/jackrabbit-api/2.11.0
+org.apache.jackrabbit/jackrabbit-jcr-commons/2.11.0
+org.apache.jackrabbit/jackrabbit-spi/2.11.0
+org.apache.jackrabbit/jackrabbit-spi-commons/2.11.0
 org.apache.jackrabbit/jackrabbit-webdav/2.11.0
-org.apache.jackrabbit/jackrabbit-jcr-rmi/2.10.1
+org.apache.jackrabbit/jackrabbit-jcr-rmi/2.11.0
 org.apache.sling/org.apache.sling.jcr.webdav/2.3.1-SNAPSHOT
 org.apache.sling/org.apache.sling.jcr.davex/1.2.2
 org.apache.sling/org.apache.sling.jcr.jackrabbit.usermanager/2.2.3-SNAPSHOT

svn commit: r1707677 - /sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/KarafTestSupport.java

2015-10-09 Thread olli 
Author: olli
Date: Fri Oct  9 09:06:55 2015
New Revision: 1707677

URL: http://svn.apache.org/viewvc?rev=1707677&view=rev
Log:
SLING-5132 remove Jackrabbit Server and Launchpad features and tests

* remove obsolete Derby option

Modified:

sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/KarafTestSupport.java

Modified: 
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/KarafTestSupport.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/KarafTestSupport.java?rev=1707677&r1=1707676&r2=1707677&view=diff
==
--- 
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/KarafTestSupport.java
 (original)
+++ 
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/KarafTestSupport.java
 Fri Oct  9 09:06:55 2015
@@ -148,8 +148,4 @@ public abstract class KarafTestSupport {
 );
 }
 
-protected Option withDerby() {
-return 
mavenBundle().groupId("org.apache.derby").artifactId("derby").versionAsInProject();
-}
-
 }