maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From micha...@apache.org
Subject svn commit: r1743866 - in /maven/plugins/trunk/maven-assembly-plugin: pom.xml src/main/mdo/assembly-component.mdo src/main/mdo/assembly.mdo src/main/mdo/component.mdo src/main/mdo/descriptor.mdo src/site/apt/index.apt.vm
Date Sat, 14 May 2016 22:48:07 GMT
Author: michaelo
Date: Sat May 14 22:48:06 2016
New Revision: 1743866

URL: http://svn.apache.org/viewvc?rev=1743866&view=rev
Log:
[MASSEMBLY-745] Give the component format schema file a better name

Added:
    maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/assembly-component.mdo
      - copied, changed from r1743865, maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo
    maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/assembly.mdo
      - copied unchanged from r1743865, maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo
Removed:
    maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo
    maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo
Modified:
    maven/plugins/trunk/maven-assembly-plugin/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/site/apt/index.apt.vm

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1743866&r1=1743865&r2=1743866&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Sat May 14 22:48:06 2016
@@ -265,8 +265,8 @@ under the License.
         <configuration>
           <version>${mdoVersion}</version>
           <models>
-            <model>src/main/mdo/descriptor.mdo</model>
-            <model>src/main/mdo/component.mdo</model>
+            <model>src/main/mdo/assembly.mdo</model>
+            <model>src/main/mdo/assembly-component.mdo</model>
           </models>
         </configuration>
         <executions>

Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/assembly-component.mdo (from
r1743865, maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/assembly-component.mdo?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/assembly-component.mdo&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo&r1=1743865&r2=1743866&rev=1743866&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/assembly-component.mdo Sat May
14 22:48:06 2016
@@ -24,9 +24,9 @@
 <model xmlns="http://codehaus-plexus.github.io/MODELLO/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/1.8.0 http://codehaus-plexus.github.io/modello/xsd/modello-1.8.0.xsd"
        xml.namespace="http://maven.apache.org/ASSEMBLY-COMPONENT/${version}"
-       xml.schemaLocation="http://maven.apache.org/xsd/component-${version}.xsd">
+       xml.schemaLocation="http://maven.apache.org/xsd/assembly-component-${version}.xsd">
 
-  <id>component</id>
+  <id>assembly-component</id>
   <name>Component</name>
   <description>
     <![CDATA[

Modified: maven/plugins/trunk/maven-assembly-plugin/src/site/apt/index.apt.vm
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/index.apt.vm?rev=1743866&r1=1743865&r2=1743866&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/site/apt/index.apt.vm (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/site/apt/index.apt.vm Sat May 14 22:48:06
2016
@@ -122,7 +122,7 @@ ${project.name}
 * Assembly and Component Descriptor Schemas (XSD)
 
   * {{{http://maven.apache.org/xsd/assembly-2.0.0.xsd}http://maven.apache.org/xsd/assembly-2.0.0.xsd}},
-    {{{http://maven.apache.org/xsd/component-2.0.0.xsd}http://maven.apache.org/xsd/component-2.0.0.xsd}}
(for version 3.0 and higher)
+    {{{http://maven.apache.org/xsd/assembly-component-2.0.0.xsd}http://maven.apache.org/xsd/assembly-component-2.0.0.xsd}}
(for version 3.0 and higher)
 
   * {{{http://maven.apache.org/xsd/assembly-1.1.3.xsd}http://maven.apache.org/xsd/assembly-1.1.3.xsd}},
     {{{http://maven.apache.org/xsd/component-1.1.3.xsd}http://maven.apache.org/xsd/component-1.1.3.xsd}}
(for version 2.5.4 and higher)



Mime
View raw message