Author: cziegeler
Date: Mon Nov 23 14:01:33 2015
New Revision: 1715826
URL: http://svn.apache.org/viewvc?rev=1715826&view=rev
Log:
Correctly reference 3.1 as the base version
Modified:
sling/trunk/launchpad/base/src/main/webapp/WEB-INF/web.xml
sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt
Modified: sling/trunk/launchpad/base/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/base/src/main/webapp/WEB-INF/web.xml?rev=1715826&r1=1715825&r2=1715826&view=diff
==============================================================================
--- sling/trunk/launchpad/base/src/main/webapp/WEB-INF/web.xml (original)
+++ sling/trunk/launchpad/base/src/main/webapp/WEB-INF/web.xml Mon Nov 23
14:01:33 2015
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<web-app version="3.0"
- xmlns="http://java.sun.com/xml/ns/j2ee"
+<web-app version="3.1"
+ xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_3_0.xsd">
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd">
<display-name>Sling Launchpad Web Application</display-name>
<servlet>
Modified: sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt?rev=1715826&r1=1715825&r2=1715826&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt Mon Nov
23 14:01:33 2015
@@ -20,4 +20,4 @@
# Only a single artifact is allowed within this feature.
#
[feature name=:launchpad]
- org.apache.sling/org.apache.sling.launchpad.base/5.4.0-2.6.6
+ org.apache.sling/org.apache.sling.launchpad.base/5.4.0-2.6.7-SNAPSHOT