hsaginor
diff --git a/‎.gitignore
+1 b/‎.gitignore
+1
diff --git a/‎.travis.yml
+8-2 b/‎.travis.yml
+8-2
diff --git a/‎README.txt
+4-6 b/‎README.txt
+4-6
diff --git a/‎attic/README.md
+13 b/‎attic/README.md
+13
diff --git a/‎bundles/api/README.txt
+3-3 b/‎bundles/api/README.txt
+3-3
diff --git a/‎bundles/api/pom.xml
+30-24 b/‎bundles/api/pom.xml
+30-24
diff --git a/‎bundles/api/src/main/java/org/apache/sling/api/SlingConstants.java
+6-8 b/‎bundles/api/src/main/java/org/apache/sling/api/SlingConstants.java
+6-8
diff --git a/‎bundles/api/src/main/java/org/apache/sling/api/SlingHttpServletRequest.java
+8-1 b/‎bundles/api/src/main/java/org/apache/sling/api/SlingHttpServletRequest.java
+8-1
diff --git a/‎bundles/api/src/main/java/org/apache/sling/api/SlingHttpServletResponse.java
+3-4 b/‎bundles/api/src/main/java/org/apache/sling/api/SlingHttpServletResponse.java
+3-4
diff --git a/‎bundles/api/src/main/java/org/apache/sling/api/adapter/Adaptable.java
+1-1 b/‎bundles/api/src/main/java/org/apache/sling/api/adapter/Adaptable.java
+1-1
diff --git a/‎bundles/api/src/main/java/org/apache/sling/api/adapter/AdapterFactory.java
+1-1 b/‎bundles/api/src/main/java/org/apache/sling/api/adapter/AdapterFactory.java
+1-1
diff --git a/‎bundles/api/src/main/java/org/apache/sling/api/adapter/AdapterManager.java
+1-1 b/‎bundles/api/src/main/java/org/apache/sling/api/adapter/AdapterManager.java
+1-1
diff --git a/‎bundles/api/src/main/java/org/apache/sling/api/adapter/package-info.java
+2-2 b/‎bundles/api/src/main/java/org/apache/sling/api/adapter/package-info.java
+2-2
diff --git a/‎bundles/api/src/main/java/org/apache/sling/api/auth/Authenticator.java
+1-1 b/‎bundles/api/src/main/java/org/apache/sling/api/auth/Authenticator.java
+1-1
diff --git a/‎bundles/api/src/main/java/org/apache/sling/api/auth/package-info.java
+2-2 b/‎bundles/api/src/main/java/org/apache/sling/api/auth/package-info.java
+2-2
diff --git a/‎bundles/api/src/main/java/org/apache/sling/api/package-info.java
+2-2 b/‎bundles/api/src/main/java/org/apache/sling/api/package-info.java
+2-2
@@ -22,3 +22,4 @@ contrib/explorers/resourceeditor/node
 contrib/nosql/launchpad/sling
 launchpad/docker/*.jar
 .jira-url
+bin/
@@ -1,14 +1,20 @@
 language: java
 
 jdk:
+  - oraclejdk8
+  - oraclejdk7
   - openjdk7
-  - openjdk6
 
 sudo: false
 
 install: true
 
-script: mvn -q clean install -DHttpTestBase.readyTimeoutSeconds=300 -PintegrationTests
+script:
+  - mvn -q -N io.takari:maven:wrapper -Dmaven=3.3.9
+  - echo 'MAVEN_OPTS="-Xmx800M -XX:MaxPermSize=256M -enableassertions"' > $HOME/.mavenrc
+  - set -o pipefail
+  - ./mvnw -Dmaven.test.skip=true clean install | tee >(tail -500 1>&2) | grep "Building Apache"
+
 
 notifications:
   email: false
@@ -22,17 +22,15 @@ See http://sling.apache.org for more information.
 Getting started
 ---------------
 
-You need a Java 6 (or higher) JDK and Maven 3 (http://maven.apache.org/,
-version 3.0.4 or higher) to build Sling.
+You need a Java 8 (or higher) JDK and Maven 3 (http://maven.apache.org/,
+version 3.3.9 or higher) to build Sling.
 
 Once you have everything in place, run
 
-    export MAVEN_OPTS="-Xmx256M -XX:MaxPermSize=256M" 
     mvn clean install
 
-in this directory (on 64bit platforms you might want to use 512M instead
-of 256M). This will build, test and install the Sling modules in your local
-Maven repository.
+in this directory. This will build, test and install the Sling modules in 
+your local Maven repository.
 
 Some modules might not be listed in the pom.xml found in this directory,
 those won't be built by the above command. If you need one of these 
 
@@ -0,0 +1,13 @@
+Apache Sling Attic
+==================
+
+The Sling Attic is a place for retired modules, that we do not expect to develope further.
+
+The Attic is *not here* - this folder is just meant to make it more visible in our main
+code repository but the attic is at https://svn.apache.org/repos/asf/sling/attic/
+
+Modules which are found there _might_ be moved back to our main codebase if someone needs
+them and is willing to do the work. Please discuss any such cases on the [email protected] list.
+
+https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=65873121 has more information
+about a first batch of module retirements that happened in 2016.
@@ -1,6 +1,6 @@
 Apache Sling API
 
-The Sling API defines an extension to the Servlet API 2.4 to
+The Sling API defines an extension to the Servlet API 3.0 to
 provide access to content and unified access to request
 parameters hiding the differences between the different methods
 of transferring parameters from client to server. Note that the
@@ -12,8 +12,8 @@ Getting Started
 ===============
 
 This component uses an Apache Maven (http://maven.apache.org/) build
-environment. It requires a Java 6 JDK (or higher) and Maven (http://maven.apache.org/)
-3.0.5 or later. We recommend to use the latest Maven version.
+environment. It requires a Java 7 JDK (or higher) and Maven (http://maven.apache.org/)
+3.3.9 or later. We recommend to use the latest Maven version.
 
 If you have Maven installed, you can compile and
 package the jar using the following command:
 
@@ -7,9 +7,9 @@
     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
@@ -23,12 +23,12 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>26</version>
+        <version>30</version>
         <relativePath />
     </parent>
 
     <artifactId>org.apache.sling.api</artifactId>
-    <version>2.11.1-SNAPSHOT</version>
+    <version>2.16.3-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>Apache Sling API</name>
@@ -51,45 +51,52 @@
 
     <properties>
         <site.jira.version.id>12314252</site.jira.version.id>
+        <sling.java.version>7</sling.java.version>
+        <jackrabbit.version>2.13.4</jackrabbit.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
-        
-        <dependency>
-            <groupId>biz.aQute.bnd</groupId>
-            <artifactId>bndlib</artifactId>
-            <version>2.1.0</version>
-            <scope>provided</scope>
-        </dependency>
-        
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>
-            <version>3.0.0</version>
+        </dependency>
+        <!-- No external dependency, we embed some util classes -->
+        <dependency>
+            <groupId>org.apache.jackrabbit</groupId>
+            <artifactId>jackrabbit-jcr-commons</artifactId>
+            <version>${jackrabbit.version}</version>
             <scope>provided</scope>
         </dependency>
         <!-- Testing -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.jmock</groupId>
-            <artifactId>jmock-junit4</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.commons.testing</artifactId>
-            <version>2.0.6</version>
+            <version>2.1.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>2.3.7</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -100,17 +107,16 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>3.0.1</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
                         <Bundle-DocURL>
                             http://sling.apache.org/site/sling-api.html
                         </Bundle-DocURL>
-                        <!-- Require explicit version of the servlet API -->
-                        <Import-Package>
-                            javax.servlet.*;version=2.4,*
-                        </Import-Package>
+                        <!-- Include utility classes from Jackrabbit JCR Commons -->
+                        <Embed-Dependency>
+                           jackrabbit-jcr-commons;inline="org/apache/jackrabbit/util/ISO8601.*"
+                        </Embed-Dependency>
                     </instructions>
                 </configuration>
             </plugin>
 
@@ -18,8 +18,6 @@
  */
 package org.apache.sling.api;
 
