Author: olli
Date: Thu Oct 8 11:26:22 2015
New Revision: 1707499
URL: http://svn.apache.org/viewvc?rev=1707499&view=rev
Log:
remove/exclude Auth XING Login and Auth XING OAuth features/tests (not
compatible with Oak)
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.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=1707499&r1=1707498&r2=1707499&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 Oct 8 11:26:22 2015
@@ -413,20 +413,24 @@
<feature version="${project.version}">sling-auth-form</feature>
<feature version="${project.version}">sling-auth-openid</feature>
</feature>
+ <!-- SLING-5122
<feature name="sling-auth-xing-login" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.auth.xing.login/0.0.2</bundle>
- <!-- dependencies -->
+ <!- dependencies ->
<feature version="${project.version}">sling</feature>
<feature version="${project.version}">sling-jcr</feature>
<bundle>mvn:org.apache.sling/org.apache.sling.auth.xing.api/0.0.2</bundle>
</feature>
+ -->
+ <!-- SLING-5123
<feature name="sling-auth-xing-oauth" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.auth.xing.oauth/0.0.2</bundle>
- <!-- dependencies -->
+ <!- dependencies ->
<feature version="${project.version}">sling</feature>
<feature version="${project.version}">sling-jcr</feature>
<bundle>mvn:org.apache.sling/org.apache.sling.auth.xing.api/0.0.2</bundle>
</feature>
+ -->
<!-- Apache Sling Extensions (contrib) -->
<feature name="sling-extension-distribution" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.distribution.api/0.1.0</bundle>
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml?rev=1707499&r1=1707498&r2=1707499&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml
Thu Oct 8 11:26:22 2015
@@ -211,6 +211,12 @@
</goals>
</execution>
</executions>
+ <configuration>
+ <excludes>
+ <!-- SLING-5122, SLING-5123 -->
+ <exclude>**/SlingAuthXing*.*</exclude>
+ </excludes>
+ </configuration>
</plugin>
</plugins>
</build>
