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 2021/12/16 21:45:37 UTC
[sling-org-apache-sling-karaf-integration-tests] branch master updated (dd633d5 -> bc57967)
This is an automated email from the ASF dual-hosted git repository.
olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-integration-tests.git.
from dd633d5 SLING-10367 Update Karaf to 4.3.3
new bb483a5 SLING-11011 Update to Sling (Bundle) Parent 46
new bc57967 SLING-8473 Provide Sling CMS features
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 2 +-
.../sling/karaf/tests/bootstrap/SlingCmsIT.java | 75 ----------------------
.../karaf/tests/bootstrap/SlingCmsLoginIT.java | 54 ----------------
.../karaf/tests/bootstrap/SlingCmsReferenceIT.java | 54 ----------------
4 files changed, 1 insertion(+), 184 deletions(-)
delete mode 100644 src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCmsIT.java
delete mode 100644 src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCmsLoginIT.java
delete mode 100644 src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCmsReferenceIT.java
[sling-org-apache-sling-karaf-integration-tests] 01/02: SLING-11011 Update to Sling (Bundle) Parent 46
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-integration-tests.git
commit bb483a5c3011c9a5b0bdc03c209c0f13ae99b570
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Dec 15 20:01:53 2021 +0100
SLING-11011 Update to Sling (Bundle) Parent 46
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index efbfef3..6d41b3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-bundle-parent</artifactId>
- <version>45</version>
+ <version>46</version>
<relativePath/>
</parent>
[sling-org-apache-sling-karaf-integration-tests] 02/02: SLING-8473 Provide Sling CMS features
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-integration-tests.git
commit bc57967e56bbea9f5a601721eed8a4ad74633db3
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Dec 16 22:43:48 2021 +0100
SLING-8473 Provide Sling CMS features
drop Sling CMS until compatible with latest Sling releases
---
.../sling/karaf/tests/bootstrap/SlingCmsIT.java | 75 ----------------------
.../karaf/tests/bootstrap/SlingCmsLoginIT.java | 54 ----------------
.../karaf/tests/bootstrap/SlingCmsReferenceIT.java | 54 ----------------
3 files changed, 183 deletions(-)
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCmsIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCmsIT.java
deleted file mode 100644
index 5ca5943..0000000
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCmsIT.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * 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
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.sling.karaf.tests.bootstrap;
-
-import org.apache.sling.karaf.testing.KarafTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.OptionUtils;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-import org.osgi.framework.Bundle;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class SlingCmsIT extends KarafTestSupport {
-
- @Configuration
- public Option[] configuration() {
- return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-cms"),
- addFelixHttpFeature()
- );
- }
-
- @Test
- public void testOrgApacheSlingCmsApi() {
- final Bundle bundle = findBundle("org.apache.sling.cms.api");
- assertNotNull(bundle);
- assertEquals(Bundle.ACTIVE, bundle.getState());
- }
-
- @Test
- public void testOrgApacheSlingCmsCore() {
- final Bundle bundle = findBundle("org.apache.sling.cms.core");
- assertNotNull(bundle);
- assertEquals(Bundle.ACTIVE, bundle.getState());
- }
-
- @Test
- public void testOrgApacheSlingCmsTransformer() {
- final Bundle bundle = findBundle("org.apache.sling.cms.transformer");
- assertNotNull(bundle);
- assertEquals(Bundle.ACTIVE, bundle.getState());
- }
-
- @Test
- public void testOrgApacheSlingCmsUi() {
- final Bundle bundle = findBundle("org.apache.sling.cms.ui");
- assertNotNull(bundle);
- assertEquals(Bundle.ACTIVE, bundle.getState());
- }
-
-}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCmsLoginIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCmsLoginIT.java
deleted file mode 100644
index cb01ca5..0000000
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCmsLoginIT.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * 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
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.sling.karaf.tests.bootstrap;
-
-import org.apache.sling.karaf.testing.KarafTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.OptionUtils;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-import org.osgi.framework.Bundle;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class SlingCmsLoginIT extends KarafTestSupport {
-
- @Configuration
- public Option[] configuration() {
- return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-cms-login"),
- addFelixHttpFeature()
- );
- }
-
- @Test
- public void testOrgApacheSlingCmsLogin() {
- final Bundle bundle = findBundle("org.apache.sling.cms.login");
- assertNotNull(bundle);
- assertEquals(Bundle.RESOLVED, bundle.getState());
- }
-
-}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCmsReferenceIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCmsReferenceIT.java
deleted file mode 100644
index 9a35428..0000000
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCmsReferenceIT.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * 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
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.sling.karaf.tests.bootstrap;
-
-import org.apache.sling.karaf.testing.KarafTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.OptionUtils;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-import org.osgi.framework.Bundle;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class SlingCmsReferenceIT extends KarafTestSupport {
-
- @Configuration
- public Option[] configuration() {
- return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-cms-reference"),
- addFelixHttpFeature()
- );
- }
-
- @Test
- public void testOrgApacheSlingCmsReference() {
- final Bundle bundle = findBundle("org.apache.sling.cms.reference");
- assertNotNull(bundle);
- assertEquals(Bundle.ACTIVE, bundle.getState());
- }
-
-}