You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2024/12/13 12:12:09 UTC

(sling-org-apache-sling-hc-it) branch master updated: SLING-7980 module is deprecated - see vote: https://lists.apache.org/thread/m57bwwdnfjdt3v7yf9lgg6m3hddv0b4o

This is an automated email from the ASF dual-hosted git repository.

sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git


The following commit(s) were added to refs/heads/master by this push:
     new 60113f4  SLING-7980 module is deprecated - see vote: https://lists.apache.org/thread/m57bwwdnfjdt3v7yf9lgg6m3hddv0b4o
60113f4 is described below

commit 60113f4464ca8ddd3bee2895ef3d7c53255ace47
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Fri Dec 13 13:12:00 2024 +0100

    SLING-7980 module is deprecated - see vote: https://lists.apache.org/thread/m57bwwdnfjdt3v7yf9lgg6m3hddv0b4o
---
 .asf.yaml                                          |   6 +
 CODE_OF_CONDUCT.md                                 |  22 ----
 CONTRIBUTING.md                                    |  24 ----
 Jenkinsfile                                        |  20 ---
 README.md                                          |   6 +-
 pom.xml                                            | 140 ---------------------
 .../sling/hc/it/core/SampleHealthChecksTest.java   |  76 -----------
 src/test/java/org/apache/sling/hc/it/core/U.java   | 120 ------------------
 8 files changed, 10 insertions(+), 404 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index b8d35f3..cfdd1a7 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -1,4 +1,10 @@
 github:
+  description: "Apache Sling Health Check Integration Tests (deprecated)"
+  homepage: "https://sling.apache.org/"
+  labels:
+  - "java"
+  - "sling"
+  - "deprecated"
   autolink_jira:
   - "SLING"
   - "OAK"
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
deleted file mode 100644
index 0fa18e5..0000000
--- a/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,22 +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.
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
-Apache Software Foundation Code of Conduct
-====
-
-Being an Apache project, Apache Sling adheres to the Apache Software Foundation's [Code of Conduct](https://www.apache.org/foundation/policies/conduct.html).
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index ac82a1a..0000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,24 +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.
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
-Contributing
-====
-
-Thanks for choosing to contribute!
-
-You will find all the necessary details about how you can do this at https://sling.apache.org/contributing.html.
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index f582519..0000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,20 +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.
- */
-
-slingOsgiBundleBuild()
diff --git a/README.md b/README.md
index 1df7179..7ccc9e8 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,8 @@
 
 &#32;[![Build Status](https://ci-builds.apache.org/job/Sling/job/modules/job/sling-org-apache-sling-hc-it/job/master/badge/icon)](https://ci-builds.apache.org/job/Sling/job/modules/job/sling-org-apache-sling-hc-it/job/master/)&#32;[![Test Status](https://img.shields.io/jenkins/tests.svg?jobUrl=https://ci-builds.apache.org/job/Sling/job/modules/job/sling-org-apache-sling-hc-it/job/master/)](https://ci-builds.apache.org/job/Sling/job/modules/job/sling-org-apache-sling-hc-it/job/master/test [...]
 
-# Apache Sling Health Check Integration Tests
+# Apache Sling Health Check Integration Tests (deprecated)
 
