From 1cf2067fbcc6f6f86b176e91cf7265bc2b4e9b73 Mon Sep 17 00:00:00 2001
From: Chuck Bridgham <cbridgha@us.ibm.com>
Date: Wed, 13 Mar 2024 11:03:58 -0400
Subject: [PATCH] Update copyrights

---
 dev/wlp-updatePom/bnd.bnd                        |  1 -
 .../openliberty/build/update/pom/PomUtils.java   | 16 ++--------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/dev/wlp-updatePom/bnd.bnd b/dev/wlp-updatePom/bnd.bnd
index 2c3bc983983..8cf46d2ae9c 100644
--- a/dev/wlp-updatePom/bnd.bnd
+++ b/dev/wlp-updatePom/bnd.bnd
@@ -45,7 +45,6 @@ Export-Package: \
 
 -buildpath: \
   org.apache.maven:maven-model;version=3.6.3, \
-  org.apache.maven.indexer:indexer-core;version=6.2.2, \
   org.codehaus.plexus:plexus-utils;version=3.2.1,\
 	com.ibm.ws.org.apache.ant;version=latest
 
diff --git a/dev/wlp-updatePom/src/io/openliberty/build/update/pom/PomUtils.java b/dev/wlp-updatePom/src/io/openliberty/build/update/pom/PomUtils.java
index 7979ae9fe94..c2314640d7b 100644
--- a/dev/wlp-updatePom/src/io/openliberty/build/update/pom/PomUtils.java
+++ b/dev/wlp-updatePom/src/io/openliberty/build/update/pom/PomUtils.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2023 IBM Corporation and others.
+ * Copyright (c) 2023, 2024 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -23,8 +23,6 @@
 import java.util.Map;
 import java.util.function.Function;
 
-import org.apache.maven.index.artifact.GavCalculator;
-import org.apache.maven.index.artifact.M2GavCalculator;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Exclusion;
 import org.apache.maven.model.Model;
@@ -58,7 +56,6 @@ public static void writePom(Model pomModel, OutputStream outputStream) throws Ex
         }
     }
 
-    private static GavCalculator calc;
     protected static final int BUF_SIZE = 32 * 1024;
     protected static final String POM_PREFIX_PATH = "META-INF/maven/dev/";
 
@@ -131,7 +128,7 @@ public static void addTransitiveExcludes(Dependency dep) {
         exclusions.add(ex);
     }
 
-    //We will add a pom excludes fragment in each of these dependency sections
+    //We will add a pom excludes fragment in each of these dependency sections - Proven these are NOT shipped
     static Map<String, String> transitiveExcludes = new HashMap<String, String>() {
         {
             put("org.apache.openwebbeans:openwebbeans-ee-common:1.1.6", "javassist:javassist");
@@ -197,13 +194,4 @@ public static boolean filterArtifact(Dependency dep) {
         }
         return false;
     }
-
-    /**
-     * @return the calc
-     */
-    public static GavCalculator getCalc() {
-        if (calc == null)
-            calc = new M2GavCalculator();
-        return calc;
-    }
 }