This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-test-services.git
commit 47c4519ebf79b8af69a5de580ec00e9ec86e895a
Author: Konrad Windszus <k...@apache.org>
AuthorDate: Sat Apr 11 17:54:36 2015 +0000
use newest parent, get rid of JCR dependency, clean up POMs
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1672911
13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 29 +++++++++++-----------
.../testservices/ValidationPostOperation.java | 11 +++-----
2 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/pom.xml b/pom.xml
index f484157..005de3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,13 +20,12 @@
<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/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>15</version>
- <relativePath />
+ <version>22</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.sling.validation.test-services</artifactId>
<version>1.0.0-SNAPSHOT</version>
@@ -37,21 +36,18 @@
<properties>
<sling.java.version>6</sling.java.version>
</properties>
+
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/validation/test-services</connection>
+ <developerConnection>
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/validation/test-services</developerConnection>
+
<url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core</url>
+ </scm>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <version>1.11.0</version>
- <executions>
- <execution>
- <id>generate-scr-descriptor</id>
- <goals>
- <goal>scr</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -91,7 +87,6 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.9.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -106,6 +101,12 @@
<version>2.2.0</version>
<scope>provided</scope>
</dependency>
+ <!-- transitive dependency of org.apache.sling.servlets.post, used in
AbstractPostOperation -->
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <version>2.0</version>
+ </dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.validation.api</artifactId>
@@ -127,7 +128,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.testing</artifactId>
- <version>2.0.14</version>
+ <version>2.0.16</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git
a/src/main/java/org/apache/sling/validation/testservices/ValidationPostOperation.java
b/src/main/java/org/apache/sling/validation/testservices/ValidationPostOperation.java
index 408c058..c350cea 100644
---
a/src/main/java/org/apache/sling/validation/testservices/ValidationPostOperation.java
+++
b/src/main/java/org/apache/sling/validation/testservices/ValidationPostOperation.java
@@ -18,6 +18,8 @@
*/
package org.apache.sling.validation.testservices;
+import java.util.List;
+
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Properties;
import org.apache.felix.scr.annotations.Property;
@@ -25,7 +27,6 @@ import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.resource.ValueMap;
-import org.apache.sling.commons.json.JSONObject;
import org.apache.sling.servlets.post.AbstractPostOperation;
import org.apache.sling.servlets.post.Modification;
import org.apache.sling.servlets.post.PostOperation;
@@ -36,16 +37,12 @@ import org.apache.sling.validation.api.ValidationService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.jcr.RepositoryException;
-import java.util.List;
-
@Component()
@Service(PostOperation.class)
@Properties({
@Property(
name = PostOperation.PROP_OPERATION_NAME,
- value = "validation",
- propertyPrivate = true
+ value = "validation"
)
})
public class ValidationPostOperation extends AbstractPostOperation {
@@ -56,7 +53,7 @@ public class ValidationPostOperation extends
AbstractPostOperation {
private ValidationService validationService;
@Override
- protected void doRun(SlingHttpServletRequest request, PostResponse
response, List<Modification> changes) throws RepositoryException {
+ protected void doRun(SlingHttpServletRequest request, PostResponse
response, List<Modification> changes) {
if (response instanceof ValidationPostResponse) {
ValidationPostResponse vpr = (ValidationPostResponse) response;
ValueMap requestParameters = request.adaptTo(ValueMap.class);
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <commits@sling.apache.org>.
