Remove unused code.

eclipse-tycho · Mar 9, 2022 · 7bd23f1 · 7bd23f1
1 parent b1af9a5
commit 7bd23f1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/.../src/main/java/org/eclipse/tycho/repository/local/index/LocalRepositoryP2IndicesImpl.java b/.../src/main/java/org/eclipse/tycho/repository/local/index/LocalRepositoryP2IndicesImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2012 SAP SE and others.
+ * Copyright (c) 2011, 2022 SAP SE and others.
  * 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
@@ -16,7 +16,6 @@
 import java.io.File;
 
 import org.eclipse.tycho.core.shared.MavenContext;
-import org.eclipse.tycho.core.shared.MavenLogger;
 import org.eclipse.tycho.locking.facade.FileLockService;
 import org.eclipse.tycho.p2.repository.LocalRepositoryP2Indices;
 import org.eclipse.tycho.p2.repository.TychoRepositoryIndex;
@@ -26,7 +25,6 @@ public class LocalRepositoryP2IndicesImpl implements LocalRepositoryP2Indices {
     // injected members
     private FileLockService fileLockService;
     private File localRepositoryRoot;
-    private MavenLogger logger;
 
     // derived members
     private boolean initialized = false;
@@ -49,7 +47,6 @@ public LocalRepositoryP2IndicesImpl(MavenContext mavenContext, FileLockService f
     public void setMavenContext(MavenContext mavenContext) {
         this.mavenContext = mavenContext;
         this.localRepositoryRoot = mavenContext.getLocalRepositoryRoot();
-        this.logger = mavenContext.getLogger();
     }
 
     // injected by DS runtime

diff --git a/...ver.impl.test/src/test/java/org/eclipse/tycho/p2/target/TargetDefinitionResolverTest.java b/...ver.impl.test/src/test/java/org/eclipse/tycho/p2/target/TargetDefinitionResolverTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2020 SAP SE and others.
+ * Copyright (c) 2011, 2022 SAP SE and others.
  * 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
@@ -22,7 +22,6 @@
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;

diff --git a/...esolver.shared/src/main/java/org/eclipse/tycho/p2/target/facade/TargetDefinitionFile.java b/...esolver.shared/src/main/java/org/eclipse/tycho/p2/target/facade/TargetDefinitionFile.java
@@ -162,7 +162,6 @@ public String getUri() {
 
     private static class MavenLocation implements TargetDefinition.MavenGAVLocation {
 
-        private final Set<String> globalExcludes;
         private final Collection<String> includeDependencyScopes;
         private final MissingManifestStrategy manifestStrategy;
         private final boolean includeSource;
@@ -173,13 +172,12 @@ private static class MavenLocation implements TargetDefinition.MavenGAVLocation
         private final Element featureTemplate;
 
         public MavenLocation(Collection<MavenDependency> roots, Collection<String> includeDependencyScopes,
-                MissingManifestStrategy manifestStrategy, Set<String> globalExcludes, boolean includeSource,
+                MissingManifestStrategy manifestStrategy, boolean includeSource,
                 Collection<BNDInstructions> instructions, DependencyDepth dependencyDepth,
                 Collection<MavenArtifactRepositoryReference> repositoryReferences, Element featureTemplate) {
             this.roots = roots;
             this.includeDependencyScopes = includeDependencyScopes;
             this.manifestStrategy = manifestStrategy;
-            this.globalExcludes = globalExcludes;
             this.includeSource = includeSource;
             this.instructions = instructions;
             this.dependencyDepth = dependencyDepth;
@@ -595,7 +593,7 @@ private static MavenLocation parseMavenLocation(Element dom) {
             }
         }
         Element featureTemplate = getChild(dom, "feature");
-        return new MavenLocation(parseRoots(dom, globalExcludes), scopes, parseManifestStrategy(dom), globalExcludes,
+        return new MavenLocation(parseRoots(dom, globalExcludes), scopes, parseManifestStrategy(dom),
                 Boolean.parseBoolean(dom.getAttribute("includeSource")), parseInstructions(dom),
                 parseDependencyDepth(dom, scope), parseRepositoryReferences(dom), featureTemplate);
     }