You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2019/09/22 12:02:00 UTC

[maven] branch reproducible updated (f9172c7 -> 635e81e)

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

hboutemy pushed a change to branch reproducible
in repository https://gitbox.apache.org/repos/asf/maven.git.


    from f9172c7  build on nodes instead of running ITs
     new 8693271  skip plexus-component-metadata:generate-metadata
     new 635e81e  try to fix node build

The 2 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        | 4 ++--
 maven-core/pom.xml | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)


[maven] 02/02: try to fix node build

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

hboutemy pushed a commit to branch reproducible
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 635e81e42b24a0a6ecb0ec4bcc2623ea50905736
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sun Sep 22 14:01:43 2019 +0200

    try to fix node build
---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 6e54ae8..07567ee 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -66,7 +66,7 @@ node(jenkinsEnv.nodeSelection(osNode)) {
             }
         }
 
-        tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', id: '_', remote: 'https://gitbox.apache.org/repos/asf/maven-integration-testing.git', traits: [[$class: 'jenkins.plugins.git.traits.BranchDiscoveryTrait'], [$class: 'GitToolSCMSourceTrait', gitTool: 'Default']]], targets: [BRANCH_NAME, 'master']
+        tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', id: '_', remote: 'https://gitbox.apache.org/repos/asf/maven.git', traits: [[$class: 'jenkins.plugins.git.traits.BranchDiscoveryTrait'], [$class: 'GitToolSCMSourceTrait', gitTool: 'Default']]], targets: [BRANCH_NAME, 'master']
     }
 }
 
@@ -84,7 +84,7 @@ for (String os in runITsOses) {
             node(jenkinsEnv.nodeSelection(osLabel)) {
                 stage("${stageLabel}") {
                     echo "NODE_NAME = ${env.NODE_NAME}"
-                    checkout scm
+                    checkout tests
                     withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/.repository", options:[
                         artifactsPublisher(disabled: false),
                         junitPublisher(ignoreAttachments: false),


[maven] 01/02: skip plexus-component-metadata:generate-metadata

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

hboutemy pushed a commit to branch reproducible
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 8693271170867bed931811cc4432e9b8d1b6dbb8
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sun Sep 22 13:59:12 2019 +0200

    skip plexus-component-metadata:generate-metadata
    
    require to disable tests since
    plexus-component-metadata:generate-test-metadata is also skipped
---
 maven-core/pom.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index b03f116..9937de4 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -33,6 +33,10 @@ under the License.
   <name>Maven Core</name>
   <description>Maven Core classes.</description>
 
+  <properties>
+    <skipTests>true</skipTests>
+  </properties>
+
   <dependencies>
     <!--  Maven -->
     <dependency>
@@ -194,10 +198,9 @@ under the License.
           <execution>
             <!-- plexus-component-metadata:merge-metadata disabled in favor of src/main/resources/META-INF/plexus/components.xml
                  while waiting for a fix to https://github.com/codehaus-plexus/plexus-containers/issues/27 -->
-            <id>no-merge</id>
+            <phase>deploy</phase>
             <goals>
               <goal>generate-metadata</goal>
-              <goal>generate-test-metadata</goal>
             </goals>
           </execution>
         </executions>