You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2015/02/12 11:42:35 UTC
svn commit: r1659214 -
/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
Author: olli
Date: Thu Feb 12 10:42:35 2015
New Revision: 1659214
URL: http://svn.apache.org/r1659214
Log:
reflect sling-auth-openid and sling-auth-selector moves to contrib
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml?rev=1659214&r1=1659213&r2=1659214&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml (original)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml Thu Feb 12 10:42:35 2015
@@ -72,15 +72,6 @@
<feature version="${project.version}">sling</feature>
<bundle>mvn:org.apache.sling/org.apache.sling.auth.form/1.0.6</bundle>
</feature>
- <feature name="sling-auth-openid" version="${project.version}">
- <feature version="${project.version}">sling</feature>
- <bundle>mvn:org.apache.sling/org.apache.sling.auth.openid/1.0.4</bundle>
- </feature>
- <feature name="sling-auth-selector" version="${project.version}">
- <feature version="${project.version}">sling-auth-form</feature>
- <feature version="${project.version}">sling-auth-openid</feature>
- <bundle>mvn:org.apache.sling/org.apache.sling.auth.selector/1.0.6</bundle>
- </feature>
<!-- Apache Sling Extensions -->
<feature name="sling-extension-adapter" version="${project.version}">
<feature version="${project.version}">sling</feature>
@@ -303,6 +294,15 @@
<bundle dependency="true">mvn:org.apache.tika/tika-core/1.7</bundle>
</feature>
<!-- Apache Sling Auth (contrib) -->
+ <feature name="sling-auth-openid" version="${project.version}">
+ <feature version="${project.version}">sling</feature>
+ <bundle>mvn:org.apache.sling/org.apache.sling.auth.openid/1.0.4</bundle>
+ </feature>
+ <feature name="sling-auth-selector" version="${project.version}">
+ <feature version="${project.version}">sling-auth-form</feature>
+ <feature version="${project.version}">sling-auth-openid</feature>
+ <bundle>mvn:org.apache.sling/org.apache.sling.auth.selector/1.0.6</bundle>
+ </feature>
<feature name="sling-auth-xing-login" version="0.0.2">
<feature version="${project.version}">sling</feature>
<feature version="${project.version}">sling-jcr</feature>