[580138] Exclude resource forks from jar selection Change-Id: I80ba5d58dd60e6cca3d6cd2c5306e1d24b116549
diff --git a/features/org.eclipse.jst.server_core.feature/feature.xml b/features/org.eclipse.jst.server_core.feature/feature.xml index 76b1bb4..6846e32 100644 --- a/features/org.eclipse.jst.server_core.feature/feature.xml +++ b/features/org.eclipse.jst.server_core.feature/feature.xml
@@ -15,7 +15,7 @@ <feature id="org.eclipse.jst.server_core.feature" label="%featureName" - version="3.4.500.qualifier" + version="3.4.600.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" license-feature-version="1.0.1.qualifier">
diff --git a/features/org.eclipse.jst.server_core.feature/pom.xml b/features/org.eclipse.jst.server_core.feature/pom.xml index 7bebaa1..ae7fe81 100644 --- a/features/org.eclipse.jst.server_core.feature/pom.xml +++ b/features/org.eclipse.jst.server_core.feature/pom.xml
@@ -22,7 +22,7 @@ <groupId>org.eclipse.webtools.servertools</groupId> <artifactId>org.eclipse.jst.server_core.feature</artifactId> - <version>3.4.500-SNAPSHOT</version> + <version>3.4.600-SNAPSHOT</version> <packaging>eclipse-feature</packaging> <build>
diff --git a/features/org.eclipse.jst.server_sdk.feature/feature.xml b/features/org.eclipse.jst.server_sdk.feature/feature.xml index 994a577..8b3f75d 100644 --- a/features/org.eclipse.jst.server_sdk.feature/feature.xml +++ b/features/org.eclipse.jst.server_sdk.feature/feature.xml
@@ -15,7 +15,7 @@ <feature id="org.eclipse.jst.server_sdk.feature" label="%featureName" - version="3.4.400.qualifier" + version="3.4.600.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" license-feature-version="1.0.1.qualifier">
diff --git a/features/org.eclipse.jst.server_sdk.feature/pom.xml b/features/org.eclipse.jst.server_sdk.feature/pom.xml index 49f3d86..34dfd2e 100644 --- a/features/org.eclipse.jst.server_sdk.feature/pom.xml +++ b/features/org.eclipse.jst.server_sdk.feature/pom.xml
@@ -22,6 +22,6 @@ <groupId>org.eclipse.webtools.servertools</groupId> <artifactId>org.eclipse.jst.server_sdk.feature</artifactId> - <version>3.4.400-SNAPSHOT</version> + <version>3.4.600-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>
diff --git a/plugins/org.eclipse.jst.server.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.core/META-INF/MANIFEST.MF index 21a4887..e2324d1 100644 --- a/plugins/org.eclipse.jst.server.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.server.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jst.server.core; singleton:=true -Bundle-Version: 1.2.700.qualifier +Bundle-Version: 1.2.800.qualifier Bundle-Activator: org.eclipse.jst.server.core.internal.JavaServerPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.jst.server.core/pom.xml b/plugins/org.eclipse.jst.server.core/pom.xml index eb2cafe..8b3a5f1 100644 --- a/plugins/org.eclipse.jst.server.core/pom.xml +++ b/plugins/org.eclipse.jst.server.core/pom.xml
@@ -22,6 +22,6 @@ <groupId>org.eclipse.webtools.servertools</groupId> <artifactId>org.eclipse.jst.server.core</artifactId> - <version>1.2.700-SNAPSHOT</version> + <version>1.2.800-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/RuntimeClasspathProviderDelegate.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/RuntimeClasspathProviderDelegate.java old mode 100644 new mode 100755 index cbadc7b..b9c4422 --- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/RuntimeClasspathProviderDelegate.java +++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/RuntimeClasspathProviderDelegate.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2015 IBM Corporation and others. + * Copyright (c) 2003, 2022 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 @@ -239,9 +239,12 @@ File[] files = dir.listFiles(); if (files != null) { for (File file : files) { + String filename = file.getName().toLowerCase(); + if (filename.startsWith(".")) + continue; if (file.isDirectory() && depth > 0) { addJarFiles(file, list, depth - 1); - } else if (file.getAbsolutePath().endsWith(".jar") || file.getAbsolutePath().endsWith(".zip")) { + } else if (filename.endsWith(".jar") || filename.endsWith(".zip")) { IPath path = new Path(file.getAbsolutePath()); list.add(JavaCore.newLibraryEntry(path, null, null)); } @@ -405,4 +408,4 @@ } return (IClasspathAttribute[]) classpathAttributeList.toArray(new IClasspathAttribute[classpathAttributeList.size()]); } -} \ No newline at end of file +}