You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-commits@maven.apache.org by sv...@apache.org on 2019/04/12 19:46:10 UTC
svn commit: r1857430 - in /maven/website/content: guides/introduction/introduction-to-the-pom.html maven-site-1.0-site.jar pom.html

Author: svn-site-role
Date: Fri Apr 12 19:46:10 2019
New Revision: 1857430

Log:
Site checkin for project Apache Maven Site

Modified:
    maven/website/content/guides/introduction/introduction-to-the-pom.html
    maven/website/content/maven-site-1.0-site.jar
    maven/website/content/pom.html

Modified: maven/website/content/guides/introduction/introduction-to-the-pom.html
==============================================================================
--- maven/website/content/guides/introduction/introduction-to-the-pom.html (original)
+++ maven/website/content/guides/introduction/introduction-to-the-pom.html Fri Apr 12 19:46:10 2019
@@ -172,17 +172,16 @@ Brett Porter" />
 <p><a href="./introduction-to-the-pom.html">[top]</a></p></div>
 <div class="section">
 <h3><a name="Super_POM">Super POM</a></h3>
-<p>The Super POM is Maven's default POM. All POMs extend the Super POM unless explicitly set, meaning the configuration specified in the Super POM is inherited by the POMs you created for your projects. The snippet below is the Super POM for Maven 2.0.x.</p>
+<p>The Super POM is Maven's default POM. All POMs extend the Super POM unless explicitly set, meaning the configuration specified in the Super POM is inherited by the POMs you created for your projects. The snippet below is the Super POM for Maven 3.5.4.</p>
 <div class="source"><pre class="prettyprint linenums">&lt;project&gt;
   &lt;modelVersion&gt;4.0.0&lt;/modelVersion&gt;
-  &lt;name&gt;Maven Default Project&lt;/name&gt;
 
   &lt;repositories&gt;
     &lt;repository&gt;
       &lt;id&gt;central&lt;/id&gt;
-      &lt;name&gt;Maven Repository Switchboard&lt;/name&gt;
+      &lt;name&gt;Central Repository&lt;/name&gt;
+      &lt;url&gt;https://repo.maven.apache.org/maven2&lt;/url&gt;
       &lt;layout&gt;default&lt;/layout&gt;
-      &lt;url&gt;http://repo1.maven.org/maven2&lt;/url&gt;
       &lt;snapshots&gt;
         &lt;enabled&gt;false&lt;/enabled&gt;
       &lt;/snapshots&gt;
@@ -192,120 +191,8 @@ Brett Porter" />
   &lt;pluginRepositories&gt;
     &lt;pluginRepository&gt;
       &lt;id&gt;central&lt;/id&gt;
