Fix grammar

eclipse-tycho · Jul 19, 2023 · 4992944 · 4992944
1 parent 1532e01
commit 4992944
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/p2resolver/P2GeneratorImpl.java b/tycho-core/src/main/java/org/eclipse/tycho/p2resolver/P2GeneratorImpl.java
@@ -202,7 +202,7 @@ public String getArtifactId() {
                 result.put(classifier, p2artifact);
             }, () -> {
                 logger.debug("Skip generation of secondary metadata for artifact = " + artifact
-                        + ", as it does not has a canonical ArtifactDescriptor");
+                        + ", as it does not have a canonical ArtifactDescriptor");
             });
 
         }
@@ -365,7 +365,7 @@ public boolean isSupported(String type) {
     /**
      * Looks for all files at the base of the project that extension is ".product" Duplicated in the
      * EclipseRepositoryProject
-     * 
+     *
      * @param projectLocation
      * @return The list of product files to parse for an eclipse-repository project
      */

diff --git a/...ras-plugin/src/main/java/org/eclipse/tycho/plugins/p2/extras/CompareWithBaselineMojo.java b/...ras-plugin/src/main/java/org/eclipse/tycho/plugins/p2/extras/CompareWithBaselineMojo.java
@@ -30,8 +30,8 @@
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.logging.Logger;
 import org.eclipse.equinox.p2.metadata.IInstallableUnit;
-import org.eclipse.tycho.IDependencyMetadata.DependencyMetadataType;
 import org.eclipse.tycho.ExecutionEnvironmentConfiguration;
+import org.eclipse.tycho.IDependencyMetadata.DependencyMetadataType;
 import org.eclipse.tycho.ReactorProject;
 import org.eclipse.tycho.TargetEnvironment;
 import org.eclipse.tycho.TargetPlatform;
@@ -52,16 +52,16 @@
  * This mojo compares versions the output artifacts of your module build with the version of the
  * same artifacts available in configured baselines, in order to detect version inconsistencies
  * (version moved back, or not correctly bumped since last release).
- * 
+ *
  * Rules for "illegal" versions are:
  * <li>version decreased compared to baseline</li>
  * <li>same fully-qualified version as baseline, but with different binary content</li>
  * <li>same major.minor.micro as baseline, with different qualifier (at least micro should be
  * increased)</li>
- * 
+ *
  * This mojo doesn't allow to use qualifier as a versioning segment and will most likely drive to
  * false-positive errors if your qualifier has means to show versioniterations.
- * 
+ *
  * @author mistria
  */
 @Mojo(defaultPhase = LifecyclePhase.VERIFY, requiresProject = false, name = "compare-version-with-baselines", threadSafe = true)
@@ -87,14 +87,14 @@ public static enum ReportBehavior {
     /**
      * A list of file path patterns that are ignored when comparing the build artifact against the
      * baseline version.
-     * 
+     *
      * {@code
      * <ignoredPatterns>
      *   <pattern>META-INF/ECLIPSE_.RSA<pattern>
      *   <pattern>META-INF/ECLIPSE_.SF</pattern>
      * </ignoredPatterns>
      * }
-     * 
+     *
      */
     @Parameter
     private List<String> ignoredPatterns;
@@ -169,7 +169,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
                     getLog().debug("Found " + foundInBaseline.getId() + "/" + foundInBaseline.getVersion()
                             + " with delta: " + versionDelta);
                     if (version.compareTo(baselineVersion) < 0) {
-                        String message = "Version have moved backwards for (" + id + "/" + version + "). Baseline has "
+                        String message = "Version has moved backwards for (" + id + "/" + version + "). Baseline has "
                                 + baselineVersion + ") with delta: " + versionDelta;
                         if (this.onIllegalVersion == ReportBehavior.warn) {
                             getLog().warn(message);

diff --git a/tycho-source-plugin/src/main/java/org/eclipse/tycho/source/SourceFeatureMojo.java b/tycho-source-plugin/src/main/java/org/eclipse/tycho/source/SourceFeatureMojo.java
@@ -9,7 +9,7 @@
  *
  * Contributors:
  *    Sonatype Inc. - initial API and implementation
- *    Bachmann GmbH. - Bug 538395 Generate valid feature xml 
+ *    Bachmann GmbH. - Bug 538395 Generate valid feature xml
  *    Christoph Läubrich - Bug 568359 - move tycho-extras SourceFeatureMojo to tycho-source-feature
  *******************************************************************************/
 package org.eclipse.tycho.source;
@@ -83,13 +83,13 @@
  * <li>Includes the original feature. This ensures that binaries and corresponding sources
  * match.</li>
  * </ul>
- * 
+ *
  * Source feature generation can be customized by adding files under path
  * <code>sourceTemplateFeature/</code>. Files added here will be added to the root of the source
  * feature jar. Especially, if file <code>sourceTemplateFeature/feature.properties</code> is found,
  * values in this file override values of respective keys in
  * <code>&lt;originalFeature&gt;/feature.properties</code>.
- * 
+ *
  */
 @Mojo(name = SourceFeatureMojo.GOAL, defaultPhase = LifecyclePhase.PACKAGE, threadSafe = true)
 public class SourceFeatureMojo extends AbstractMojo {
@@ -159,14 +159,14 @@ public enum MissingSourcesAction {
 
     /**
      * Bundles and features that do not have corresponding sources. Example:
-     * 
+     *
      * <pre>
      * &lt;excludes&gt;
      *   &lt;plugin id="plugin.nosource"/&gt;
      *   &lt;feature id="feature.nosource"/&gt;
      * &lt;/excludes&gt;
      * </pre>
-     * 
+     *
      */
     @Parameter
     private PlexusConfiguration excludes;
@@ -179,7 +179,7 @@ public enum MissingSourcesAction {
      * <p>
      * <strong>WARNING</strong> This experimental parameter may be removed from future
      * source-feature mojo versions without prior notice.
-     * 
+     *
      */
     @Parameter
     private PlexusConfiguration plugins;
@@ -378,7 +378,7 @@ Feature createSourceFeatureSkeleton(Feature feature, Properties mergedFeaturePro
                     mergedFeatureProperties.setProperty(labelKey,
                             mergedFeatureProperties.getProperty(labelKey) + labelSuffix);
                 } else {
-                    // keep source template value 
+                    // keep source template value
                 }
             } else {
                 sourceFeature.setLabel(originalLabel + labelSuffix);
@@ -428,7 +428,7 @@ Feature createSourceFeatureSkeleton(Feature feature, Properties mergedFeaturePro
     /**
      * Returns the value for a field. In case the value is a reference to feature.properties, verify
      * that the entry exist in the feature.properties file for source
-     * 
+     *
      * @param fieldValue
      * @param sourceFeatureProperties
      * @return
@@ -447,7 +447,7 @@ private static String validateValue(String fieldValue, Properties sourceFeatureP
 
     /**
      * Added all references to sourceFeature, as deduced by feature and resolved by targetPlatform
-     * 
+     *
      * @param sourceFeature
      * @param feature
      * @param targetPlatform
@@ -533,9 +533,9 @@ private void fillReferences(Feature sourceFeature, Feature feature, TargetPlatfo
 
                 throw new MojoExecutionException(sb.toString());
             } else {
-                reportMissing("The following referenced plugins has missing sources", missingSourcePlugins);
-                reportMissing("The following referenced features has missing sources", missingSourceFeatures);
-                reportMissing("The following referenced extra plugins has missing sources", missingExtraPlugins);
+                reportMissing("The following referenced plugins have missing sources", missingSourcePlugins);
+                reportMissing("The following referenced features have missing sources", missingSourceFeatures);
+                reportMissing("The following referenced extra plugins have missing sources", missingExtraPlugins);
             }
         }