Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleaning up old code that uses old log4j pieces

Browse Source
This commit is contained in:
Martin Lippert
2022-02-25 09:55:59 +01:00
parent 81f55bbef5
commit c4143c22ad
6 changed files with 15 additions and 517 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
eclipse-extensions/org.springframework.ide.eclipse.xml.namespaces/META-INF/MANIFEST.MF
View File

@@ -40,4 +40,5 @@ Export-Package: org.springframework.ide.eclipse.xml.namespaces,
Bundle-ActivationPolicy: lazy
Require-Bundle: com.google.guava,
io.projectreactor.reactor-core;bundle-version="3.1.9",
org.reactivestreams.reactive-streams;bundle-version="1.0.2"
org.reactivestreams.reactive-streams;bundle-version="1.0.2",
org.apache.commons.io;bundle-version="2.8.0"

12
eclipse-extensions/org.springframework.ide.eclipse.xml.namespaces/src/org/springframework/ide/eclipse/xml/namespaces/internal/ProjectClasspathNamespaceDefinitionResolver.java
View File

@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2010, 2011 Spring IDE Developers
* Copyright (c) 2010, 2022 Spring IDE Developers
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -23,6 +23,7 @@ import java.util.Properties;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.commons.io.IOUtils;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.Preferences.IPropertyChangeListener;
import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener;
@@ -40,7 +41,6 @@ import org.springframework.ide.eclipse.xml.namespaces.model.NamespaceDefinition;
import org.springframework.ide.eclipse.xml.namespaces.util.TargetNamespaceScanner;
import org.springsource.ide.eclipse.commons.core.SpringCorePreferences;
import org.springsource.ide.eclipse.commons.core.util.CollectionUtils;
import org.springsource.ide.eclipse.commons.core.util.FileCopyUtils;
import org.springsource.ide.eclipse.commons.frameworks.core.util.StringUtils;
/**
@@ -208,7 +208,13 @@ public class ProjectClasspathNamespaceDefinitionResolver implements INamespaceDe
return iconFile;
}
FileCopyUtils.copy(cls.getResourceAsStream(icon), new FileOutputStream(iconFile));
try (
InputStream is = cls.getResourceAsStream(icon);
FileOutputStream os = new FileOutputStream(iconFile);
) {
IOUtils.copy(is, os);
}
return iconFile;
}
catch (Exception e) {