-      &lt;name&gt;Maven Plugin Repository&lt;/name&gt;
-      &lt;url&gt;http://repo1.maven.org/maven2&lt;/url&gt;
-      &lt;layout&gt;default&lt;/layout&gt;
-      &lt;snapshots&gt;
-        &lt;enabled&gt;false&lt;/enabled&gt;
-      &lt;/snapshots&gt;
-      &lt;releases&gt;
-        &lt;updatePolicy&gt;never&lt;/updatePolicy&gt;
-      &lt;/releases&gt;
-    &lt;/pluginRepository&gt;
-  &lt;/pluginRepositories&gt;
-
-  &lt;build&gt;
-    &lt;directory&gt;target&lt;/directory&gt;
-    &lt;outputDirectory&gt;target/classes&lt;/outputDirectory&gt;
-    &lt;finalName&gt;${artifactId}-${version}&lt;/finalName&gt;
-    &lt;testOutputDirectory&gt;target/test-classes&lt;/testOutputDirectory&gt;
-    &lt;sourceDirectory&gt;src/main/java&lt;/sourceDirectory&gt;
-    &lt;scriptSourceDirectory&gt;src/main/scripts&lt;/scriptSourceDirectory&gt;
-    &lt;testSourceDirectory&gt;src/test/java&lt;/testSourceDirectory&gt;
-    &lt;resources&gt;
-      &lt;resource&gt;
-        &lt;directory&gt;src/main/resources&lt;/directory&gt;
-      &lt;/resource&gt;
-    &lt;/resources&gt;
-    &lt;testResources&gt;
-      &lt;testResource&gt;
-        &lt;directory&gt;src/test/resources&lt;/directory&gt;
-      &lt;/testResource&gt;
-    &lt;/testResources&gt;
-  &lt;/build&gt;
-
-  &lt;reporting&gt;
-    &lt;outputDirectory&gt;target/site&lt;/outputDirectory&gt;
-  &lt;/reporting&gt;
-
-  &lt;profiles&gt;
-    &lt;profile&gt;
-      &lt;id&gt;release-profile&lt;/id&gt;
-
-      &lt;activation&gt;
-        &lt;property&gt;
-          &lt;name&gt;performRelease&lt;/name&gt;
-        &lt;/property&gt;
-      &lt;/activation&gt;
-
-      &lt;build&gt;
-        &lt;plugins&gt;
-          &lt;plugin&gt;
-            &lt;inherited&gt;true&lt;/inherited&gt;
-            &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
-            &lt;artifactId&gt;maven-source-plugin&lt;/artifactId&gt;
-
-            &lt;executions&gt;
-              &lt;execution&gt;
-                &lt;id&gt;attach-sources&lt;/id&gt;
-                &lt;goals&gt;
-                  &lt;goal&gt;jar&lt;/goal&gt;
-                &lt;/goals&gt;
-              &lt;/execution&gt;
-            &lt;/executions&gt;
-          &lt;/plugin&gt;
-          &lt;plugin&gt;
-            &lt;inherited&gt;true&lt;/inherited&gt;
-            &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
-            &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
-
-            &lt;executions&gt;
-              &lt;execution&gt;
-                &lt;id&gt;attach-javadocs&lt;/id&gt;
-                &lt;goals&gt;
-                  &lt;goal&gt;jar&lt;/goal&gt;
-                &lt;/goals&gt;
-              &lt;/execution&gt;
-            &lt;/executions&gt;
-          &lt;/plugin&gt;
-          &lt;plugin&gt;
-            &lt;inherited&gt;true&lt;/inherited&gt;
-            &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
-            &lt;artifactId&gt;maven-deploy-plugin&lt;/artifactId&gt;
-
-            &lt;configuration&gt;
-              &lt;updateReleaseInfo&gt;true&lt;/updateReleaseInfo&gt;
-            &lt;/configuration&gt;
-          &lt;/plugin&gt;
-        &lt;/plugins&gt;
-      &lt;/build&gt;
-    &lt;/profile&gt;
-  &lt;/profiles&gt;
-
-&lt;/project&gt;
-</pre></div>
-<p>The snippet below is the Super POM for Maven 2.1.x.</p>
-<div class="source"><pre class="prettyprint linenums">&lt;project&gt;
-  &lt;modelVersion&gt;4.0.0&lt;/modelVersion&gt;
-  &lt;name&gt;Maven Default Project&lt;/name&gt;
-
-  &lt;repositories&gt;
-    &lt;repository&gt;
-      &lt;id&gt;central&lt;/id&gt;
-      &lt;name&gt;Maven Repository Switchboard&lt;/name&gt;
-      &lt;layout&gt;default&lt;/layout&gt;
-      &lt;url&gt;http://repo1.maven.org/maven2&lt;/url&gt;
-      &lt;snapshots&gt;
-        &lt;enabled&gt;false&lt;/enabled&gt;
-      &lt;/snapshots&gt;
-    &lt;/repository&gt;
-  &lt;/repositories&gt;
-
-  &lt;pluginRepositories&gt;
-    &lt;pluginRepository&gt;
-      &lt;id&gt;central&lt;/id&gt;
-      &lt;name&gt;Maven Plugin Repository&lt;/name&gt;
-      &lt;url&gt;http://repo1.maven.org/maven2&lt;/url&gt;
+      &lt;name&gt;Central Repository&lt;/name&gt;
+      &lt;url&gt;https://repo.maven.apache.org/maven2&lt;/url&gt;
       &lt;layout&gt;default&lt;/layout&gt;
       &lt;snapshots&gt;
         &lt;enabled&gt;false&lt;/enabled&gt;
@@ -322,8 +209,7 @@ Brett Porter" />
     &lt;finalName&gt;${project.artifactId}-${project.version}&lt;/finalName&gt;
     &lt;testOutputDirectory&gt;${project.build.directory}/test-classes&lt;/testOutputDirectory&gt;
     &lt;sourceDirectory&gt;${project.basedir}/src/main/java&lt;/sourceDirectory&gt;
