diff options
| author | Vikas Chandra | 2019-05-27 04:43:53 +0000 |
|---|---|---|
| committer | Vikas Chandra | 2019-06-10 11:10:38 +0000 |
| commit | ded55d1af16d5f1c5dc3f07c62720453bf32edbf (patch) | |
| tree | 5f68a8dd671c53f37063ae09eea80d43c306cd88 | |
| parent | df67f3d37c7de1e0e0e4504d09e7ca8faf46ebfc (diff) | |
| download | eclipse.pde.ui-ded55d1af16d5f1c5dc3f07c62720453bf32edbf.tar.gz eclipse.pde.ui-ded55d1af16d5f1c5dc3f07c62720453bf32edbf.tar.xz eclipse.pde.ui-ded55d1af16d5f1c5dc3f07c62720453bf32edbf.zip | |
Bug 303961 - Adding .settings to src.includes should not produce a
warning
Change-Id: Ifd4f7f4f9d422550b53bf54ff7afd8d42b10a5e6
Signed-off-by: Vikas Chandra <Vikas.Chandra@in.ibm.com>
3 files changed, 6 insertions, 4 deletions
diff --git a/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF b/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF index f940f4990a..c4d14330da 100644 --- a/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF +++ b/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %name Bundle-SymbolicName: org.eclipse.pde.core; singleton:=true -Bundle-Version: 3.13.0.qualifier +Bundle-Version: 3.13.100.qualifier Bundle-Activator: org.eclipse.pde.internal.core.PDECore Bundle-Vendor: %provider-name Bundle-Localization: plugin diff --git a/ui/org.eclipse.pde.core/pom.xml b/ui/org.eclipse.pde.core/pom.xml index 7fc5fb2fd9..c3e14eb6cb 100644 --- a/ui/org.eclipse.pde.core/pom.xml +++ b/ui/org.eclipse.pde.core/pom.xml @@ -20,7 +20,7 @@ </parent> <groupId>org.eclipse.pde</groupId> <artifactId>org.eclipse.pde.core</artifactId> - <version>3.13.0-SNAPSHOT</version> + <version>3.13.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <properties> <defaultSigning-excludeInnerJars>true</defaultSigning-excludeInnerJars> diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/BuildErrorReporter.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/BuildErrorReporter.java index c132129981..3fea5cd8a8 100644 --- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/BuildErrorReporter.java +++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/BuildErrorReporter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2018 IBM Corporation and others. + * Copyright (c) 2005, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -983,7 +983,9 @@ public class BuildErrorReporter extends ErrorReporter implements IBuildPropertie if (sourceFolderList.contains(res.getFullPath())) { errorMessage = PDECoreMessages.BuildErrorReporter_srcIncludesSourceFolder; } else if (token.startsWith(".") || reservedTokens.contains(res.getName().toString().toLowerCase())) { //$NON-NLS-1$ - errorMessage = NLS.bind(PDECoreMessages.BuildErrorReporter_srcIncludesSourceFolder1, res.getName()); + if (!res.getName().toString().toLowerCase().equals(".settings")) {//$NON-NLS-1$ + errorMessage = NLS.bind(PDECoreMessages.BuildErrorReporter_srcIncludesSourceFolder1, res.getName()); + } } if (errorMessage != null) { |