-import org.apache.sling.api.resource.observation.ResourceChangeListener;
-
 /**
  * The <code>SlingConstants</code> interface provides some symbolic constants
  * for well known constant strings in Sling. Even though these constants will
@@ -268,8 +266,8 @@ public class SlingConstants {
      * The event contains at least the {@link #PROPERTY_PATH}, {@link #PROPERTY_RESOURCE_SUPER_TYPE}
      * and {@link #PROPERTY_RESOURCE_TYPE} properties.
      * @since 2.0.6 (Sling API Bundle 2.0.6)
-     * 
-     * @deprecated Register a {@link ResourceChangeListener} instead
+     *
+     * @deprecated Register a {@link org.apache.sling.api.resource.observation.ResourceChangeListener} instead
      */
     @Deprecated
     public static final String TOPIC_RESOURCE_ADDED = "org/apache/sling/api/resource/Resource/ADDED";
@@ -280,8 +278,8 @@ public class SlingConstants {
      * The event contains at least the {@link #PROPERTY_PATH}. As the resource has already been removed
      * no further information like resource type etc. might be available.
      * @since 2.0.6 (Sling API Bundle 2.0.6)
-     * 
-     * @deprecated Register a {@link ResourceChangeListener} instead
+     *
+     * @deprecated Register a {@link org.apache.sling.api.resource.observation.ResourceChangeListener} instead
      */
     @Deprecated
     public static final String TOPIC_RESOURCE_REMOVED = "org/apache/sling/api/resource/Resource/REMOVED";
@@ -295,8 +293,8 @@ public class SlingConstants {
      * {@link #PROPERTY_REMOVED_ATTRIBUTES}, {@link #PROPERTY_CHANGED_ATTRIBUTES}. All of them are
      * optional.
      * @since 2.0.6 (Sling API Bundle 2.0.6)
-     * 
-     * @deprecated Register a {@link ResourceChangeListener} instead
+     *
+     * @deprecated Register a {@link org.apache.sling.api.resource.observation.ResourceChangeListener} instead
      */
     @Deprecated
     public static final String TOPIC_RESOURCE_CHANGED = "org/apache/sling/api/resource/Resource/CHANGED";
 
@@ -37,7 +37,8 @@
 import org.apache.sling.api.request.RequestProgressTracker;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceResolver;
-import aQute.bnd.annotation.ProviderType;
+
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * The <code>SlingHttpServletRequest</code> defines the interface to provide
@@ -200,6 +201,11 @@ public interface SlingHttpServletRequest extends HttpServletRequest, Adaptable {
     /**
      * Same as {@link #getRequestDispatcher(Resource,RequestDispatcherOptions)}
      * but using empty options.
+     * @param resource The {@link Resource} instance whose response content may
+     *            be included by the returned dispatcher.
+     * @return a <code>RequestDispatcher</code> object that acts as a wrapper
+     *         for the <code>resource</code> or <code>null</code> if an
+     *         error occurs preparing the dispatcher.
      */
     @CheckForNull RequestDispatcher getRequestDispatcher(@Nonnull Resource resource);
 
@@ -265,6 +271,7 @@ public interface SlingHttpServletRequest extends HttpServletRequest, Adaptable {
 
     /**
      * Returns the {@link RequestProgressTracker} of this request.
+     * @return The request progress tracker.
      */
     @Nonnull RequestProgressTracker getRequestProgressTracker();
 }
@@ -21,17 +21,16 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.sling.api.adapter.Adaptable;
-
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * The <code>SlingHttpServletResponse</code> defines the interface to assist a
  * servlet in creating and sending a response to the client.
  * <p>
- * This interface is currently empty and merely exists to paralell the
+ * This interface is currently empty and merely exists to parallel the
  * {@link SlingHttpServletRequest} interface.
  * <p>
- * Starting with Sling API 2.0.6, this interface als extends the
+ * Starting with Sling API 2.0.6, this interface also extends the
  * {@link Adaptable} interface.
  */
 @ProviderType
 
@@ -21,7 +21,7 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 /**
  * The <code>Adaptable</code> interface identifies objects which can be adapted
 
@@ -21,7 +21,7 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 /**
  * The <code>AdapterFactory</code> interface defines the API for helpers which
 
@@ -21,7 +21,7 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * The <code>AdapterManager</code> defines the service interface for a manager
 
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-@Version("2.2.1")
+@Version("2.2.2")
 package org.apache.sling.api.adapter;
 
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;
 
@@ -22,7 +22,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * The <code>Authenticator</code> interface defines the service interface which
 
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-@Version("1.0.1")
+@Version("1.0.2")
 package org.apache.sling.api.auth;
 
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;
 
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-@Version("2.3.1")
+@Version("2.3.2")
 package org.apache.sling.api;
 
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;