-    &lt;!-- TODO: MNG-3731 maven-plugin-tools-api &lt; 2.4.4 expect this to be relative... --&gt;
-    &lt;scriptSourceDirectory&gt;src/main/scripts&lt;/scriptSourceDirectory&gt;
+    &lt;scriptSourceDirectory&gt;${project.basedir}/src/main/scripts&lt;/scriptSourceDirectory&gt;
     &lt;testSourceDirectory&gt;${project.basedir}/src/test/java&lt;/testSourceDirectory&gt;
     &lt;resources&gt;
       &lt;resource&gt;
@@ -335,92 +221,36 @@ Brett Porter" />
         &lt;directory&gt;${project.basedir}/src/test/resources&lt;/directory&gt;
       &lt;/testResource&gt;
     &lt;/testResources&gt;
-   &lt;pluginManagement&gt;
-       &lt;plugins&gt;
-         &lt;plugin&gt;
-           &lt;artifactId&gt;maven-antrun-plugin&lt;/artifactId&gt;
-           &lt;version&gt;1.3&lt;/version&gt;
-         &lt;/plugin&gt;       
-         &lt;plugin&gt;
-           &lt;artifactId&gt;maven-assembly-plugin&lt;/artifactId&gt;
-           &lt;version&gt;2.2-beta-2&lt;/version&gt;
-         &lt;/plugin&gt;         
-         &lt;plugin&gt;
-           &lt;artifactId&gt;maven-clean-plugin&lt;/artifactId&gt;
-           &lt;version&gt;2.2&lt;/version&gt;
-         &lt;/plugin&gt;
-         &lt;plugin&gt;
-           &lt;artifactId&gt;maven-compiler-plugin&lt;/artifactId&gt;
-           &lt;version&gt;2.0.2&lt;/version&gt;
-         &lt;/plugin&gt;
-         &lt;plugin&gt;
-           &lt;artifactId&gt;maven-dependency-plugin&lt;/artifactId&gt;
-           &lt;version&gt;2.0&lt;/version&gt;
-         &lt;/plugin&gt;
-         &lt;plugin&gt;
-           &lt;artifactId&gt;maven-deploy-plugin&lt;/artifactId&gt;
-           &lt;version&gt;2.4&lt;/version&gt;
-         &lt;/plugin&gt;
-         &lt;plugin&gt;
-           &lt;artifactId&gt;maven-ear-plugin&lt;/artifactId&gt;
-           &lt;version&gt;2.3.1&lt;/version&gt;
-         &lt;/plugin&gt;
-         &lt;plugin&gt;
-           &lt;artifactId&gt;maven-ejb-plugin&lt;/artifactId&gt;
-           &lt;version&gt;2.1&lt;/version&gt;
-         &lt;/plugin&gt;
-         &lt;plugin&gt;
-           &lt;artifactId&gt;maven-install-plugin&lt;/artifactId&gt;
-           &lt;version&gt;2.2&lt;/version&gt;
-         &lt;/plugin&gt;
-         &lt;plugin&gt;
-           &lt;artifactId&gt;maven-jar-plugin&lt;/artifactId&gt;
-           &lt;version&gt;2.2&lt;/version&gt;
-         &lt;/plugin&gt;
-         &lt;plugin&gt;
-           &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
-           &lt;version&gt;2.5&lt;/version&gt;
-         &lt;/plugin&gt;
-         &lt;plugin&gt;
-           &lt;artifactId&gt;maven-plugin-plugin&lt;/artifactId&gt;
-           &lt;version&gt;2.4.3&lt;/version&gt;
-         &lt;/plugin&gt;
-         &lt;plugin&gt;
-           &lt;artifactId&gt;maven-rar-plugin&lt;/artifactId&gt;
-           &lt;version&gt;2.2&lt;/version&gt;
-         &lt;/plugin&gt;        
-         &lt;plugin&gt;                
-           &lt;artifactId&gt;maven-release-plugin&lt;/artifactId&gt;
-           &lt;version&gt;2.0-beta-8&lt;/version&gt;
-         &lt;/plugin&gt;
-         &lt;plugin&gt;                
-           &lt;artifactId&gt;maven-resources-plugin&lt;/artifactId&gt;
-           &lt;version&gt;2.3&lt;/version&gt;
-         &lt;/plugin&gt;
-         &lt;plugin&gt;
-           &lt;artifactId&gt;maven-site-plugin&lt;/artifactId&gt;
-           &lt;version&gt;2.0-beta-7&lt;/version&gt;
-         &lt;/plugin&gt;
-         &lt;plugin&gt;
-           &lt;artifactId&gt;maven-source-plugin&lt;/artifactId&gt;
-           &lt;version&gt;2.0.4&lt;/version&gt;
-         &lt;/plugin&gt;         
-         &lt;plugin&gt;
-            &lt;artifactId&gt;maven-surefire-plugin&lt;/artifactId&gt;
-            &lt;version&gt;2.4.3&lt;/version&gt;
-         &lt;/plugin&gt;
-         &lt;plugin&gt;
-           &lt;artifactId&gt;maven-war-plugin&lt;/artifactId&gt;
-           &lt;version&gt;2.1-alpha-2&lt;/version&gt;
-         &lt;/plugin&gt;
-       &lt;/plugins&gt;
-     &lt;/pluginManagement&gt;
+    &lt;pluginManagement&gt;
+      &lt;!-- NOTE: These plugins will be removed from future versions of the super POM --&gt;
+      &lt;!-- They are kept for the moment as they are very unlikely to conflict with lifecycle mappings (MNG-4453) --&gt;
+      &lt;plugins&gt;
+        &lt;plugin&gt;
+          &lt;artifactId&gt;maven-antrun-plugin&lt;/artifactId&gt;
+          &lt;version&gt;1.3&lt;/version&gt;
+        &lt;/plugin&gt;
+        &lt;plugin&gt;
+          &lt;artifactId&gt;maven-assembly-plugin&lt;/artifactId&gt;
+          &lt;version&gt;2.2-beta-5&lt;/version&gt;
+        &lt;/plugin&gt;
+        &lt;plugin&gt;
+          &lt;artifactId&gt;maven-dependency-plugin&lt;/artifactId&gt;
+          &lt;version&gt;2.8&lt;/version&gt;
+        &lt;/plugin&gt;
+        &lt;plugin&gt;
+          &lt;artifactId&gt;maven-release-plugin&lt;/artifactId&gt;
+          &lt;version&gt;2.5.3&lt;/version&gt;
+        &lt;/plugin&gt;
+      &lt;/plugins&gt;
+    &lt;/pluginManagement&gt;
   &lt;/build&gt;
 
   &lt;reporting&gt;
     &lt;outputDirectory&gt;${project.build.directory}/site&lt;/outputDirectory&gt;
   &lt;/reporting&gt;
