Skip to content

Commit

Permalink
Update copyrights
Browse files Browse the repository at this point in the history
  • Loading branch information
cbridgha committed Mar 13, 2024
1 parent 500ab56 commit 1cf2067
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 15 deletions.
1 change: 0 additions & 1 deletion dev/wlp-updatePom/bnd.bnd
Expand Up @@ -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

Expand Down
@@ -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
Expand All @@ -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;
Expand Down Expand Up @@ -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/";

Expand Down Expand Up @@ -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");
Expand Down Expand Up @@ -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;
}
}

0 comments on commit 1cf2067

Please sign in to comment.