This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-maven-launchpad-plugin.git
commit 870559ac042804d041171593a7460bca1aeaf14c Author: Robert Munteanu <[email protected]> AuthorDate: Thu Jun 19 12:05:49 2014 +0000 SLING-3681 - Enable the maven-launchpad-plugin to generate the XSD for bundles list XML document Applied patch from Simone Tripodi, thanks! git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1603848 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 5 +++-- src/main/mdo/bundle-list.xml | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 2444327..8159897 100644 --- a/pom.xml +++ b/pom.xml @@ -41,11 +41,12 @@ <plugin> <groupId>org.codehaus.modello</groupId> <artifactId>modello-maven-plugin</artifactId> - <version>1.1</version> + <version>1.8.1</version> <executions> <execution> <id>bundle-manifest.xml</id> <goals> + <goal>xsd</goal> <goal>java</goal> <goal>xpp3-reader</goal> <goal>xpp3-writer</goal> @@ -145,7 +146,7 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> - <version>1.5.15</version> + <version>3.0.17</version> </dependency> <dependency> <groupId>commons-io</groupId> diff --git a/src/main/mdo/bundle-list.xml b/src/main/mdo/bundle-list.xml index 0bb9d5c..c82f9fc 100644 --- a/src/main/mdo/bundle-list.xml +++ b/src/main/mdo/bundle-list.xml @@ -18,7 +18,8 @@ under the License. --> <model xmlns="http://modello.codehaus.org/MODELLO/1.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.0.0 http://modello.codehaus.org/xsd/modello-1.0.0.xsd";> + xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.0.0 http://modello.codehaus.org/xsd/modello-1.0.0.xsd"; + xsd.namespace="http://sling.apache.org/maven/1.0.0";> <id>bundle-list</id> <name>BundleList</name> <description> @@ -31,7 +32,7 @@ </default> </defaults> <classes> - <class rootElement="true" xml.tagName="bundles"> + <class rootElement="true" xml.tagName="bundles" xsd.compositor="sequence"> <name>BundleList</name> <description>List of bundles.</description> <version>1.0.0</version> @@ -47,7 +48,7 @@ </field> </fields> </class> - <class xml.tagName="startLevel"> + <class xml.tagName="startLevel" xsd.compositor="sequence"> <name>StartLevel</name> <version>1.0.0</version> <superClass>org.apache.sling.maven.projectsupport.bundlelist.BaseStartLevel</superClass> -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