-This module is part of the [Apache Sling](https://sling.apache.org) project.
+This module is **obsolete**.
+
+For reference or potential bugfix releases use branch [maintenance](https://github.com/apache/sling-org-apache-sling-hc-it/tree/maintenance).
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index 8a50baf..0000000
--- a/pom.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.sling</groupId>
-        <artifactId>sling</artifactId>
-        <version>26</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.apache.sling</groupId>
-    <artifactId>org.apache.sling.hc.it</artifactId>
-    <packaging>jar</packaging>
-    <version>1.1.1-SNAPSHOT</version>
-
-    <name>Apache Sling Health Check Integration Tests</name>
-    <inceptionYear>2013</inceptionYear>
-
-    <properties>
-        <exam.version>3.0.3</exam.version>
-        <url.version>1.5.2</url.version>
-        <org.ops4j.pax.logging.DefaultServiceLog.level>INFO</org.ops4j.pax.logging.DefaultServiceLog.level>
-        <felix.shell>false</felix.shell>
-        <sling.hc.samples.version>1.0.7-SNAPSHOT</sling.hc.samples.version>
-        <sling.hc.api.version>1.0.1-SNAPSHOT</sling.hc.api.version>
-        <sling.hc.core.version>1.2.9-SNAPSHOT</sling.hc.core.version>
-        <sling.johnzon.version>1.0.0</sling.johnzon.version>
-    </properties>
-
-    <scm>
-        <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git</connection>
-        <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git</developerConnection>
-        <url>https://github.com/apache/sling-org-apache-sling-hc-it.git</url>
-    </scm>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemProperties>
-                        <org.ops4j.pax.logging.DefaultServiceLog.level>${org.ops4j.pax.logging.DefaultServiceLog.level}</org.ops4j.pax.logging.DefaultServiceLog.level>
-                        <sling.hc.core.version>${sling.hc.core.version}</sling.hc.core.version>
-                        <sling.hc.api.version>${sling.hc.api.version}</sling.hc.api.version>
-                        <sling.hc.samples.version>${sling.hc.samples.version}</sling.hc.samples.version>
-                        <sling.johnzon.version>${sling.johnzon.version}</sling.johnzon.version>
-                        <felix.shell>${felix.shell}</felix.shell>
-                    </systemProperties>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.hc.api</artifactId>
-            <version>${sling.hc.api.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.6.2</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>1.6.2</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-container-native</artifactId>
-            <version>${exam.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-junit4</artifactId>
-            <version>${exam.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-link-mvn</artifactId>
-            <version>${exam.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.url</groupId>
-            <artifactId>pax-url-aether</artifactId>
-            <version>${url.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.framework</artifactId>
-            <version>5.6.2</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.http.servlet-api</artifactId>
-            <version>1.1.0</version>
-            <scope>test</scope>
-        </dependency>   
-    </dependencies>
-</project>
diff --git a/src/test/java/org/apache/sling/hc/it/core/SampleHealthChecksTest.java b/src/test/java/org/apache/sling/hc/it/core/SampleHealthChecksTest.java
deleted file mode 100644
index 8504566..0000000
--- a/src/test/java/org/apache/sling/hc/it/core/SampleHealthChecksTest.java
+++ /dev/null
@@ -1,76 +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 SF 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.hc.it.core;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.management.DynamicMBean;
-
-import org.apache.sling.hc.api.execution.HealthCheckExecutionResult;
-import org.apache.sling.hc.api.execution.HealthCheckExecutor;
-import org.apache.sling.hc.api.execution.HealthCheckSelector;
-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.junit.PaxExam;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceReference;
-
-@RunWith(PaxExam.class)
-public class SampleHealthChecksTest {
-
-    @Inject
-    private HealthCheckExecutor executor;
-    
-    @Inject
-    private BundleContext bundleContext;
-    
-    @Configuration
-    public Option[] config() {
-        return U.config();
-    }
-    
-    @Test
-    public void testAnnotatedHC() {
-        final List<HealthCheckExecutionResult> results = executor.execute(HealthCheckSelector.tags("annotation","sample"));
-        assertNotNull("Expecting non-null results");
-        assertEquals("Expecting a single result", 1, results.size());
-        final HealthCheckExecutionResult r = results.get(0);
-        assertTrue("Expecting non-empty HC log", r.getHealthCheckResult().iterator().hasNext());
-        final String expected = "All good";
-        assertTrue(
-                "Expecting first log message to contain " + expected,
-                r.getHealthCheckResult().iterator().next().getMessage().contains(expected));
-    }
-
-    @Test
-    public void testAnnotatedHCMBean() throws InvalidSyntaxException {
-        // Verify that we have a DynamicMBean service with the right name, the JMX whiteboard will do the rest
-        final String filter = "(jmx.objectname=org.apache.sling.healthcheck:type=HealthCheck,name=annotatedHC)";
-        final ServiceReference<?> [] refs = bundleContext.getServiceReferences(DynamicMBean.class.getName(), filter);
-        assertNotNull("Expecting non-null ServiceReferences for " + filter, refs);
-        assertEquals("Expecting a single ServiceReference for " + filter, 1, refs.length);
-    }
-}
diff --git a/src/test/java/org/apache/sling/hc/it/core/U.java b/src/test/java/org/apache/sling/hc/it/core/U.java
deleted file mode 100644
index a063808..0000000
--- a/src/test/java/org/apache/sling/hc/it/core/U.java
+++ /dev/null
@@ -1,120 +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 SF 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.hc.it.core;
-
-import static org.junit.Assert.fail;
-import static org.ops4j.pax.exam.CoreOptions.junitBundles;
-import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
-import static org.ops4j.pax.exam.CoreOptions.options;
-import static org.ops4j.pax.exam.CoreOptions.provision;
-import static org.ops4j.pax.exam.CoreOptions.repository;
-import static org.ops4j.pax.exam.CoreOptions.systemProperty;
-import static org.ops4j.pax.exam.CoreOptions.when;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.sling.hc.api.execution.HealthCheckExecutionOptions;
-import org.apache.sling.hc.api.execution.HealthCheckExecutionResult;
-import org.apache.sling.hc.api.execution.HealthCheckExecutor;
-import org.apache.sling.hc.api.execution.HealthCheckSelector;
-import org.ops4j.pax.exam.Option;
-
-/** Test utilities */
-public class U {
-
-    /** Wait until the specified number of health checks are seen by supplied executor */
-    static void expectHealthChecks(int howMany, HealthCheckExecutor executor, String ... tags) {
-        expectHealthChecks(howMany, executor, new HealthCheckExecutionOptions(), tags);
-    }
-
-    /** Wait until the specified number of health checks are seen by supplied executor */
-    static void expectHealthChecks(int howMany, HealthCheckExecutor executor, HealthCheckExecutionOptions options, String ... tags) {
-        final long timeout = System.currentTimeMillis() + 10000L;
-        int count = 0;
-        while(System.currentTimeMillis() < timeout) {
-            final List<HealthCheckExecutionResult> results = executor.execute(HealthCheckSelector.tags(tags), options);
-            count = results.size();
-            if(count== howMany) {
-                return;
-            }
-            try {
-                Thread.sleep(100L);
-            } catch(InterruptedException iex) {
-                throw new RuntimeException("Unexpected InterruptedException");
-            }
-        }
-        fail("Did not get " + howMany + " health checks with tags " + Arrays.asList(tags) + " after " + timeout + " msec (last count=" + count + ")");
-    }
-
-    static Option[] config() {
-        final String apiVersion = System.getProperty("sling.hc.api.version");
-        final String coreVersion = System.getProperty("sling.hc.core.version");
-        final String samplesVersion = System.getProperty("sling.hc.samples.version");
-        final String johnzonVersion = System.getProperty("sling.johnzon.version");
-        final String localRepo = System.getProperty("maven.repo.local", "");
-        final boolean felixShell = "true".equals(System.getProperty("felix.shell", "false"));
-
-        return options(
-            repository("https://repo.maven.apache.org/maven2/").id("central"),
-            repository("https://repository.apache.org/snapshots/").id("apache-snapshots").allowSnapshots(),
-            when(localRepo.length() > 0).useOptions(
-                    systemProperty("org.ops4j.pax.url.mvn.localRepository").value(localRepo)
-            ),
-            junitBundles(),
-            when(felixShell).useOptions(
-                    provision(
-                            mavenBundle("org.apache.felix", "org.apache.felix.gogo.shell", "0.10.0"),
-                            mavenBundle("org.apache.felix", "org.apache.felix.gogo.runtime", "0.10.0"),
-                            mavenBundle("org.apache.felix", "org.apache.felix.gogo.command", "0.12.0"),
-                            mavenBundle("org.apache.felix", "org.apache.felix.shell.remote", "1.1.2")
-                    )
-            ),
-            provision(
-                    mavenBundle("org.apache.sling", "org.apache.sling.commons.log", "4.0.6"),
-                    mavenBundle("org.apache.sling", "org.apache.sling.commons.logservice", "1.0.6"),
-                    mavenBundle("org.slf4j", "slf4j-api", "1.7.13"),
-                    mavenBundle("org.slf4j", "jcl-over-slf4j", "1.7.13"),
-                    mavenBundle("org.slf4j", "log4j-over-slf4j", "1.7.13"),
-                    mavenBundle("org.apache.felix", "org.apache.felix.scr", "2.0.8"),
-                    mavenBundle("org.apache.felix", "org.apache.felix.configadmin", "1.8.10"),
-                    mavenBundle("org.apache.felix", "org.apache.felix.http.servlet-api", "1.1.0"),
-                    mavenBundle("org.apache.sling", "org.apache.sling.commons.johnzon", johnzonVersion),
-                    mavenBundle("org.apache.sling", "org.apache.sling.hc.api", apiVersion),
-                    mavenBundle("org.apache.sling", "org.apache.sling.hc.core", coreVersion),
-                    mavenBundle("org.apache.sling", "org.apache.sling.hc.samples", samplesVersion),
-                    mavenBundle("org.apache.sling", "org.apache.sling.commons.osgi", "2.2.0"),
-                    mavenBundle("org.apache.sling", "org.apache.sling.jcr.jcr-wrapper", "2.0.0"),
-                    mavenBundle("org.apache.sling", "org.apache.sling.api", "2.4.2"),
-                    mavenBundle("org.apache.sling", "org.apache.sling.jcr.api", "2.1.0"),
-                    mavenBundle("org.apache.sling", "org.apache.sling.engine", "2.2.8"),
-                    mavenBundle("org.apache.sling", "org.apache.sling.auth.core", "1.1.2"),
-                    mavenBundle("org.apache.sling", "org.apache.sling.commons.mime", "2.1.4"),
-                    mavenBundle("org.apache.sling", "org.apache.sling.settings", "1.2.2"),
-                    mavenBundle("org.apache.sling", "org.apache.sling.launchpad.api", "1.1.0"),
-                    mavenBundle("org.apache.sling", "org.apache.sling.scripting.api", "2.1.0"),
-                    mavenBundle("org.apache.sling", "org.apache.sling.commons.threads", "3.1.0"),
-                    mavenBundle("org.apache.sling", "org.apache.sling.commons.scheduler", "2.4.2"),
-                    mavenBundle("commons-collections", "commons-collections", "3.2.1"),
-                    mavenBundle("commons-io", "commons-io", "1.4"),
-                    mavenBundle("commons-fileupload", "commons-fileupload", "1.2.2"),
-                    mavenBundle("commons-lang", "commons-lang", "2.5") ,
-                    mavenBundle("org.apache.commons", "commons-lang3", "3.6"))
-        );
-    }
-}