sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From romb...@apache.org
Subject [sling-org-apache-sling-servlet-helpers] 04/06: SLING-5971 switch to osgi annotations
Date Tue, 07 Nov 2017 10:14:11 GMT
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.servlet-helpers-1.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlet-helpers.git

commit b961db555b52b4c43df96ea4b0cf6044f054ccb8
Author: Stefan Seifert <sseifert@apache.org>
AuthorDate: Tue Aug 16 15:26:09 2016 +0000

    SLING-5971 switch to osgi annotations
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/servlet-helpers@1756526
13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/java/org/apache/sling/servlethelpers/MockHttpSession.java     | 3 +--
 .../org/apache/sling/servlethelpers/MockRequestDispatcherFactory.java  | 3 +--
 src/main/java/org/apache/sling/servlethelpers/MockRequestPathInfo.java | 3 +--
 src/main/java/org/apache/sling/servlethelpers/MockServletContext.java  | 2 +-
 .../org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java   | 3 +--
 .../org/apache/sling/servlethelpers/MockSlingHttpServletResponse.java  | 3 +--
 src/test/java/org/apache/sling/servlethelpers/MockHttpSessionTest.java | 1 -
 .../java/org/apache/sling/servlethelpers/MockRequestPathInfoTest.java  | 1 -
 .../java/org/apache/sling/servlethelpers/MockServletContextTest.java   | 1 -
 .../apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java  | 1 -
 10 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/apache/sling/servlethelpers/MockHttpSession.java b/src/main/java/org/apache/sling/servlethelpers/MockHttpSession.java
index 31d672b..bcaae1e 100644
--- a/src/main/java/org/apache/sling/servlethelpers/MockHttpSession.java
+++ b/src/main/java/org/apache/sling/servlethelpers/MockHttpSession.java
@@ -27,8 +27,7 @@ import javax.servlet.ServletContext;
 import javax.servlet.http.HttpSession;
 
 import org.apache.commons.collections.IteratorUtils;
-
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 /**
  * Mock {@link HttpSession} implementation.
diff --git a/src/main/java/org/apache/sling/servlethelpers/MockRequestDispatcherFactory.java
b/src/main/java/org/apache/sling/servlethelpers/MockRequestDispatcherFactory.java
index 5664035..d3dbe38 100644
--- a/src/main/java/org/apache/sling/servlethelpers/MockRequestDispatcherFactory.java
+++ b/src/main/java/org/apache/sling/servlethelpers/MockRequestDispatcherFactory.java
@@ -22,8 +22,7 @@ import javax.servlet.RequestDispatcher;
 
 import org.apache.sling.api.request.RequestDispatcherOptions;
 import org.apache.sling.api.resource.Resource;
-
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 /**
  * Interface to create a mock {@link RequestDispatcher} when calling the getRequestDispatcher
methods
diff --git a/src/main/java/org/apache/sling/servlethelpers/MockRequestPathInfo.java b/src/main/java/org/apache/sling/servlethelpers/MockRequestPathInfo.java
index 4c6439d..d14034c 100644
--- a/src/main/java/org/apache/sling/servlethelpers/MockRequestPathInfo.java
+++ b/src/main/java/org/apache/sling/servlethelpers/MockRequestPathInfo.java
@@ -21,8 +21,7 @@ package org.apache.sling.servlethelpers;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.sling.api.request.RequestPathInfo;
 import org.apache.sling.api.resource.Resource;
-
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 /**
  * Mock {@link RequestPathInfo} implementation.
diff --git a/src/main/java/org/apache/sling/servlethelpers/MockServletContext.java b/src/main/java/org/apache/sling/servlethelpers/MockServletContext.java
index 783585d..108facb 100644
--- a/src/main/java/org/apache/sling/servlethelpers/MockServletContext.java
+++ b/src/main/java/org/apache/sling/servlethelpers/MockServletContext.java
@@ -37,7 +37,7 @@ import javax.servlet.SessionCookieConfig;
 import javax.servlet.SessionTrackingMode;
 import javax.servlet.descriptor.JspConfigDescriptor;
 
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 /**
  * Mock {@link ServletContext} implementation.
diff --git a/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java
b/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java
index 30362fc..66c9f69 100644
--- a/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java
+++ b/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java
@@ -68,8 +68,7 @@ import org.apache.sling.api.request.RequestProgressTracker;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.api.servlets.HttpConstants;
-
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 /**
  * Mock {@link SlingHttpServletRequest} implementation.
diff --git a/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponse.java
b/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponse.java
index a1d6609..4ee8f48 100644
--- a/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponse.java
+++ b/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponse.java
@@ -29,8 +29,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.sling.api.SlingHttpServletResponse;
 import org.apache.sling.api.adapter.SlingAdaptable;
-
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 /**
  * Mock {@link SlingHttpServletResponse} implementation.
diff --git a/src/test/java/org/apache/sling/servlethelpers/MockHttpSessionTest.java b/src/test/java/org/apache/sling/servlethelpers/MockHttpSessionTest.java
index 980253c..1b0bd1e 100644
--- a/src/test/java/org/apache/sling/servlethelpers/MockHttpSessionTest.java
+++ b/src/test/java/org/apache/sling/servlethelpers/MockHttpSessionTest.java
@@ -23,7 +23,6 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-import org.apache.sling.servlethelpers.MockHttpSession;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/sling/servlethelpers/MockRequestPathInfoTest.java b/src/test/java/org/apache/sling/servlethelpers/MockRequestPathInfoTest.java
index f94c380..4a6b15b 100644
--- a/src/test/java/org/apache/sling/servlethelpers/MockRequestPathInfoTest.java
+++ b/src/test/java/org/apache/sling/servlethelpers/MockRequestPathInfoTest.java
@@ -22,7 +22,6 @@ import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
-import org.apache.sling.servlethelpers.MockRequestPathInfo;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/sling/servlethelpers/MockServletContextTest.java b/src/test/java/org/apache/sling/servlethelpers/MockServletContextTest.java
index 131b531..03f1b1b 100644
--- a/src/test/java/org/apache/sling/servlethelpers/MockServletContextTest.java
+++ b/src/test/java/org/apache/sling/servlethelpers/MockServletContextTest.java
@@ -22,7 +22,6 @@ import static org.junit.Assert.assertEquals;
 
 import javax.servlet.ServletContext;
 
-import org.apache.sling.servlethelpers.MockServletContext;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java
b/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java
index 2a2296a..3f72e15 100644
--- a/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java
+++ b/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java
@@ -33,7 +33,6 @@ import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.CharEncoding;
-import org.apache.sling.servlethelpers.MockSlingHttpServletResponse;
 import org.junit.Before;
 import org.junit.Test;
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <commits@sling.apache.org>.

Mime
View raw message