[maven] branch revert-MNG-5639 created (now d411c3f)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch revert-MNG-5639 in repository https://gitbox.apache.org/repos/asf/maven.git. at d411c3f Revert MNG-5639 This branch includes the following new commits: new d411c3f Revert MNG-5639 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[maven] 01/01: Revert MNG-5639
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch revert-MNG-5639
in repository https://gitbox.apache.org/repos/asf/maven.git
commit d411c3fa98832e7d86d901fe86ff63ba907cf868
Author: Michael Osipov
AuthorDate: Wed Dec 2 23:24:06 2020 +0100
Revert MNG-5639
---
.../apache/maven/project/ProjectModelResolver.java | 7 +-
.../project/DefaultMavenProjectBuilderTest.java| 10 ---
...pom-resolves-from-property-based-repository.xml | 31
.../maven/model/building/DefaultModelBuilder.java | 89 ++
.../repository/internal/DefaultModelResolver.java | 4 -
5 files changed, 43 insertions(+), 98 deletions(-)
diff --git
a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
index 8a1c1f8..ae44924 100644
---
a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
+++
b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
@@ -93,9 +93,8 @@ public class ProjectModelResolver
this.resolver = resolver;
this.remoteRepositoryManager = remoteRepositoryManager;
this.pomRepositories = new ArrayList<>();
-this.externalRepositories = Collections.unmodifiableList( new
ArrayList<>( repositories ) );
-this.repositories = new ArrayList<>();
-this.repositories.addAll( externalRepositories );
+this.externalRepositories = repositories;
+this.repositories = repositories;
this.repositoryMerging = repositoryMerging;
this.repositoryIds = new HashSet<>();
this.modelPool = modelPool;
@@ -274,7 +273,7 @@ public class ProjectModelResolver
}
dependency.setVersion(
versionRangeResult.getHighestVersion().toString() );
-
+
if ( modelPool != null )
{
Model model =
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 b2e314f..1bb66ab 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
@@ -238,16 +238,6 @@ public class DefaultMavenProjectBuilderTest
}
}
-public void testImportScopePomResolvesFromPropertyBasedRepository()
-throws Exception
-{
-File pomFile = getTestFile(
"src/test/resources/projects/import-scope-pom-resolves-from-property-based-repository.xml"
);
-ProjectBuildingRequest request = newBuildingRequest();
-request.setProcessPlugins( false );
-request.setResolveDependencies( true );
-projectBuilder.build( pomFile, request );
-}
-
/**
* Tests whether local version range parent references are build correctly.
*
diff --git
a/maven-core/src/test/resources/projects/import-scope-pom-resolves-from-property-based-repository.xml
b/maven-core/src/test/resources/projects/import-scope-pom-resolves-from-property-based-repository.xml
deleted file mode 100644
index 4c29a3b..000
---
a/maven-core/src/test/resources/projects/import-scope-pom-resolves-from-property-based-repository.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
- 4.0.0
-
- test
- imported-pom-found
- 0.0.1-SNAPSHOT
-
-
- file:src/test/remote-repo
-
-
-
-
- central
- ${repo.url}
-
-
-
-
-
-
- org.apache.maven.its
- a
- 0.1
- pom
- import
-
-
-
-
-
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 51c68fb..7cf5937 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
@@ -117,7 +117,7 @@ public class DefaultModelBuilder
@Inject
private ModelUrlNormalizer modelUrlNormalizer;
-
+
@Inject
private SuperPomProvider superPomProvider;
@@ -151,7 +151,7 @@ public class DefaultModelBuilder
@Inject
private ReportingConverter reportingConverter;
-
+
private ModelMerger modelMerger = new FileToRawModelMerger();
public DefaultModelBuilder setModelProcessor( ModelProcessor
modelProcessor )
@@ -255,7 +255,7 @@ public class DefaultModelBuilder
this.reportingConverter = reportingConverter;
return this;
}
-
+
@SuppressWarnings( "checkstyle:methodlength" )
@Override
public ModelBuildingResult build( ModelBuildingRequest request )
@@ -419,9 +419,6 @@ public class DefaultModelBuilder
// url
[maven-resolver] branch master updated: [MRESOLVER-150] Drop Travis CI
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-resolver.git The following commit(s) were added to refs/heads/master by this push: new 27a47b5 [MRESOLVER-150] Drop Travis CI 27a47b5 is described below commit 27a47b57f703ae7fbf4b79b5e52fc6f94a0ad4a2 Author: Tamas Cservenak AuthorDate: Wed Dec 2 22:07:31 2020 +0100 [MRESOLVER-150] Drop Travis CI --- .travis.yml | 26 -- 1 file changed, 26 deletions(-) diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 24ea442..000 --- a/.travis.yml +++ /dev/null @@ -1,26 +0,0 @@ -language: java -dist: trusty - -matrix: - include: -- os: linux - jdk: openjdk8 -- os: linux - jdk: openjdk11 -- os: linux - jdk: openjdk14 - -before_install: -# https://github.com/travis-ci/travis-ci/issues/8408 - - unset _JAVA_OPTIONS - -before_script: true -install: true - -script: - - mvn -V -Prun-its clean verify - -cache: - directories: - - "$HOME/.cache" - - "$HOME/.m2"
[maven-resolver] branch master updated: [MRESOLVER-149] Use GitHub Actions to verify PRs
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-resolver.git
The following commit(s) were added to refs/heads/master by this push:
new 06d6545 [MRESOLVER-149] Use GitHub Actions to verify PRs
06d6545 is described below
commit 06d654567690af5516298148fc9d3298a451e72c
Author: Tamas Cservenak
AuthorDate: Mon Nov 30 23:51:54 2020 +0100
[MRESOLVER-149] Use GitHub Actions to verify PRs
Blatantly borrowed from apache/maven, trimmed to down
to the level Maven Resolver needs.
This closes #81
---
.github/workflows/maven.yml | 49 +
1 file changed, 49 insertions(+)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
new file mode 100644
index 000..6d265d4
--- /dev/null
+++ b/.github/workflows/maven.yml
@@ -0,0 +1,49 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+name: Java CI
+
+on: [push, pull_request]
+
+jobs:
+ build:
+strategy:
+ matrix:
+os: [ubuntu-latest, windows-latest, macOS-latest]
+ fail-fast: false
+
+runs-on: ${{ matrix.os }}
+
+steps:
+ - name: Checkout
+uses: actions/checkout@v2
+
+ - name: Set up cache for ~./m2/repository
+uses: actions/cache@v1
+with:
+ path: ~/.m2/repository
+ key: maven-${{ matrix.os }}-${{ hashFiles('**/pom.xml') }}
+ restore-keys: |
+maven-${{ matrix.os }}-
+
+ - name: Set up JDK
+uses: actions/setup-java@v1
+with:
+ java-version: 8
+
+ - name: Build with Maven
+run: mvn clean verify -e -B -V
[maven] branch master updated: [MNG-5728] Switch the default checksum policy from "warn" to "fail"
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 95ee890 [MNG-5728] Switch the default checksum policy from "warn" to
"fail"
95ee890 is described below
commit 95ee8908370744153531aa2e80a9bce93dc5d9bc
Author: Nicolas Juneau
AuthorDate: Fri Nov 27 16:03:11 2020 +0100
[MNG-5728] Switch the default checksum policy from "warn" to "fail"
Signed-off-by: rfscholte
Signed-off-by: Michael Osipov
---
.../repository/ArtifactRepositoryPolicy.java | 4 +++-
.../AbstractArtifactComponentTestCase.java | 25 ++
.../repository/legacy/DefaultWagonManagerTest.java | 5 +
.../apache/maven/bridge/MavenRepositorySystem.java | 22 +--
maven-model/src/main/mdo/maven.mdo | 7 +++---
.../internal/ArtifactDescriptorUtils.java | 18 +++-
6 files changed, 64 insertions(+), 17 deletions(-)
diff --git
a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java
b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java
index 5ce317f..6ad2a26 100644
---
a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java
+++
b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java
@@ -43,6 +43,8 @@ public class ArtifactRepositoryPolicy
public static final String CHECKSUM_POLICY_IGNORE = "ignore";
+public static final String DEFAULT_CHECKSUM_POLICY = CHECKSUM_POLICY_FAIL;
+
private boolean enabled;
private String updatePolicy;
@@ -71,7 +73,7 @@ public class ArtifactRepositoryPolicy
if ( checksumPolicy == null )
{
-checksumPolicy = CHECKSUM_POLICY_WARN;
+checksumPolicy = DEFAULT_CHECKSUM_POLICY;
}
this.checksumPolicy = checksumPolicy;
}
diff --git
a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
index dbd6e8f..ab59ae6 100644
---
a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
+++
b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
@@ -60,6 +60,7 @@ import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.Writer;
import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
import java.util.ArrayList;
import java.util.List;
@@ -298,6 +299,17 @@ public abstract class AbstractArtifactComponentTestCase
{
writer.write( artifact.getId() );
}
+
+MessageDigest md = MessageDigest.getInstance( "MD5" );
+md.update( artifact.getId().getBytes() );
+byte[] digest = md.digest();
+
+String md5path = repository.pathOf( artifact ) + ".md5";
+File md5artifactFile = new File( repository.getBasedir(), md5path );
+try ( Writer writer = new OutputStreamWriter( new FileOutputStream(
md5artifactFile ), StandardCharsets.ISO_8859_1) )
+{
+writer.append( printHexBinary( digest ) );
+}
}
protected Artifact createArtifact( String artifactId, String version )
@@ -371,4 +383,17 @@ public abstract class AbstractArtifactComponentTestCase
return session;
}
+private static final char[] hexCode = "0123456789ABCDEF".toCharArray();
+
+private static final String printHexBinary( byte[] data )
+{
+StringBuilder r = new StringBuilder( data.length * 2 );
+for ( byte b : data )
+{
+r.append( hexCode[( b >> 4 ) & 0xF] );
+r.append( hexCode[( b & 0xF )] );
+}
+return r.toString();
+}
+
}
diff --git
a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
index 1b3cb79..3424ac1 100644
---
a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
+++
b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
@@ -101,7 +101,10 @@ public class DefaultWagonManagerTest
StringWagon wagon = (StringWagon) wagonManager.getWagon( "string" );
wagon.addExpectedContent( repos.get( 0 ).getLayout().pathOf( artifact
), "expected" );
+wagon.addExpectedContent( repos.get( 0 ).getLayout().pathOf( artifact
) + ".md5", "cd26d9e10ce691cc69aa2b90dcebbdac" );
wagon.addExpectedContent( repos.get( 1 ).getLayout().pathOf( artifact
), "expected" );
+wagon.addExpectedContent( repos.get( 1 ).getLayout().pathOf( artifact
) +
[maven] branch master updated: Revert "[MNG-5728] Switch the default checksum policy from "warn" to "fail""
This is an automated email from the ASF dual-hosted git repository.
rfscholte 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 251ba22 Revert "[MNG-5728] Switch the default checksum policy from
"warn" to "fail""
251ba22 is described below
commit 251ba225c67c9fbf80d4c5e09deba7f2105f9015
Author: Robert Scholte
AuthorDate: Wed Dec 2 20:27:26 2020 +0100
Revert "[MNG-5728] Switch the default checksum policy from "warn" to "fail""
---
.../repository/ArtifactRepositoryPolicy.java | 4 +---
.../AbstractArtifactComponentTestCase.java | 25 --
.../repository/legacy/DefaultWagonManagerTest.java | 5 -
.../apache/maven/bridge/MavenRepositorySystem.java | 22 +--
maven-model/src/main/mdo/maven.mdo | 7 +++---
.../internal/ArtifactDescriptorUtils.java | 18 +---
6 files changed, 17 insertions(+), 64 deletions(-)
diff --git
a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java
b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java
index 6ad2a26..5ce317f 100644
---
a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java
+++
b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java
@@ -43,8 +43,6 @@ public class ArtifactRepositoryPolicy
public static final String CHECKSUM_POLICY_IGNORE = "ignore";
-public static final String DEFAULT_CHECKSUM_POLICY = CHECKSUM_POLICY_FAIL;
-
private boolean enabled;
private String updatePolicy;
@@ -73,7 +71,7 @@ public class ArtifactRepositoryPolicy
if ( checksumPolicy == null )
{
-checksumPolicy = DEFAULT_CHECKSUM_POLICY;
+checksumPolicy = CHECKSUM_POLICY_WARN;
}
this.checksumPolicy = checksumPolicy;
}
diff --git
a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
index ab59ae6..dbd6e8f 100644
---
a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
+++
b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
@@ -60,7 +60,6 @@ import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.Writer;
import java.nio.charset.StandardCharsets;
-import java.security.MessageDigest;
import java.util.ArrayList;
import java.util.List;
@@ -299,17 +298,6 @@ public abstract class AbstractArtifactComponentTestCase
{
writer.write( artifact.getId() );
}
-
-MessageDigest md = MessageDigest.getInstance( "MD5" );
-md.update( artifact.getId().getBytes() );
-byte[] digest = md.digest();
-
-String md5path = repository.pathOf( artifact ) + ".md5";
-File md5artifactFile = new File( repository.getBasedir(), md5path );
-try ( Writer writer = new OutputStreamWriter( new FileOutputStream(
md5artifactFile ), StandardCharsets.ISO_8859_1) )
-{
-writer.append( printHexBinary( digest ) );
-}
}
protected Artifact createArtifact( String artifactId, String version )
@@ -383,17 +371,4 @@ public abstract class AbstractArtifactComponentTestCase
return session;
}
-private static final char[] hexCode = "0123456789ABCDEF".toCharArray();
-
-private static final String printHexBinary( byte[] data )
-{
-StringBuilder r = new StringBuilder( data.length * 2 );
-for ( byte b : data )
-{
-r.append( hexCode[( b >> 4 ) & 0xF] );
-r.append( hexCode[( b & 0xF )] );
-}
-return r.toString();
-}
-
}
diff --git
a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
index 3424ac1..1b3cb79 100644
---
a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
+++
b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
@@ -101,10 +101,7 @@ public class DefaultWagonManagerTest
StringWagon wagon = (StringWagon) wagonManager.getWagon( "string" );
wagon.addExpectedContent( repos.get( 0 ).getLayout().pathOf( artifact
), "expected" );
-wagon.addExpectedContent( repos.get( 0 ).getLayout().pathOf( artifact
) + ".md5", "cd26d9e10ce691cc69aa2b90dcebbdac" );
wagon.addExpectedContent( repos.get( 1 ).getLayout().pathOf( artifact
), "expected" );
-wagon.addExpectedContent( repos.get( 1 ).getLayout().pathOf( artifact
) + ".md5", "cd26d9e10ce691cc69aa2b90dcebbdac" );
-
[maven] 01/01: Revert "[MNG-5728] Switch the default checksum policy from "warn" to "fail""
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch revert-405-MNG-5728
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 1f41320ab3f658c71028cbc397489a7c188fe8d2
Author: Robert Scholte
AuthorDate: Wed Dec 2 20:27:26 2020 +0100
Revert "[MNG-5728] Switch the default checksum policy from "warn" to "fail""
---
.../repository/ArtifactRepositoryPolicy.java | 4 +---
.../AbstractArtifactComponentTestCase.java | 25 --
.../repository/legacy/DefaultWagonManagerTest.java | 5 -
.../apache/maven/bridge/MavenRepositorySystem.java | 22 +--
maven-model/src/main/mdo/maven.mdo | 7 +++---
.../internal/ArtifactDescriptorUtils.java | 18 +---
6 files changed, 17 insertions(+), 64 deletions(-)
diff --git
a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java
b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java
index 6ad2a26..5ce317f 100644
---
a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java
+++
b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java
@@ -43,8 +43,6 @@ public class ArtifactRepositoryPolicy
public static final String CHECKSUM_POLICY_IGNORE = "ignore";
-public static final String DEFAULT_CHECKSUM_POLICY = CHECKSUM_POLICY_FAIL;
-
private boolean enabled;
private String updatePolicy;
@@ -73,7 +71,7 @@ public class ArtifactRepositoryPolicy
if ( checksumPolicy == null )
{
-checksumPolicy = DEFAULT_CHECKSUM_POLICY;
+checksumPolicy = CHECKSUM_POLICY_WARN;
}
this.checksumPolicy = checksumPolicy;
}
diff --git
a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
index ab59ae6..dbd6e8f 100644
---
a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
+++
b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
@@ -60,7 +60,6 @@ import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.Writer;
import java.nio.charset.StandardCharsets;
-import java.security.MessageDigest;
import java.util.ArrayList;
import java.util.List;
@@ -299,17 +298,6 @@ public abstract class AbstractArtifactComponentTestCase
{
writer.write( artifact.getId() );
}
-
-MessageDigest md = MessageDigest.getInstance( "MD5" );
-md.update( artifact.getId().getBytes() );
-byte[] digest = md.digest();
-
-String md5path = repository.pathOf( artifact ) + ".md5";
-File md5artifactFile = new File( repository.getBasedir(), md5path );
-try ( Writer writer = new OutputStreamWriter( new FileOutputStream(
md5artifactFile ), StandardCharsets.ISO_8859_1) )
-{
-writer.append( printHexBinary( digest ) );
-}
}
protected Artifact createArtifact( String artifactId, String version )
@@ -383,17 +371,4 @@ public abstract class AbstractArtifactComponentTestCase
return session;
}
-private static final char[] hexCode = "0123456789ABCDEF".toCharArray();
-
-private static final String printHexBinary( byte[] data )
-{
-StringBuilder r = new StringBuilder( data.length * 2 );
-for ( byte b : data )
-{
-r.append( hexCode[( b >> 4 ) & 0xF] );
-r.append( hexCode[( b & 0xF )] );
-}
-return r.toString();
-}
-
}
diff --git
a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
index 3424ac1..1b3cb79 100644
---
a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
+++
b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
@@ -101,10 +101,7 @@ public class DefaultWagonManagerTest
StringWagon wagon = (StringWagon) wagonManager.getWagon( "string" );
wagon.addExpectedContent( repos.get( 0 ).getLayout().pathOf( artifact
), "expected" );
-wagon.addExpectedContent( repos.get( 0 ).getLayout().pathOf( artifact
) + ".md5", "cd26d9e10ce691cc69aa2b90dcebbdac" );
wagon.addExpectedContent( repos.get( 1 ).getLayout().pathOf( artifact
), "expected" );
-wagon.addExpectedContent( repos.get( 1 ).getLayout().pathOf( artifact
) + ".md5", "cd26d9e10ce691cc69aa2b90dcebbdac" );
-
class TransferListener
extends AbstractTransferListener
@@ -173,7 +170,6 @@ public class DefaultWagonManagerTest
StringWagon wagon = (StringWagon)
[maven] branch revert-405-MNG-5728 created (now 1f41320)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch revert-405-MNG-5728 in repository https://gitbox.apache.org/repos/asf/maven.git. at 1f41320 Revert "[MNG-5728] Switch the default checksum policy from "warn" to "fail"" This branch includes the following new commits: new 1f41320 Revert "[MNG-5728] Switch the default checksum policy from "warn" to "fail"" The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[maven] 01/03: Merge branch 'MNG-5728' of https://gitbox.apache.org/repos/asf/maven
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven.git commit 06c32178993e7e6ecee487831873a5e568b4643a Merge: b24c34b d8ad76b Author: rfscholte AuthorDate: Wed Dec 2 19:57:23 2020 +0100 Merge branch 'MNG-5728' of https://gitbox.apache.org/repos/asf/maven .../repository/ArtifactRepositoryPolicy.java | 4 +++- .../AbstractArtifactComponentTestCase.java | 28 ++ .../repository/legacy/DefaultWagonManagerTest.java | 5 .../apache/maven/bridge/MavenRepositorySystem.java | 22 - maven-model/src/main/mdo/maven.mdo | 7 +++--- .../internal/ArtifactDescriptorUtils.java | 18 +- 6 files changed, 67 insertions(+), 17 deletions(-)
[maven] 02/03: Merge branch 'master' of https://gitbox.apache.org/repos/asf/maven
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven.git commit 26f1e817449a97af5cea35183494df45c05a03fd Merge: 06c3217 b6cf710 Author: rfscholte AuthorDate: Wed Dec 2 19:58:23 2020 +0100 Merge branch 'master' of https://gitbox.apache.org/repos/asf/maven pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[maven] 03/03: remove unused imports
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven.git commit 2bdc0c5424dd4210c9654366c171db2d5ebea3a1 Author: rfscholte AuthorDate: Wed Dec 2 20:01:55 2020 +0100 remove unused imports --- .../org/apache/maven/artifact/AbstractArtifactComponentTestCase.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java index 20054b5..ab59ae6 100644 --- a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java +++ b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java @@ -39,7 +39,6 @@ import org.eclipse.aether.collection.DependencySelector; import org.eclipse.aether.collection.DependencyTraverser; import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory; import org.eclipse.aether.repository.LocalRepository; -import org.eclipse.aether.spi.connector.layout.RepositoryLayout; import org.eclipse.aether.util.graph.manager.ClassicDependencyManager; import org.eclipse.aether.util.graph.selector.AndDependencySelector; import org.eclipse.aether.util.graph.selector.ExclusionDependencySelector; @@ -65,8 +64,6 @@ import java.security.MessageDigest; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.DatatypeConverter; - /** * @author mailto:ja...@maven.org;>Jason van Zyl */
[maven] branch master updated (b6cf710 -> 2bdc0c5)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven.git. from b6cf710 [MNG-7042] Upgrade Maven Wagon to 3.4.2 add d8ad76b [MNG-5728] Switch the default checksum policy from "warn" to "fail" new 06c3217 Merge branch 'MNG-5728' of https://gitbox.apache.org/repos/asf/maven new 26f1e81 Merge branch 'master' of https://gitbox.apache.org/repos/asf/maven new 2bdc0c5 remove unused imports The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../repository/ArtifactRepositoryPolicy.java | 4 +++- .../AbstractArtifactComponentTestCase.java | 25 ++ .../repository/legacy/DefaultWagonManagerTest.java | 5 + .../apache/maven/bridge/MavenRepositorySystem.java | 22 +-- maven-model/src/main/mdo/maven.mdo | 7 +++--- .../internal/ArtifactDescriptorUtils.java | 18 +++- 6 files changed, 64 insertions(+), 17 deletions(-)
svn commit: r1884033 [2/4] - in /maven/website/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ do
Modified: maven/website/content/docs/2.2.0/release-notes.html == --- maven/website/content/docs/2.2.0/release-notes.html (original) +++ maven/website/content/docs/2.2.0/release-notes.html Wed Dec 2 13:58:06 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -44,7 +44,7 @@ John Casey" /> https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 2.2.0 https://github.com/apache/maven-site/tree/master/content/apt/docs/2.2.0/release-notes.apt.vm;> -| Last Published: 2020-11-29 +| Last Published: 2020-12-02 | Get Sources Download Modified: maven/website/content/docs/2.2.1/release-notes.html == --- maven/website/content/docs/2.2.1/release-notes.html (original) +++ maven/website/content/docs/2.2.1/release-notes.html Wed Dec 2 13:58:06 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 2.2.1 https://github.com/apache/maven-site/tree/master/content/apt/docs/2.2.1/release-notes.apt.vm;> -| Last Published: 2020-11-29 +| Last Published: 2020-12-02 | Get Sources Download Modified: maven/website/content/docs/3.0-alpha-3/release-notes.html == --- maven/website/content/docs/3.0-alpha-3/release-notes.html (original) +++ maven/website/content/docs/3.0-alpha-3/release-notes.html Wed Dec 2 13:58:06 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-alpha-3 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-alpha-3/release-notes.apt.vm;> -| Last Published: 2020-11-29 +| Last Published: 2020-12-02 | Get Sources Download Modified: maven/website/content/docs/3.0-alpha-4/release-notes.html == --- maven/website/content/docs/3.0-alpha-4/release-notes.html (original) +++ maven/website/content/docs/3.0-alpha-4/release-notes.html Wed Dec 2 13:58:06 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-alpha-4 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-alpha-4/release-notes.apt.vm;> -| Last Published: 2020-11-29 +| Last Published: 2020-12-02 | Get Sources Download Modified: maven/website/content/docs/3.0-alpha-5/release-notes.html == --- maven/website/content/docs/3.0-alpha-5/release-notes.html (original) +++ maven/website/content/docs/3.0-alpha-5/release-notes.html Wed Dec 2 13:58:06 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-alpha-5 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-alpha-5/release-notes.apt.vm;> -| Last Published: 2020-11-29 +| Last Published: 2020-12-02 | Get Sources Download Modified: maven/website/content/docs/3.0-alpha-6/release-notes.html == --- maven/website/content/docs/3.0-alpha-6/release-notes.html (original) +++ maven/website/content/docs/3.0-alpha-6/release-notes.html Wed Dec 2 13:58:06 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-alpha-6 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-alpha-6/release-notes.apt.vm;> -| Last Published: 2020-11-29 +| Last Published: 2020-12-02 | Get Sources Download Modified: maven/website/content/docs/3.0-alpha-7/release-notes.html == --- maven/website/content/docs/3.0-alpha-7/release-notes.html (original) +++ maven/website/content/docs/3.0-alpha-7/release-notes.html Wed Dec 2 13:58:06 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-alpha-7 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-alpha-7/release-notes.apt.vm;> -|
svn commit: r1884033 [3/4] - in /maven/website/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ do
Modified: maven/website/content/guides/getting-started/maven-in-five-minutes.html == --- maven/website/content/guides/getting-started/maven-in-five-minutes.html (original) +++ maven/website/content/guides/getting-started/maven-in-five-minutes.html Wed Dec 2 13:58:06 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Maven in 5 Minutes https://github.com/apache/maven-site/tree/master/content/apt/guides/getting-started/maven-in-five-minutes.apt;> -| Last Published: 2020-11-29 +| Last Published: 2020-12-02 | Get Sources Download Modified: maven/website/content/guides/getting-started/windows-prerequisites.html == --- maven/website/content/guides/getting-started/windows-prerequisites.html (original) +++ maven/website/content/guides/getting-started/windows-prerequisites.html Wed Dec 2 13:58:06 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Maven on Windows https://github.com/apache/maven-site/tree/master/content/apt/guides/getting-started/windows-prerequisites.apt;> -| Last Published: 2020-11-29 +| Last Published: 2020-12-02 | Get Sources Download Modified: maven/website/content/guides/index.html == --- maven/website/content/guides/index.html (original) +++ maven/website/content/guides/index.html Wed Dec 2 13:58:06 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -42,7 +42,7 @@ Eric Redmond" /> https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Maven Documentation https://github.com/apache/maven-site/tree/master/content/apt/guides/index.apt.vm;> -| Last Published: 2020-11-29 +| Last Published: 2020-12-02 | Get Sources Download Modified: maven/website/content/guides/introduction/introduction-to-archetypes.html == --- maven/website/content/guides/introduction/introduction-to-archetypes.html (original) +++ maven/website/content/guides/introduction/introduction-to-archetypes.html Wed Dec 2 13:58:06 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Introduction to Archetypes https://github.com/apache/maven-site/tree/master/content/apt/guides/introduction/introduction-to-archetypes.apt;> -| Last Published: 2020-11-29 +| Last Published: 2020-12-02 | Get Sources Download Modified: maven/website/content/guides/introduction/introduction-to-dependency-mechanism.html == --- maven/website/content/guides/introduction/introduction-to-dependency-mechanism.html (original) +++ maven/website/content/guides/introduction/introduction-to-dependency-mechanism.html Wed Dec 2 13:58:06 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -44,7 +44,7 @@ Karl Heinz Marbaise" /> https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Introduction to the Dependency Mechanism https://github.com/apache/maven-site/tree/master/content/apt/guides/introduction/introduction-to-dependency-mechanism.apt;> -| Last Published: 2020-11-29 +| Last Published: 2020-12-02 | Get Sources Download Modified: maven/website/content/guides/introduction/introduction-to-optional-and-excludes-dependencies.html == --- maven/website/content/guides/introduction/introduction-to-optional-and-excludes-dependencies.html (original) +++ maven/website/content/guides/introduction/introduction-to-optional-and-excludes-dependencies.html Wed Dec 2 13:58:06 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Optional Dependencies and Dependency Exclusions https://github.com/apache/maven-site/tree/master/content/apt/guides/introduction/introduction-to-optional-and-excludes-dependencies.apt;> -| Last Published: 2020-11-29 +| Last Published: 2020-12-02 | Get Sources Download Modified: maven/website/content/guides/introduction/introduction-to-plugin-prefix-mapping.html == ---
svn commit: r1884033 [1/4] - in /maven/website/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ do
Author: svn-site-role Date: Wed Dec 2 13:58:06 2020 New Revision: 1884033 Log: Site checkin for project Apache Maven Site Modified: maven/website/content/about.html maven/website/content/aether.html maven/website/content/apache-resource-bundles/index.html maven/website/content/archives/maven-2.x/index.html maven/website/content/archives/maven-2.x/maven-2.1-architectural-goals.html maven/website/content/articles.html maven/website/content/background/history-of-maven.html maven/website/content/background/philosophy-of-maven.html maven/website/content/ci-management.html maven/website/content/code-quality-management.html maven/website/content/community.html maven/website/content/configure.html maven/website/content/developers/committer-environment.html maven/website/content/developers/committer-settings.html maven/website/content/developers/compatibility-plan.html maven/website/content/developers/conventions/code.html maven/website/content/developers/conventions/git.html maven/website/content/developers/conventions/jira.html maven/website/content/developers/dependency-policies.html maven/website/content/developers/index.html maven/website/content/developers/mojo-api-specification.html maven/website/content/developers/release/index.html maven/website/content/developers/release/maven-core-release.html maven/website/content/developers/release/maven-project-release-procedure.html maven/website/content/developers/release/parent-pom-release.html maven/website/content/developers/release/pmc-gpg-keys.html maven/website/content/developers/retirement-plan-plugins.html maven/website/content/developers/website/component-reference-documentation-helper.html maven/website/content/developers/website/deploy-component-reference-documentation.html maven/website/content/developers/website/deploy-maven-website.html maven/website/content/developers/website/index.html maven/website/content/developers/website/website-overview.html maven/website/content/developers/welcome-to-new-committers.html maven/website/content/docs/2.0.1/release-notes.html maven/website/content/docs/2.0.10/release-notes.html maven/website/content/docs/2.0.11/release-notes.html maven/website/content/docs/2.0.2/release-notes.html maven/website/content/docs/2.0.3/release-notes.html maven/website/content/docs/2.0.4/release-notes.html maven/website/content/docs/2.0.5/release-notes.html maven/website/content/docs/2.0.6/release-notes.html maven/website/content/docs/2.0.7/release-notes.html maven/website/content/docs/2.0.8/release-notes.html maven/website/content/docs/2.0.9/release-notes.html maven/website/content/docs/2.0/release-notes.html maven/website/content/docs/2.1.0/release-notes.html maven/website/content/docs/2.2.0/release-notes.html maven/website/content/docs/2.2.1/release-notes.html maven/website/content/docs/3.0-alpha-3/release-notes.html maven/website/content/docs/3.0-alpha-4/release-notes.html maven/website/content/docs/3.0-alpha-5/release-notes.html maven/website/content/docs/3.0-alpha-6/release-notes.html maven/website/content/docs/3.0-alpha-7/release-notes.html maven/website/content/docs/3.0-beta-1/release-notes.html maven/website/content/docs/3.0-beta-2/release-notes.html maven/website/content/docs/3.0-beta-3/release-notes.html maven/website/content/docs/3.0.1/release-notes.html maven/website/content/docs/3.0.2/release-notes.html maven/website/content/docs/3.0.3/release-notes.html maven/website/content/docs/3.0.4/release-notes.html maven/website/content/docs/3.0.5/release-notes.html maven/website/content/docs/3.0/release-notes.html maven/website/content/docs/3.1.0-alpha-1/release-notes.html maven/website/content/docs/3.1.0/release-notes.html maven/website/content/docs/3.1.1/release-notes.html maven/website/content/docs/3.2.1/release-notes.html maven/website/content/docs/3.2.2/release-notes.html maven/website/content/docs/3.2.3/release-notes.html maven/website/content/docs/3.2.5/release-notes.html maven/website/content/docs/3.3.1/release-notes.html maven/website/content/docs/3.3.3/release-notes.html maven/website/content/docs/3.3.9/release-notes.html maven/website/content/docs/3.5.0-alpha-1/release-notes.html maven/website/content/docs/3.5.0-beta-1/release-notes.html maven/website/content/docs/3.5.0/release-notes.html maven/website/content/docs/3.5.2/release-notes.html maven/website/content/docs/3.5.3/release-notes.html maven/website/content/docs/3.5.4/release-notes.html maven/website/content/docs/3.6.0/release-notes.html maven/website/content/docs/3.6.1/release-notes.html maven/website/content/docs/3.6.2/release-notes.html maven/website/content/docs/3.6.3/release-notes.html maven/website/content/docs/history.html
svn commit: r1884033 [4/4] - in /maven/website/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ do
Modified: maven/website/content/ide.html == --- maven/website/content/ide.html (original) +++ maven/website/content/ide.html Wed Dec 2 13:58:06 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -39,7 +39,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Apache Maven IDE Integration https://github.com/apache/maven-site/tree/master/content/markdown/ide.md;> -| Last Published: 2020-11-29 +| Last Published: 2020-12-02 | Get Sources Download Modified: maven/website/content/index.html == --- maven/website/content/index.html (original) +++ maven/website/content/index.html Wed Dec 2 13:58:06 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -42,7 +42,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Welcome to Apache Maven https://github.com/apache/maven-site/tree/master/content/xdoc/index.xml.vm;> -| Last Published: 2020-11-29 +| Last Published: 2020-12-02 | Get Sources Download Modified: maven/website/content/install.html == --- maven/website/content/install.html (original) +++ maven/website/content/install.html Wed Dec 2 13:58:06 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -39,7 +39,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Installing Apache Maven https://github.com/apache/maven-site/tree/master/content/markdown/install.md.vm;> -| Last Published: 2020-11-29 +| Last Published: 2020-12-02 | Get Sources Download Modified: maven/website/content/issue-management.html == --- maven/website/content/issue-management.html (original) +++ maven/website/content/issue-management.html Wed Dec 2 13:58:06 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -39,7 +39,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Overview https://github.com/apache/maven-site/tree/master/content/markdown/issue-management.md;> -| Last Published: 2020-11-29 +| Last Published: 2020-12-02 | Get Sources Download Modified: maven/website/content/mailing-lists.html == --- maven/website/content/mailing-lists.html (original) +++ maven/website/content/mailing-lists.html Wed Dec 2 13:58:06 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -39,7 +39,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Project Mailing Lists -| Last Published: 2020-11-29 +| Last Published: 2020-12-02 | Get Sources Download Modified: maven/website/content/maven-1.x-eol.html == --- maven/website/content/maven-1.x-eol.html (original) +++ maven/website/content/maven-1.x-eol.html Wed Dec 2 13:58:06 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -39,7 +39,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ End Of Life Apache Maven 1.x https://github.com/apache/maven-site/tree/master/content/markdown/maven-1.x-eol.md;> -| Last Published: 2020-11-29 +| Last Published: 2020-12-02 | Get Sources Download Modified: maven/website/content/maven-2.x-eol.html == --- maven/website/content/maven-2.x-eol.html (original) +++ maven/website/content/maven-2.x-eol.html Wed Dec 2 13:58:06 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -39,7 +39,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ End Of Life Apache Maven 2.x https://github.com/apache/maven-site/tree/master/content/markdown/maven-2.x-eol.md;> -| Last Published: 2020-11-29 +| Last Published: 2020-12-02 | Get Sources Download Modified: maven/website/content/maven-ci-friendly.html == --- maven/website/content/maven-ci-friendly.html (original) +++ maven/website/content/maven-ci-friendly.html Wed Dec 2 13:58:06 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -39,7 +39,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Maven CI Friendly Versions https://github.com/apache/maven-site/tree/master/content/markdown/maven-ci-friendly.md;>
[maven-site] 01/01: Merge pull request #216 from apache/elharo-patch-2
This is an automated email from the ASF dual-hosted git repository. elharo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-site.git commit 773504ed510744cb86a5f0cd55807b756d87e852 Merge: 2612c38 827b055 Author: Elliotte Rusty Harold AuthorDate: Wed Dec 2 13:55:42 2020 + Merge pull request #216 from apache/elharo-patch-2 docs: grammar content/markdown/community.md | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-)
[maven-site] branch master updated (2612c38 -> 773504e)
This is an automated email from the ASF dual-hosted git repository. elharo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-site.git. from 2612c38 [MNG-6928] Add action cards add 827b055 docs: grammar new 773504e Merge pull request #216 from apache/elharo-patch-2 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: content/markdown/community.md | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-)
[maven-jar-plugin] branch MJAR-276 deleted (was 4027e40)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to branch MJAR-276 in repository https://gitbox.apache.org/repos/asf/maven-jar-plugin.git. was 4027e40 [MJAR-276] don't log useless warning when jar creation is forced and directory does not exist The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[maven-jar-plugin] branch master updated (4bf3895 -> 4027e40)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-jar-plugin.git. from 4bf3895 Update plexus archiver (to solve JDK-8177809) add 4027e40 [MJAR-276] don't log useless warning when jar creation is forced and directory does not exist No new revisions were added by this update. Summary of changes: src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java | 5 - 1 file changed, 4 insertions(+), 1 deletion(-)
[maven-jar-plugin] branch rmannibucau/MJAR-276_avoid-useless-warning-when-jar-creation-is-forced-even-empty deleted (was 4027e40)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to branch rmannibucau/MJAR-276_avoid-useless-warning-when-jar-creation-is-forced-even-empty in repository https://gitbox.apache.org/repos/asf/maven-jar-plugin.git. was 4027e40 [MJAR-276] don't log useless warning when jar creation is forced and directory does not exist The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[maven-jar-plugin] branch MJAR-276 created (now 4027e40)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to branch MJAR-276 in repository https://gitbox.apache.org/repos/asf/maven-jar-plugin.git. at 4027e40 [MJAR-276] don't log useless warning when jar creation is forced and directory does not exist No new revisions were added by this update.
[maven-jar-plugin] branch rmannibucau/MJAR-276_avoid-useless-warning-when-jar-creation-is-forced-even-empty created (now 4027e40)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to branch rmannibucau/MJAR-276_avoid-useless-warning-when-jar-creation-is-forced-even-empty in repository https://gitbox.apache.org/repos/asf/maven-jar-plugin.git. at 4027e40 [MJAR-276] don't log useless warning when jar creation is forced and directory does not exist This branch includes the following new commits: new 4027e40 [MJAR-276] don't log useless warning when jar creation is forced and directory does not exist The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[maven-jar-plugin] 01/01: [MJAR-276] don't log useless warning when jar creation is forced and directory does not exist
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch
rmannibucau/MJAR-276_avoid-useless-warning-when-jar-creation-is-forced-even-empty
in repository https://gitbox.apache.org/repos/asf/maven-jar-plugin.git
commit 4027e40376031d8be01abddeb21de16e98ea0c58
Author: Romain Manni-Bucau
AuthorDate: Wed Dec 2 09:48:50 2020 +0100
[MJAR-276] don't log useless warning when jar creation is forced and
directory does not exist
---
src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java
b/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java
index 68da0ec..d7b298f 100644
--- a/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java
+++ b/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java
@@ -266,7 +266,10 @@ public abstract class AbstractJarMojo
File contentDirectory = getClassesDirectory();
if ( !contentDirectory.exists() )
{
-getLog().warn( "JAR will be empty - no content was marked for
inclusion!" );
+if ( !forceCreation )
+{
+getLog().warn( "JAR will be empty - no content was marked
for inclusion!" );
+}
}
else
{
