You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2020/03/28 22:06:33 UTC

[maven] branch MNG-5567 updated (bd32fe4 -> 6969b2a)

This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a change to branch MNG-5567
in repository https://gitbox.apache.org/repos/asf/maven.git.


 discard bd32fe4  [MNG-5567] Zip files are not included in classpaths at all
     add cdb2cd0  [MNG-6071] Normalize relative paths for working directory
     add 720e46d  Revert "[MNG-5587] When the build fails emit any errors without the user having to specify -e or -X"
     add 45076f3  Improve license handling
     add 35658fd  Run Integration Tests with Java 8, 11, 13 and 14
     add 716cc1f  [MNG-5669] same pom.xml is read multiple times
     add b0d2846  [MNG-6859] Build not reproducible when built from source release
     add d9bf929  [MNG-6562] added WARNING on default bindings plugins unlocked versions
     add 9ae008a  use https://repository.a.o/ for Apache SNAPSHOT plugins
     add f2e9afd  Refactor getLocalRepository() in tests by using the repositorySystem
     add d204f02  [MNG-6874] - Upgrade Maven Parent to 34
     add 9e92a93  [MNG-6872] - Found CVEs in your dependencies - plexus-utils (tests)
     add 5cdb833  [MNG-5669] Fix infinitive loop in case pom.xml is being updated during the process (e.g. maven-shade-plugin writing reduced-pom with excluded dependencies)
     add c548ce5  Adjust JDKs in Jenkinsfile
     new 6969b2a  [MNG-5567] Zip files are not included in classpaths at all

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (bd32fe4)
            \
             N -- N -- N   refs/heads/MNG-5567 (6969b2a)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

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:
 Jenkinsfile                                        |   6 +-
 apache-maven/pom.xml                               |   8 +-
 .../main/appended-resources/META-INF/LICENSE.vm    |  19 +-
 .../licenses/{ASL-2.0.txt => Apache-2.0.txt}       |   0
 apache-maven/src/main/assembly/component.xml       |   1 +
 .../java/org/apache/maven/building/FileSource.java |  31 +++
 .../org/apache/maven/building/StringSource.java    |  33 ++-
 .../java/org/apache/maven/building/UrlSource.java  |  32 ++-
 maven-core/pom.xml                                 |  37 +---
 .../plugin/DefaultLifecycleBindingsInjector.java   |  36 +++-
 .../apache/maven/project/ReactorModelCache.java    |  78 ++++++-
 .../project/AbstractMavenProjectTestCase.java      |   7 +-
 .../project/DefaultMavenProjectBuilderTest.java    |   6 +-
 .../test/projects/project-builder/MNG-6723/pom.xml |  38 ++++
 .../resources-project-builder/micromailer/pom.xml  |   2 +-
 .../main/java/org/apache/maven/cli/MavenCli.java   |   1 +
 .../java/org/apache/maven/cli/ResolveFile.java     |   3 +-
 .../maven/model/building/ArtifactModelSource.java  |  27 ++-
 .../maven/model/building/DefaultModelBuilder.java  | 223 ++++++++++++++++-----
 .../maven/model/building/FileModelSource.java      |   9 +-
 .../apache/maven/model/building/ModelCache.java    |  29 +++
 .../apache/maven/model/building/ModelCacheTag.java |  26 +++
 .../model/superpom/DefaultSuperPomProvider.java    |   2 +-
 .../internal/DefaultArtifactDescriptorReader.java  |   7 +-
 .../repository/internal/DefaultModelResolver.java  |   7 +-
 pom.xml                                            |   2 +-
 26 files changed, 517 insertions(+), 153 deletions(-)
 rename apache-maven/src/main/appended-resources/licenses/{ASL-2.0.txt => Apache-2.0.txt} (100%)
 copy maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java => maven-model-builder/src/main/java/org/apache/maven/model/building/ArtifactModelSource.java (69%)


[maven] 01/01: [MNG-5567] Zip files are not included in classpaths at all

Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch MNG-5567
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 6969b2a518ac100650b1b734f229478cc856bb54
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon May 16 21:18:04 2016 +0200

    [MNG-5567] Zip files are not included in classpaths at all
    
    By definition of the classpath [1], JAR and Zip files are valid
    compressed files. Zips are likely to contain resources shared
    around. This totally relieves of unpacking stuff and readding
    to the classpath and support what the JVM provided by defeault.
    Sharing resources will just work.
    
    [1] http://docs.oracle.com/javase/8/docs/technotes/tools/windows/classpath.html#A1100592
---
 .../main/resources/META-INF/plexus/artifact-handlers.xml    | 13 +++++++++++++
 maven-core/src/site/apt/artifact-handlers.apt               |  2 ++
 2 files changed, 15 insertions(+)

diff --git a/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml b/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
index 2f26ce2..92ddaec 100644
--- a/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
@@ -190,5 +190,18 @@ Artifact handlers are required by the dependency resolution mechanism.
       </configuration>
     </component>
 
+    <!--
+     | ZIP
+     |-->
+    <component>
+      <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+      <role-hint>zip</role-hint>
+      <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
+      <configuration>
+        <type>zip</type>
+        <addedToClasspath>true</addedToClasspath>
+      </configuration>
+    </component>
+
   </components>
 </component-set>
diff --git a/maven-core/src/site/apt/artifact-handlers.apt b/maven-core/src/site/apt/artifact-handlers.apt
index 299d7d8..9475ef7 100644
--- a/maven-core/src/site/apt/artifact-handlers.apt
+++ b/maven-core/src/site/apt/artifact-handlers.apt
@@ -57,3 +57,5 @@ Default Artifact Handlers Reference
 *--------------------+---------------+------------+------------+-----------+---------------------+-----------------------+
 | <<<javadoc>>>      | <<<javadoc>>> | <<<jar>>>  | <= type>   | java      | <<<true>>>          |                       |
 *--------------------+---------------+------------+------------+-----------+---------------------+-----------------------+
+| <<<zip>>>          | <= type>   | <= type>   |               | none      | <<<true>>>          |                       |
+*--------------------+------------+------------+---------------+-----------+---------------------+-----------------------+