From a939e673fcf0769d2404878c0f275081961bb521 Mon Sep 17 00:00:00 2001
From: liamfallon <liam.fallon@est.tech>
Date: Tue, 14 Feb 2023 11:20:40 +0000
Subject: Remove integration base images from PF base images

The Docker base image from the integration project is now unmaintained.
We replace the Integration base image by updating our own base image to
work directly off Alpine.

Issue-ID: POLICY-4558
Change-Id: I00097cede2536c88ade3f318479eab309695b41e
Signed-off-by: liamfallon <liam.fallon@est.tech>
---
 policy-jdk/alpine/pom.xml | 96 +----------------------------------------------
 1 file changed, 1 insertion(+), 95 deletions(-)

(limited to 'policy-jdk/alpine/pom.xml')

diff --git a/policy-jdk/alpine/pom.xml b/policy-jdk/alpine/pom.xml
index 69f2c89a..b656b6f8 100644
--- a/policy-jdk/alpine/pom.xml
+++ b/policy-jdk/alpine/pom.xml
@@ -2,7 +2,7 @@
   ============LICENSE_START=======================================================
    Copyright (C) 2019 Ericsson, Tieto. All rights reserved.
    Modifications Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
-   Modifications Copyright (C) 2022 Nordix Foundation.
+   Modifications Copyright (C) 2022-2023 Nordix Foundation.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -37,95 +37,8 @@
 
     <properties>
         <docker.jdk.imagename>onap/policy-jdk-alpine</docker.jdk.imagename>
-        <integration.python.name>onap/integration-python</integration.python.name>
-        <integration.python.version>10.1.0</integration.python.version>
     </properties>
 
-    <profiles>
-        <profile>
-            <!-- This profile is activated on Apple M1 architecture to generate the ONAP base Java image locally -->
-            <id>baseImage</id>
-            <activation>
-                <os>
-                    <arch>aarch64</arch>
-                </os>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-scm-plugin</artifactId>
-                        <version>1.13.0</version>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.codehaus.plexus</groupId>
-                                <artifactId>plexus-utils</artifactId>
-                                <version>3.4.2</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.maven.scm</groupId>
-                                <artifactId>maven-scm-provider-gitexe</artifactId>
-                                <version>1.13.0</version>
-                            </dependency>
-                        </dependencies>
-                        <configuration>
-                            <connectionType>connection</connectionType>
-                            <checkoutDirectory>src/main/resources/meta</checkoutDirectory>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>checkout-onap-python</id>
-                                <phase>validate</phase>
-                                <configuration>
-                                    <connectionUrl>scm:git:https://gerrit.onap.org/r/integration/docker/onap-python</connectionUrl>
-                                    <checkoutDirectory>${project.build.directory}/onap-python</checkoutDirectory>
-                                </configuration>
-                                <goals>
-                                    <goal>checkout</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.fabric8</groupId>
-                        <artifactId>docker-maven-plugin</artifactId>
-
-                        <executions>
-                            <execution>
-                                <id>generate-python-image</id>
-                                <phase>initialize</phase>
-                                <configuration>
-                                    <verbose>true</verbose>
-                                    <apiVersion>1.23</apiVersion>
-                                    <pullRegistry>${docker.pull.registry}</pullRegistry>
-                                    <pushRegistry>${docker.push.registry}</pushRegistry>
-                                    <images>
-                                        <image>
-                                            <name>${integration.python.name}</name>
-                                            <build>
-                                                <cleanup>try</cleanup>
-                                                <contextDir>${project.build.directory}/onap-python</contextDir>
-                                                <dockerFile>Dockerfile</dockerFile>
-                                                <tags>
-                                                    <tag>${integration.python.version}</tag>
-                                                    <tag>${integration.python.version}-${maven.build.timestamp}</tag>
-                                                    <tag>${project.docker.latest.minmax.tag.version}</tag>
-                                                </tags>
-                                            </build>
-                                        </image>
-                                    </images>
-                                </configuration>
-                                <goals>
-                                    <goal>build</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
     <build>
         <finalName>${project.artifactId}-${project.version}</finalName>
         <plugins>
@@ -169,10 +82,6 @@
                                     <tag>${project.version}-${maven.build.timestamp}</tag>
                                     <tag>${project.docker.latest.minmax.tag.version}</tag>
                                 </tags>
-                                <args>
-                                    <INTEGRATION_PYTHON_NAME>${integration.python.name}</INTEGRATION_PYTHON_NAME>
-                                    <INTEGRATION_PYTHON_VERSION>${integration.python.version}</INTEGRATION_PYTHON_VERSION>
-                                </args>
                             </build>
                         </image>
                     </images>
@@ -205,9 +114,6 @@
                             <goal>build</goal>
                             <goal>push</goal>
                         </goals>
-                        <configuration>
-                            <image>${docker.jdk.imagename}</image>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
-- 
cgit 1.2.3-korg