From b62ae2e4a975ae0531426d7f02a2face4ca12bfc Mon Sep 17 00:00:00 2001
From: Michael Dürre <michael.duerre@highstreet-technologies.com>
Date: Mon, 13 Jun 2022 05:45:24 +0200
Subject: migrate dist to sulfur-sr0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

add odl sulfur dist

(djtimoney) Fixed some dependencies to resolve issues in local build,
installed odl-restconf-nb-bierman02 karaf package to enable Bierman
RESTCONF API support

Issue-ID: CCSDK-3695
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>
Change-Id: Ifd98f04f9a68c0c3923802839cdb71e12a115d09
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>
---
 .../silicon-alpine/src/main/docker/Dockerfile      | 60 ------------------
 .../main/resources/framework-4.3.2-features.xml    | 74 ----------------------
 .../src/main/resources/startup.properties          | 24 -------
 3 files changed, 158 deletions(-)
 delete mode 100644 opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile
 delete mode 100755 opendaylight/silicon/silicon-alpine/src/main/resources/framework-4.3.2-features.xml
 delete mode 100755 opendaylight/silicon/silicon-alpine/src/main/resources/startup.properties

(limited to 'opendaylight/silicon/silicon-alpine/src/main')

diff --git a/opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile b/opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile
deleted file mode 100644
index 19cd55f6..00000000
--- a/opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile
+++ /dev/null
@@ -1,60 +0,0 @@
-# Prepare stage for multistage image build
-## START OF STAGE0 ##
-FROM onap/ccsdk-alpine-j11-image:${project.docker.latestfulltag.version} AS stage0
-USER root
-
-ENV ODL_HOME /opt/opendaylight/current
-
-# copy the opendaylight tar and expand
-COPY ${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz /tmp/
-RUN mkdir -p /opt/odl \
-    && tar xzf /tmp/${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz --directory /opt/odl \
-    && rm -rf /tmp/${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz \
-    && mv /opt/odl/${odl.karaf.artifactId}-${ccsdk.opendaylight.version} /opt/opendaylight \
-    && ln -s  /opt/opendaylight /opt/opendaylight/${odl.karaf.artifactId}-${ccsdk.opendaylight.version} \
-    && ln -s /opt/opendaylight /opt/opendaylight/current
-
-# Enable wheel and create a group and user
-RUN sed -i -e 's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/g' /etc/sudoers \
-    && addgroup -S odl \
-    && adduser -S odl -G odl \
-    && addgroup odl wheel
-
-# Patch some opendaylight artifacts
-COPY system $ODL_HOME/system
-
-# Add missing scripts see SDNC-1056
-#COPY configure_cluster.sh configure-cluster-ipdetect.sh custom_shard_config.txt set_persistence.sh $ODL_HOME/bin/
-#RUN chmod 755 $ODL_HOME/bin/configure_cluster.sh $ODL_HOME/bin/configure-cluster-ipdetect.sh $ODL_HOME/bin/set_persistence.sh $ODL_HOME/bin/custom_shard_config.txt
-
-
-# Remove vulnerable version of ops4j logging
-COPY framework-${odl.karaf.framework.version}-features.xml $ODL_HOME/system/org/apache/karaf/features/framework/${odl.karaf.framework.version}/framework-${odl.karaf.framework.version}-features.xml
-COPY startup.properties $ODL_HOME/etc/startup.properties
-RUN rm -rf $ODL_HOME/system/org/ops4j/pax/logging/pax-logging-log4j2/${odl.pax.logging.version}
-RUN rm -rf $ODL_HOME/system/org/ops4j/pax/logging/pax-logging-logback/${odl.pax.logging.version}
-RUN rm -rf $ODL_HOME/system/org/ops4j/pax/logging/pax-logging-api/${odl.pax.logging.version}
-
-# Changing ownership and permission of /opt
-RUN chown -R odl:odl /opt && chmod -R 755 /opt
-
-## END OF STAGE0 ##
-
-#################################################
-
-## This will create actual image
-FROM scratch
-MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org)
-USER root
-
-ENV JAVA_HOME=/opt/java/openjdk \
-    PATH=$PATH:/opt/java/openjdk/bin \
-    ODL_HOME=/opt/opendaylight/current
-
-# Copy Everything from stage0
-COPY --from=stage0 / /
-
-USER odl
-EXPOSE 8181
-WORKDIR $ODL_HOME
-# ENTRYPOINT exec /opt/opendaylight/bin/karaf
diff --git a/opendaylight/silicon/silicon-alpine/src/main/resources/framework-4.3.2-features.xml b/opendaylight/silicon/silicon-alpine/src/main/resources/framework-4.3.2-features.xml
deleted file mode 100755
index 52bc1d40..00000000
--- a/opendaylight/silicon/silicon-alpine/src/main/resources/framework-4.3.2-features.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
-      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.
--->
-<features name="framework-4.3.2" xmlns="http://karaf.apache.org/xmlns/features/v1.3.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0">
-
-    <!-- This file is not used in the assembly., This file is used by the karaf-maven-plugin to generate a "final" feature.xml
-              including the correct start-level for the generation of the startup.propertie file -->
-
-    <feature version="4.3.2" description="Karaf core feature" name="framework" hidden="true">
-        <!-- persistent wiring extension -->
-        <bundle start-level="1">mvn:org.apache.karaf.features/org.apache.karaf.features.extension/4.3.2</bundle>
-        <!-- mvn: url handlers -->
-        <bundle start-level="5">mvn:org.ops4j.pax.url/pax-url-aether/2.6.7</bundle>
-        <!-- logging -->
-        <bundle start-level="8">mvn:org.ops4j.pax.logging/pax-logging-api/${patch.pax.logging.version}</bundle>
-        <bundle start-level="8">mvn:org.ops4j.pax.logging/pax-logging-log4j2/${patch.pax.logging.version}</bundle>
-        <bundle start-level="8">mvn:org.fusesource.jansi/jansi/1.18</bundle>
-        <!-- config admin -->
-        <bundle start-level="9">mvn:org.osgi/org.osgi.util.function/1.1.0</bundle>
-        <bundle start-level="9">mvn:org.osgi/org.osgi.util.promise/1.1.1</bundle>
-        <bundle start-level="9">mvn:org.apache.felix/org.apache.felix.coordinator/1.0.2</bundle>
-        <bundle start-level="9">mvn:org.apache.felix/org.apache.felix.converter/1.0.14</bundle>
-        <bundle start-level="10">mvn:org.apache.felix/org.apache.felix.configadmin/1.9.22</bundle>
-        <bundle start-level="11">mvn:org.apache.felix/org.apache.felix.configadmin.plugin.interpolation/1.1.2</bundle>
-        <bundle start-level="11">mvn:org.apache.felix/org.apache.felix.cm.json/1.0.6</bundle>
-        <bundle start-level="11">mvn:org.apache.sling/org.apache.sling.commons.johnzon/1.2.6</bundle>
-        <bundle start-level="11">mvn:org.apache.felix/org.apache.felix.configurator/1.0.14</bundle>
-        <!-- file install -->
-        <bundle start-level="12">mvn:org.apache.felix/org.apache.felix.fileinstall/3.6.8</bundle>
-        <!-- features service -->
-        <bundle start-level="15">mvn:org.apache.karaf.features/org.apache.karaf.features.core/4.3.2</bundle>
-        <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/2.9.0</bundle>
-    </feature>
-
-    <feature version="4.3.2" description="Karaf core feature" name="framework-logback" hidden="true">
-        <!-- persistent wiring extension -->
-        <bundle start-level="1">mvn:org.apache.karaf.features/org.apache.karaf.features.extension/4.3.2</bundle>
-        <!-- mvn: url handlers -->
-        <bundle start-level="5">mvn:org.ops4j.pax.url/pax-url-aether/2.6.7</bundle>
-        <!-- logging -->
-        <bundle start-level="8">mvn:org.ops4j.pax.logging/pax-logging-api/${patch.pax.logging.version}</bundle>
-        <bundle start-level="8">mvn:org.ops4j.pax.logging/pax-logging-logback/${patch.pax.logging.version}</bundle>
-        <!-- config admin -->
-        <bundle start-level="9">mvn:org.osgi/org.osgi.util.function/1.1.0</bundle>
-        <bundle start-level="9">mvn:org.osgi/org.osgi.util.promise/1.1.1</bundle>
-        <bundle start-level="9">mvn:org.apache.felix/org.apache.felix.coordinator/1.0.2</bundle>
-        <bundle start-level="9">mvn:org.apache.felix/org.apache.felix.converter/1.0.14</bundle>
-        <bundle start-level="10">mvn:org.apache.felix/org.apache.felix.configadmin/1.9.22</bundle>
-        <bundle start-level="11">mvn:org.apache.felix/org.apache.felix.configadmin.plugin.interpolation/1.1.2</bundle>
-        <bundle start-level="11">mvn:org.apache.felix/org.apache.felix.cm.json/1.0.6</bundle>
-        <bundle start-level="11">mvn:org.apache.sling/org.apache.sling.commons.johnzon/1.2.6</bundle>
-        <bundle start-level="11">mvn:org.apache.felix/org.apache.felix.configurator/1.0.14</bundle>
-        <!-- file install -->
-        <bundle start-level="12">mvn:org.apache.felix/org.apache.felix.fileinstall/3.6.8</bundle>
-        <!-- features service -->
-        <bundle start-level="15">mvn:org.apache.karaf.features/org.apache.karaf.features.core/4.3.2</bundle>
-    </feature>
-
-</features>
diff --git a/opendaylight/silicon/silicon-alpine/src/main/resources/startup.properties b/opendaylight/silicon/silicon-alpine/src/main/resources/startup.properties
deleted file mode 100755
index 40baf708..00000000
--- a/opendaylight/silicon/silicon-alpine/src/main/resources/startup.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# Bundles to be started on startup, with startlevel
-mvn\:org.apache.karaf.features/org.apache.karaf.features.extension/4.3.2 = 1
-mvn\:org.ops4j.pax.url/pax-url-aether/2.6.7 = 5
-mvn\:org.ops4j.pax.logging/pax-logging-api/${patch.pax.logging.version} = 8
-mvn\:org.ops4j.pax.logging/pax-logging-log4j2/${patch.pax.logging.version} = 8
-mvn\:org.fusesource.jansi/jansi/1.18 = 8
-mvn\:org.osgi/org.osgi.util.promise/1.1.1 = 9
-mvn\:org.apache.felix/org.apache.felix.coordinator/1.0.2 = 9
-mvn\:org.apache.felix/org.apache.felix.converter/1.0.14 = 9
-mvn\:org.osgi/org.osgi.util.function/1.1.0 = 9
-mvn\:org.apache.felix/org.apache.felix.configadmin/1.9.22 = 10
-mvn\:org.apache.felix/org.apache.felix.configadmin.plugin.interpolation/1.1.2 = 11
-mvn\:org.apache.felix/org.apache.felix.configurator/1.0.14 = 11
-mvn\:org.apache.sling/org.apache.sling.commons.johnzon/1.2.6 = 11
-mvn\:org.apache.felix/org.apache.felix.cm.json/1.0.6 = 11
-mvn\:org.apache.felix/org.apache.felix.fileinstall/3.6.8 = 12
-mvn\:org.apache.karaf.features/org.apache.karaf.features.core/4.3.2 = 15
-# The following are added by opendaylight-karaf-resources
-mvn\:org.osgi/org.osgi.service.event/1.4.0 = 7
-mvn\:org.apache.felix/org.apache.felix.metatype/1.2.4 = 8
-mvn\:org.opendaylight.odlparent/bcprov-framework-ext/8.1.3 = 14
-mvn\:org.opendaylight.odlparent/bcpkix-framework-ext/8.1.3 = 14
-mvn\:org.opendaylight.odlparent/logging-markers/8.1.3 = 14
-mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint.core.compatibility/1.0.0 = 14
-- 
cgit 1.2.3-korg