This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new 78fc373 Trim trailing whitespace
78fc373 is described below
commit 78fc3734f9325be818b1bf4aa9fc7d8f715a851a
Author: Michael Osipov <[email protected]>
AuthorDate: Fri Jul 2 18:47:10 2021 +0200
Trim trailing whitespace
---
CONTRIBUTING.md | 8 ++++----
Jenkinsfile | 6 +++---
README.md | 4 ++--
apache-maven/src/assembly/wrapper/script/download | 2 +-
maven-bom/src/site/apt/index.apt | 2 +-
.../legacy/resolver/DefaultArtifactCollectorTest.java | 2 +-
.../apache/maven/lifecycle/internal/builder/BuilderCommon.java | 2 +-
.../apache/maven/lifecycle/internal/stub/AboutTheStubs.html | 4 ++--
.../apache/maven/project/DefaultMavenProjectBuilderTest.java | 10 +++++-----
.../src/main/java/org/apache/maven/feature/Features.java | 4 ++--
.../org/apache/maven/model/building/DefaultModelBuilder.java | 8 ++++----
maven-model-transform/src/site/apt/index.apt | 10 +++++-----
12 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9989fb1..e74c55d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-Contributing to Apache Maven
+Contributing to Apache Maven
======================
You have found a bug or you have an idea for a cool new feature? Contributing
@@ -31,9 +31,9 @@ Getting Started
+ Make sure you have a [JIRA account](https://issues.apache.org/jira/).
+ Make sure you have a [GitHub account](https://github.com/signup/free).
-+ If you're planning to implement a new feature, it makes sense to discuss
your changes
++ If you're planning to implement a new feature, it makes sense to discuss
your changes
on the [dev list](https://maven.apache.org/mailing-lists.html) first.
- This way you can make sure you're not wasting your time on something that
isn't
+ This way you can make sure you're not wasting your time on something that
isn't
considered to be in Apache Maven's scope.
+ Submit a ticket for your issue, assuming one does not already exist.
+ Clearly describe the issue, including steps to reproduce when it is a bug.
@@ -52,7 +52,7 @@ There are some guidelines which will make applying PRs easier
for us:
+ Respect the original code style: by using the same [codestyle][code-style],
patches should only highlight the actual difference, not being disturbed by
any formatting issues:
+ Only use spaces for indentation.
- + Create minimal diffs - disable on save actions like reformat source code
or organize imports.
+ + Create minimal diffs - disable on save actions like reformat source code
or organize imports.
If you feel the source code should be reformatted, create a separate PR
for this change.
+ Check for unnecessary whitespace with `git diff --check` before committing.
+ Make sure your commit messages are in the proper format. Your commit message
should contain the key of the JIRA issue.
diff --git a/Jenkinsfile b/Jenkinsfile
index 1118392..54b8652 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -30,7 +30,7 @@ def tests
try {
-def osNode = jenkinsEnv.labelForOS(buildOs)
+def osNode = jenkinsEnv.labelForOS(buildOs)
node(jenkinsEnv.nodeSelection(osNode)) {
dir('build') {
stage('Checkout') {
@@ -163,8 +163,8 @@ parallel(runITsTasks)
} finally {
// notify completion
stage("Notifications") {
- jenkinsNotify()
- }
+ jenkinsNotify()
+ }
}
def archiveDirs(stageId, archives) {
diff --git a/README.md b/README.md
index 0eec188..44c794b 100644
--- a/README.md
+++ b/README.md
@@ -45,8 +45,8 @@ You can download the release source from our [download
page][maven-download].
Contributing
------------
-If you are interested in the development of Maven, please consult the
-documentation first and afterward you are welcome to join the developers
+If you are interested in the development of Maven, please consult the
+documentation first and afterward you are welcome to join the developers
mailing list to ask questions or discuss new ideas/features/bugs etc.
Take a look into the [contribution guidelines](CONTRIBUTING.md).
diff --git a/apache-maven/src/assembly/wrapper/script/download
b/apache-maven/src/assembly/wrapper/script/download
index 79cd110..ed8243e 100755
--- a/apache-maven/src/assembly/wrapper/script/download
+++ b/apache-maven/src/assembly/wrapper/script/download
@@ -10,7 +10,7 @@ else
if [ "$MVNW_VERBOSE" = true ]; then
echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
fi
-
+
jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/maven-wrapper/${project.version}/maven-wrapper-${project.version}.jar";
if [ -n "$MVNW_REPOURL" ]; then
diff --git a/maven-bom/src/site/apt/index.apt b/maven-bom/src/site/apt/index.apt
index e0dd409..14acc85 100644
--- a/maven-bom/src/site/apt/index.apt
+++ b/maven-bom/src/site/apt/index.apt
@@ -26,4 +26,4 @@
Maven Dependencies BOM
Bill Of Materials for Apache Maven dependencies, to easily use as
dependencyManagement import: see {{{./dependency-management.html}Dependency
Management report}}.
-
\ No newline at end of file
+
diff --git
a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
index f50d914..56018d3 100644
---
a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
+++
b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
@@ -150,7 +150,7 @@ public class DefaultArtifactCollectorTest
ArtifactSpec f = c1.addDependency( "f", "1.0" );
ArtifactResolutionResult res = collect( createSet( new Object[] {
a.artifact, e.artifact } ) );
- assertEquals( createSet( new Object[] { a.artifact, b.artifact,
e.artifact, c1.artifact, f.artifact } ),
+ assertEquals( createSet( new Object[] { a.artifact, b.artifact,
e.artifact, c1.artifact, f.artifact } ),
res.getArtifacts(), "Check artifact list" );
assertEquals( "1.0", getArtifact( "c", res.getArtifacts()
).getVersion(), "Check version" );
}
diff --git
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java
index 2b5d6ec..14b0ec5 100644
---
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java
+++
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java
@@ -112,7 +112,7 @@ public class BuilderCommon
if ( Features.buildConsumer().isActive() )
{
Optional<MojoExecution> gpgMojo =
executionPlan.getMojoExecutions().stream()
- .filter( m -> "maven-gpg-plugin".equals(
m.getArtifactId() )
+ .filter( m -> "maven-gpg-plugin".equals(
m.getArtifactId() )
&& "org.apache.maven.plugins".equals(
m.getGroupId() ) )
.findAny();
diff --git
a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/AboutTheStubs.html
b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/AboutTheStubs.html
index 621318d..7c70ea4 100644
---
a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/AboutTheStubs.html
+++
b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/AboutTheStubs.html
@@ -36,7 +36,7 @@ You can change/extend these stubs, and tests should not be
breaking too much, si
assert using expected values from the stubs. Normally, when you try to use
data from the stubs that
have not been properly populated, you'll get a nullpointer in your test and
you then have to
identify which stub creates that specific piece of data.
-
+
The most important stubs are:
LifecycleExecutionPlanCalculatorStub
ProjectDependencyGraphStub
@@ -52,4 +52,4 @@ In the next test that same "live implementation" will be used
in a stub version
Not all live services have stubs, but can be added as needed.
</body>
-</html>
\ No newline at end of file
+</html>
diff --git
a/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
b/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
index 39036fb..727f28d 100644
---
a/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
+++
b/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
@@ -48,7 +48,7 @@ public class DefaultMavenProjectBuilderTest
{
@TempDir
File localRepoDir;
-
+
// only use by reread()
@TempDir
Path projectRoot;
@@ -319,10 +319,10 @@ public class DefaultMavenProjectBuilderTest
"Expected 'ProjectBuildingException' not thrown." );
assertThat( e.getMessage(), containsString( "Version must be a
constant" ) );
}
-
+
/**
* Ensure that when re-reading a pom, it should not use the cached Model
- *
+ *
* @throws Exception in case of issue
*/
@Test
@@ -336,10 +336,10 @@ public class DefaultMavenProjectBuilderTest
{
Files.copy( pomResource, pom, StandardCopyOption.REPLACE_EXISTING
);
}
-
+
MavenProject project = projectBuilder.build( pom.toFile(),
buildingRequest ).getProject();
assertThat( project.getName(), is( "aid" ) ); // inherited from
artifactId
-
+
try ( InputStream pomResource =
DefaultMavenProjectBuilderTest.class.getResourceAsStream(
"/projects/reread/pom2.xml" ) )
{
diff --git
a/maven-model-builder/src/main/java/org/apache/maven/feature/Features.java
b/maven-model-builder/src/main/java/org/apache/maven/feature/Features.java
index f060ef9..979f7b3 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/feature/Features.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/feature/Features.java
@@ -47,7 +47,7 @@ public final class Features
public static class Feature
{
private final boolean active;
-
+
private final String name;
Feature( String name, String defaultValue )
@@ -60,7 +60,7 @@ public final class Features
{
return active;
}
-
+
public String propertyName()
{
return name;
diff --git
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index 07480e5..3c1d8f6 100644
---
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -274,7 +274,7 @@ public class DefaultModelBuilder
{
return new DefaultTransformerContextBuilder();
}
-
+
@Override
public ModelBuildingResult build( ModelBuildingRequest request )
throws ModelBuildingException
@@ -418,7 +418,7 @@ public class DefaultModelBuilder
profileActivationContext.setProjectProperties(
tmpModel.getProperties() );
Map<String, Activation> interpolatedActivations =
getInterpolatedActivations( rawModel,
-
profileActivationContext,
+
profileActivationContext,
problems );
injectProfileActivations( tmpModel, interpolatedActivations );
@@ -545,7 +545,7 @@ public class DefaultModelBuilder
}
}
- private static boolean isNotEmpty( String string )
+ private static boolean isNotEmpty( String string )
{
return string != null && !string.isEmpty();
}
@@ -1065,7 +1065,7 @@ public class DefaultModelBuilder
{
parentData = readParentExternally( childModel, request,
result, problems );
}
-
+
Model parentModel = parentData.getModel();
if ( !"pom".equals( parentModel.getPackaging() ) )
{
diff --git a/maven-model-transform/src/site/apt/index.apt
b/maven-model-transform/src/site/apt/index.apt
index 69f89c7..fa329c6 100644
--- a/maven-model-transform/src/site/apt/index.apt
+++ b/maven-model-transform/src/site/apt/index.apt
@@ -27,14 +27,14 @@ Maven Model XML Transformer
Maven Model XML Transformer provides build/consumer <<<pom.xml>>>
transformers.
- In order to keep formatting, comments and every detail when transforming a
build <<<pom.xml>>> to a consumer <<<pom.xml>>>, transformation happens
directly on the stream of SAX events.
+ In order to keep formatting, comments and every detail when transforming a
build <<<pom.xml>>> to a consumer <<<pom.xml>>>, transformation happens
directly on the stream of SAX events.
There are 3 states of a <<<pom.xml>>> content:
-
+
[[1]] the <<build>> <<<pom.xml>>>, as it is stored on disk during development
and in source control, which can be simplified to ease source code maintenance,
-
+
[[2]] the <<raw>> content (usually not saved to a file), which is enriched
from initial build content, to match Maven Model validation rules,
-
+
[[3]] the <<consumer>> <<<pom.xml>>>, as it is saved to local repository or
remote repository, to be used as dependencies descriptor when consumed by a
project.
[]
@@ -64,7 +64,7 @@ Maven Model XML Transformer
[]
For Maven 4, every state of Maven Model remains with the same
<<<maven-4.0.0.xsd>>> schema, but it the future Maven 5+:
-
+
* build model should evolve to add new features configuration in new <v5>
model fields, or remove some old unused fields,
* consumer model should at least continue to produce a
<<<maven-4.0.0.xsd>>>-compliant <<<pom.xml>>> for compatibility with the vast
and diverse dependency consumers ecosystem,