+
   &lt;profiles&gt;
+    &lt;!-- NOTE: The release profile will be removed from future versions of the super POM --&gt;
     &lt;profile&gt;
       &lt;id&gt;release-profile&lt;/id&gt;
 
@@ -435,20 +265,18 @@ Brett Porter" />
         &lt;plugins&gt;
           &lt;plugin&gt;
             &lt;inherited&gt;true&lt;/inherited&gt;
-            &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
             &lt;artifactId&gt;maven-source-plugin&lt;/artifactId&gt;
             &lt;executions&gt;
               &lt;execution&gt;
                 &lt;id&gt;attach-sources&lt;/id&gt;
                 &lt;goals&gt;
-                  &lt;goal&gt;jar&lt;/goal&gt;
+                  &lt;goal&gt;jar-no-fork&lt;/goal&gt;
                 &lt;/goals&gt;
               &lt;/execution&gt;
             &lt;/executions&gt;
           &lt;/plugin&gt;
           &lt;plugin&gt;
             &lt;inherited&gt;true&lt;/inherited&gt;
-            &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
             &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
             &lt;executions&gt;
               &lt;execution&gt;
@@ -461,7 +289,6 @@ Brett Porter" />
           &lt;/plugin&gt;
           &lt;plugin&gt;
             &lt;inherited&gt;true&lt;/inherited&gt;
-            &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
             &lt;artifactId&gt;maven-deploy-plugin&lt;/artifactId&gt;
             &lt;configuration&gt;
               &lt;updateReleaseInfo&gt;true&lt;/updateReleaseInfo&gt;

Modified: maven/website/content/maven-site-1.0-site.jar
==============================================================================
Binary files - no diff available.

Modified: maven/website/content/pom.html
==============================================================================
--- maven/website/content/pom.html (original)
+++ maven/website/content/pom.html Fri Apr 12 19:46:10 2019
@@ -520,7 +520,7 @@ Display parameters as parsed by Maven (i
 <p>To see inheritance in action, just have a look at the <a class="externalLink" href="https://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?view=markup">ASF</a> or <a class="externalLink" href="https://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?view=markup">Maven</a> parent POM's. </p>
 <div class="section">
 <h5><a name="The_Super_POM">The Super POM</a></h5>
-<p>Similar to the inheritance of objects in object oriented programming, POMs that extend a parent POM inherit certain values from that parent. Moreover, just as Java objects ultimately inherit from <tt>java.lang.Object</tt>, all Project Object Models inherit from a base Super POM. The snippet below is the Super POM for Maven 3.0.4.</p>
+<p>Similar to the inheritance of objects in object oriented programming, POMs that extend a parent POM inherit certain values from that parent. Moreover, just as Java objects ultimately inherit from <tt>java.lang.Object</tt>, all Project Object Models inherit from a base Super POM. The snippet below is the Super POM for Maven 3.5.4.</p>
 <div class="source"><pre class="prettyprint linenums">&lt;project&gt;
   &lt;modelVersion&gt;4.0.0&lt;/modelVersion&gt;
 
@@ -528,7 +528,7 @@ Display parameters as parsed by Maven (i
     &lt;repository&gt;
       &lt;id&gt;central&lt;/id&gt;
       &lt;name&gt;Central Repository&lt;/name&gt;
-      &lt;url&gt;http://repo.maven.apache.org/maven2&lt;/url&gt;
+      &lt;url&gt;https://repo.maven.apache.org/maven2&lt;/url&gt;
       &lt;layout&gt;default&lt;/layout&gt;
       &lt;snapshots&gt;
         &lt;enabled&gt;false&lt;/enabled&gt;
@@ -540,7 +540,7 @@ Display parameters as parsed by Maven (i
     &lt;pluginRepository&gt;
       &lt;id&gt;central&lt;/id&gt;
       &lt;name&gt;Central Repository&lt;/name&gt;
-      &lt;url&gt;http://repo.maven.apache.org/maven2&lt;/url&gt;
+      &lt;url&gt;https://repo.maven.apache.org/maven2&lt;/url&gt;
       &lt;layout&gt;default&lt;/layout&gt;
       &lt;snapshots&gt;
         &lt;enabled&gt;false&lt;/enabled&gt;
@@ -557,7 +557,7 @@ Display parameters as parsed by Maven (i
     &lt;finalName&gt;${project.artifactId}-${project.version}&lt;/finalName&gt;
     &lt;testOutputDirectory&gt;${project.build.directory}/test-classes&lt;/testOutputDirectory&gt;
     &lt;sourceDirectory&gt;${project.basedir}/src/main/java&lt;/sourceDirectory&gt;
-    &lt;scriptSourceDirectory&gt;src/main/scripts&lt;/scriptSourceDirectory&gt;
+    &lt;scriptSourceDirectory&gt;${project.basedir}/src/main/scripts&lt;/scriptSourceDirectory&gt;
     &lt;testSourceDirectory&gt;${project.basedir}/src/test/java&lt;/testSourceDirectory&gt;
     &lt;resources&gt;
       &lt;resource&gt;
@@ -583,11 +583,11 @@ Display parameters as parsed by Maven (i
         &lt;/plugin&gt;
         &lt;plugin&gt;
           &lt;artifactId&gt;maven-dependency-plugin&lt;/artifactId&gt;
-          &lt;version&gt;2.1&lt;/version&gt;
+          &lt;version&gt;2.8&lt;/version&gt;
         &lt;/plugin&gt;
         &lt;plugin&gt;
           &lt;artifactId&gt;maven-release-plugin&lt;/artifactId&gt;
-          &lt;version&gt;2.0&lt;/version&gt;
+          &lt;version&gt;2.5.3&lt;/version&gt;
         &lt;/plugin&gt;
       &lt;/plugins&gt;
     &lt;/pluginManagement&gt;
@@ -618,7 +618,7 @@ Display parameters as parsed by Maven (i
               &lt;execution&gt;
                 &lt;id&gt;attach-sources&lt;/id&gt;
                 &lt;goals&gt;
-                  &lt;goal&gt;jar&lt;/goal&gt;
+                  &lt;goal&gt;jar-no-fork&lt;/goal&gt;
                 &lt;/goals&gt;
               &lt;/execution&gt;
             &lt;/executions&gt;