[pkg-java] r15630 - in trunk/maven-repo-helper: debian src/main/java/org/debian/maven/repo src/test/java/org/debian/maven/repo src/test/resources src/test/resources/plexus-components src/test/resources/plexus-components/plexus-cli src/test/resources/plexus-components/plexus-digest src/test/resources/plexus-components/plexus-i18n src/test/resources/plexus-components/plexus-interactivity src/test/resources/plexus-components/plexus-resources src/test/resources/plexus-components/plexus-velocity

Ludovic Claude ludovicc-guest at alioth.debian.org
Mon Jan 2 20:14:07 UTC 2012


Author: ludovicc-guest
Date: 2012-01-02 20:14:07 +0000 (Mon, 02 Jan 2012)
New Revision: 15630

Added:
   trunk/maven-repo-helper/src/test/resources/libplexus-components-java.poms
   trunk/maven-repo-helper/src/test/resources/plexus-components.transformed
   trunk/maven-repo-helper/src/test/resources/plexus-components/
   trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-cli/
   trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-cli/pom.xml
   trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-digest/
   trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-digest/pom.xml
   trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-i18n/
   trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-i18n/pom.xml
   trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-interactivity/
   trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-interactivity/pom.xml
   trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-resources/
   trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-resources/pom.xml
   trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-velocity/
   trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-velocity/pom.xml
   trunk/maven-repo-helper/src/test/resources/plexus-components/pom.xml
Modified:
   trunk/maven-repo-helper/debian/changelog
   trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/ListOfPOMs.java
   trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMTransformer.java
   trunk/maven-repo-helper/src/test/java/org/debian/maven/repo/POMTransformerTest.java
   trunk/maven-repo-helper/src/test/java/org/debian/maven/repo/TestBase.java
Log:
Fix ignore modules in a POM transformation

Modified: trunk/maven-repo-helper/debian/changelog
===================================================================
--- trunk/maven-repo-helper/debian/changelog	2012-01-02 18:02:29 UTC (rev 15629)
+++ trunk/maven-repo-helper/debian/changelog	2012-01-02 20:14:07 UTC (rev 15630)
@@ -2,8 +2,9 @@
 
   * Build with Java 5, use generics. (Closes: #644260)
   * Fix resolution of versions from dependency management
+  * Fix ignore modules in a POM transformation
 
- -- Ludovic Claude <ludovic.claude at laposte.net>  Sun, 13 Nov 2011 23:59:09 +0100
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Mon, 02 Jan 2012 20:27:26 +0100
 
 maven-repo-helper (1.7) unstable; urgency=low
 

Modified: trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/ListOfPOMs.java
===================================================================
--- trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/ListOfPOMs.java	2012-01-02 18:02:29 UTC (rev 15629)
+++ trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/ListOfPOMs.java	2012-01-02 20:14:07 UTC (rev 15630)
@@ -83,7 +83,7 @@
             POMOptions options = getPOMOptions(pomPath);
             if (options.isIgnore()) {
                 try {
-                    handler.ignorePOM(new File(pomPath));
+                    handler.ignorePOM(new File(baseDir, pomPath));
                 } catch (Exception e) {
                     log.log(Level.SEVERE, null, e);
                 }

Modified: trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMTransformer.java
===================================================================
--- trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMTransformer.java	2012-01-02 18:02:29 UTC (rev 15629)
+++ trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMTransformer.java	2012-01-02 20:14:07 UTC (rev 15630)
@@ -43,14 +43,11 @@
 public class POMTransformer extends POMReader {
 
     private static final Logger log = Logger.getLogger(POMTransformer.class.getName());
-    private static final List<String> WRITE_IGNORED_ELEMENTS = Arrays.asList(new String[]{
-                "modelVersion", "parent"});
-    private static final List<String> DEBIAN_BUILD_IGNORED_ELEMENTS = Arrays.asList(new String[]{
-                "distributionManagement", "repositories", "pluginRepositories"});
-    private static final List<String> DEBIAN_DOC_IGNORED_ELEMENTS = Arrays.asList(new String[]{
-                "reports", "reporting", "site"});
-    private static final List<String> INFO_ELEMENTS = Arrays.asList(new String[]{"groupId",
-                "artifactId", "packaging", "version"});
+    private static final List<String> WRITE_IGNORED_ELEMENTS = Arrays.asList("modelVersion", "parent");
+    private static final List<String> DEBIAN_BUILD_IGNORED_ELEMENTS = Arrays.asList("distributionManagement", "repositories", "pluginRepositories");
+    private static final List<String> DEBIAN_DOC_IGNORED_ELEMENTS = Arrays.asList("reports", "reporting", "site");
+    private static final List<String> INFO_ELEMENTS = Arrays.asList("groupId",
+            "artifactId", "packaging", "version");
     private static final Pattern compactDependencyNotationMatcher =
             Pattern.compile("(\\w[a-zA-Z0-9\\-_\\.]*):(\\w[a-zA-Z0-9\\-_]*):(\\d[a-zA-Z0-9\\-_\\.]*)");
     private DependencyRuleSet rules = new DependencyRuleSet("Rules", new File("debian/maven.rules"));
@@ -182,13 +179,13 @@
     }
 
     public void addIgnoreModule(File pomFile, String module) {
+        pomFile = pomFile.getAbsoluteFile();
         Set<String> modules = ignoredModules.get(pomFile);
         if (modules == null) {
             modules = new HashSet<String>();
             ignoredModules.put(pomFile, modules);
         }
         modules.add(module);
-        System.out.println("Ignore module " + module + " in POM " + pomFile);
     }
 
     public void discoverModulesToIgnore() {
@@ -463,7 +460,7 @@
                                     if ("extensions".equals(parentElement)) {
                                         sawVersion = false;
                                         int index = inc(dependencyIndexes, POMInfo.EXTENSIONS);
-                                        dependency = (Dependency) info.getExtensions().get(index);
+                                        dependency = info.getExtensions().get(index);
                                     }
                                 }
                                 // Skip dependency if we can't find it (== null)
@@ -480,8 +477,11 @@
                                 String parentParentElement = path.get(path.size() - 3);
                                 if ("modules".equals(parentElement) && "project".equals(parentParentElement)) {
                                     int index = inc(dependencyIndexes, POMInfo.MODULES);
-                                    String module = (String) info.getModules().get(index);
+                                    String module = info.getModules().get(index);
                                     if (!acceptModule(module, originalPom)) {
+                                        if (verbose) {
+                                          System.out.println("Ignore module " + module + " in transformed POM");
+                                        }
                                         inIgnoredElement++;
                                         inLevel--;
                                         path.remove(path.size() - 1);
@@ -819,12 +819,12 @@
     private int inc(Map<String, Integer> dependencyIndexes, String selector) {
         Integer index = dependencyIndexes.get(selector);
         if (index == null) {
-            index = new Integer(0);
+            index = 0;
         } else {
-            index = new Integer(index.intValue() + 1);
+            index = index + 1;
         }
         dependencyIndexes.put(selector, index);
-        return index.intValue();
+        return index;
     }
 
     protected void createDebianProperties(POMInfo info, POMInfo original, String debianPackage, int inLevel) throws XMLStreamException {
@@ -886,7 +886,7 @@
     }
 
     private boolean acceptModule(String module, File pomFile) {
-        Set<String> modulesToSkip = ignoredModules.get(pomFile);
+        Set<String> modulesToSkip = ignoredModules.get(pomFile.getAbsoluteFile());
         return modulesToSkip == null || !modulesToSkip.contains(module);
     }
 
@@ -1029,14 +1029,14 @@
         ListOfPOMs listOfPOMs;
 
         if (singlePom) {
-            String pomPath = args[i++].trim();
+            String pomPath = args[i].trim();
             listOfPOMs = new ListOfPOMs();
             ListOfPOMs.POMOptions options = listOfPOMs.addPOM(pomPath);
             options.setNoParent(noParent);
         } else {
             File poms;
             if (i + 1 < args.length) {
-                poms = new File(args[i++].trim());
+                poms = new File(args[i].trim());
             } else {
                 poms = new File("debian/" + debianPackage + ".poms");
             }

Modified: trunk/maven-repo-helper/src/test/java/org/debian/maven/repo/POMTransformerTest.java
===================================================================
--- trunk/maven-repo-helper/src/test/java/org/debian/maven/repo/POMTransformerTest.java	2012-01-02 18:02:29 UTC (rev 15629)
+++ trunk/maven-repo-helper/src/test/java/org/debian/maven/repo/POMTransformerTest.java	2012-01-02 20:14:07 UTC (rev 15630)
@@ -225,6 +225,23 @@
         assertEquals("1.2", transformedPOM.getParent().getVersion());
     }
 
+    public void testTransformPlexusComponentsPomUsingListOfPoms() throws Exception {
+        usePom("libplexus-components-java.poms");
+
+        instance.setVerbose(true);
+        instance.setRepository(getRepository());
+        instance.addDefaultRules();
+        instance.usePluginVersionsFromRepository();
+
+        ListOfPOMs listOfPoms = new ListOfPOMs(getFileInClasspath("libplexus-components-java.poms"));
+        listOfPoms.setBaseDir(getFileInClasspath("plexus-components/pom.xml").getParentFile());
+        instance.setListOfPOMs(listOfPoms);
+        instance.transformPoms("libplexus-components-java", false, null);
+
+        assertXMLEqual(read("plexus-components.transformed"), read("plexus-components/pom.xml"));
+
+    }
+
     private Repository getRepository() {
         Repository repo = new Repository(getFileInClasspath("repository/root.dir").getParentFile());
         repo.scan();

Modified: trunk/maven-repo-helper/src/test/java/org/debian/maven/repo/TestBase.java
===================================================================
--- trunk/maven-repo-helper/src/test/java/org/debian/maven/repo/TestBase.java	2012-01-02 18:02:29 UTC (rev 15629)
+++ trunk/maven-repo-helper/src/test/java/org/debian/maven/repo/TestBase.java	2012-01-02 20:14:07 UTC (rev 15630)
@@ -31,6 +31,7 @@
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import org.apache.commons.io.IOUtils;
 import org.custommonkey.xmlunit.XMLTestCase;
 import org.custommonkey.xmlunit.XMLUnit;
@@ -56,7 +57,7 @@
         if (updatedPom.exists()) {
             updatedPom.delete();
         }
-        for (Iterator<Reader> i = openedReaders.iterator(); i.hasNext(); ) {
+        for (Iterator<Reader> i = openedReaders.iterator(); i.hasNext();) {
             Reader reader = i.next();
             try {
                 reader.close();
@@ -71,7 +72,7 @@
     protected void useFile(String resource, File file) throws IOException {
         final FileWriter out = new FileWriter(file);
         final Reader in = read(resource);
-        IOUtils.copy( in,out);
+        IOUtils.copy(in, out);
         in.close();
         out.close();
     }
@@ -81,15 +82,15 @@
     }
 
     protected File getFileInClasspath(String resource) {
-        if (! resource.startsWith("/")) {
+        if (!resource.startsWith("/")) {
             resource = "/" + resource;
         }
         URL url = this.getClass().getResource(resource);
         File f;
         try {
-          f = new File(url.toURI());
-        } catch(URISyntaxException e) {
-          f = new File(url.getPath());
+            f = new File(url.toURI());
+        } catch (URISyntaxException e) {
+            f = new File(url.getPath());
         }
         return f;
     }
@@ -107,18 +108,18 @@
     }
 
     protected void show(File f) {
-            try {
-        LineNumberReader lnr = new LineNumberReader(read(f));
-        do {
+        try {
+            LineNumberReader lnr = new LineNumberReader(read(f));
+            do {
                 String l = lnr.readLine();
                 if (l == null) {
                     break;
                 }
                 System.out.println(l);
-        } while (true);
-            } catch (IOException ex) {
-                ex.printStackTrace();
-            }
+            } while (true);
+        } catch (IOException ex) {
+            ex.printStackTrace();
+        }
     }
 
 }
\ No newline at end of file

Added: trunk/maven-repo-helper/src/test/resources/libplexus-components-java.poms
===================================================================
--- trunk/maven-repo-helper/src/test/resources/libplexus-components-java.poms	                        (rev 0)
+++ trunk/maven-repo-helper/src/test/resources/libplexus-components-java.poms	2012-01-02 20:14:07 UTC (rev 15630)
@@ -0,0 +1,38 @@
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+#   --ignore: ignore this POM and its artifact if any
+#   --ignore-pom: don't install the POM. To use on POM files that are created
+#     temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+#   --no-parent: remove the <parent> tag from the POM
+#   --package=<package>: an alternative package to use when installing this POM
+#      and its artifact
+#   --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+#      of the version for the package.
+#   --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+#      during a clean operation with mh_cleanpom or mh_installpom
+#   --artifact=<path>: path to the build artifact associated with this POM,
+#      it will be installed when using the command mh_install. [mh_install]
+#   --java-lib: install the jar into /usr/share/java to comply with Debian
+#      packaging guidelines
+#   --usj-name=<name>: name to use when installing the library in /usr/share/java
+#   --usj-version=<version>: version to use when installing the library in /usr/share/java
+#   --no-usj-versionless: don't install the versionless link in /usr/share/java
+#   --dest-jar=<path>: the destination for the real jar.
+#     It will be installed with mh_install. [mh_install]
+#   --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+#   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+#     Empty by default. [mh_install]
+#
+pom.xml --no-parent --has-package-version
+plexus-archiver/pom.xml --ignore
+plexus-cli/pom.xml --ignore
+plexus-compiler/pom.xml --ignore
+plexus-digest/pom.xml --ignore
+plexus-i18n/pom.xml --ignore
+plexus-interactivity/pom.xml --ignore
+plexus-interpolation/pom.xml --ignore
+plexus-io/pom.xml --ignore
+plexus-resources/pom.xml --ignore
+plexus-velocity/pom.xml --ignore

Added: trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-cli/pom.xml
===================================================================
--- trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-cli/pom.xml	                        (rev 0)
+++ trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-cli/pom.xml	2012-01-02 20:14:07 UTC (rev 15630)
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <artifactId>plexus-components</artifactId>
+    <groupId>org.codehaus.plexus</groupId>
+    <version>1.1.18</version>
+  </parent>
+
+  <groupId>org.codehaus.plexus</groupId>
+  <artifactId>plexus-cli</artifactId>
+  <version>1.6-SNAPSHOT</version>
+
+  <name>Plexus CLI</name>
+  <description>Easily create CLIs with Plexus components</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-container-default</artifactId>
+      <version>1.0-alpha-34</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
+      <version>1.0</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>commons-lang</artifactId>
+          <groupId>commons-lang</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>commons-logging</artifactId>
+          <groupId>commons-logging</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+</project>

Added: trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-digest/pom.xml
===================================================================
--- trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-digest/pom.xml	                        (rev 0)
+++ trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-digest/pom.xml	2012-01-02 20:14:07 UTC (rev 15630)
@@ -0,0 +1,30 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.codehaus.plexus</groupId>
+    <artifactId>plexus-components</artifactId>
+    <version>1.1.18</version>
+  </parent>
+
+  <artifactId>plexus-digest</artifactId>
+  <version>1.2-SNAPSHOT</version>
+
+  <name>Plexus Digest / Hashcode Components</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-container-default</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+  </dependencies>
+</project>

Added: trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-i18n/pom.xml
===================================================================
--- trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-i18n/pom.xml	                        (rev 0)
+++ trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-i18n/pom.xml	2012-01-02 20:14:07 UTC (rev 15630)
@@ -0,0 +1,25 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <artifactId>plexus-components</artifactId>
+    <groupId>org.codehaus.plexus</groupId>
+    <version>1.1.18</version>
+  </parent>
+
+  <artifactId>plexus-i18n</artifactId>
+  <version>1.0-beta-11-SNAPSHOT</version>
+
+  <name>Plexus I18N Component</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-container-default</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+    </dependency>
+  </dependencies>
+</project>

Added: trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-interactivity/pom.xml
===================================================================
--- trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-interactivity/pom.xml	                        (rev 0)
+++ trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-interactivity/pom.xml	2012-01-02 20:14:07 UTC (rev 15630)
@@ -0,0 +1,20 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <artifactId>plexus-components</artifactId>
+    <groupId>org.codehaus.plexus</groupId>
+    <version>1.1.18</version>
+  </parent>
+
+  <artifactId>plexus-interactivity</artifactId>
+  <version>1.0-alpha-7-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <name>Plexus Interactivity Handler Component</name>
+
+  <modules>
+    <module>plexus-interactivity-api</module>
+    <module>plexus-interactivity-jline</module>
+  </modules>
+</project>

Added: trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-resources/pom.xml
===================================================================
--- trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-resources/pom.xml	                        (rev 0)
+++ trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-resources/pom.xml	2012-01-02 20:14:07 UTC (rev 15630)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.codehaus.plexus</groupId>
+    <artifactId>plexus-components</artifactId>
+    <version>1.1.18</version>
+  </parent>
+
+  <artifactId>plexus-resources</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <name>Plexus Resource Component</name>
+  <description>A component to transparently retrieve resources from the filesystem, classpath or internet.</description>
+
+  <scm>
+    <connection>scm:svn:http://svn.codehaus.org/plexus/plexus-components/trunk/plexus-resources</connection>
+    <developerConnection>scm:svn:https://svn.codehaus.org/plexus/plexus-components/trunk/plexus-resources</developerConnection>
+    <url>http://fisheye.codehaus.org/browse/plexus/plexus-components/trunk/plexus-resources</url>
+  </scm>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-container-default</artifactId>
+    </dependency>
+  </dependencies>
+</project>

Added: trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-velocity/pom.xml
===================================================================
--- trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-velocity/pom.xml	                        (rev 0)
+++ trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-velocity/pom.xml	2012-01-02 20:14:07 UTC (rev 15630)
@@ -0,0 +1,52 @@
+<!--
+Copyright 2001-2006 Codehaus Foundation.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <artifactId>plexus-components</artifactId>
+    <groupId>org.codehaus.plexus</groupId>
+    <version>1.1.18</version>
+  </parent>
+
+  <artifactId>plexus-velocity</artifactId>
+  <version>1.1.9-SNAPSHOT</version>
+
+  <name>Plexus Velocity Component</name>
+  <scm>
+    <connection>scm:svn:http://svn.codehaus.org/plexus/plexus-components/trunk/plexus-velocity</connection>
+    <developerConnection>scm:svn:https://svn.codehaus.org/plexus/plexus-components/trunk/plexus-velocity</developerConnection>
+    <url>http://fisheye.codehaus.org/browse/plexus/plexus-components/trunk/plexus-velocity</url>
+  </scm>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-container-default</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>3.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.velocity</groupId>
+      <artifactId>velocity</artifactId>
+      <version>1.5</version>
+    </dependency>
+  </dependencies>
+</project>

Added: trunk/maven-repo-helper/src/test/resources/plexus-components/pom.xml
===================================================================
--- trunk/maven-repo-helper/src/test/resources/plexus-components/pom.xml	                        (rev 0)
+++ trunk/maven-repo-helper/src/test/resources/plexus-components/pom.xml	2012-01-02 20:14:07 UTC (rev 15630)
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.codehaus.plexus</groupId>
+    <artifactId>plexus</artifactId>
+    <version>3.0.1</version>
+    <relativePath>../pom/pom.xml</relativePath>
+  </parent>
+
+  <artifactId>plexus-components</artifactId>
+  <version>1.1.20-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <name>Plexus Components</name>
+  <url>http://plexus.codehaus.org/plexus-components</url>
+
+
+  <modules>
+    <module>plexus-cli</module>
+    <module>plexus-digest</module>
+    <module>plexus-i18n</module>
+    <module>plexus-interactivity</module>
+    <module>plexus-resources</module>
+    <!--
+    <module>plexus-swizzle</module>
+    -->
+    <module>plexus-velocity</module>
+  </modules>
+
+  <scm>
+    <connection>scm:git:git at github.com:sonatype/plexus-components.git</connection>
+    <developerConnection>scm:git:git at github.com:sonatype/plexus-components.git</developerConnection>
+    <url>http://github.com/sonatype/plexus-components</url>
+  </scm>
+  <issueManagement>
+    <system>JIRA</system>
+    <url>http://jira.codehaus.org/browse/PLXCOMP</url>
+  </issueManagement>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-container-default</artifactId>
+        <version>1.0-alpha-9-stable-1</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-utils</artifactId>
+        <version>3.0</version>
+      </dependency>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>3.8.2</version>
+        <scope>test</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-component-metadata</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>generate-metadata</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  
+  <profiles>
+    <profile>
+      <id>parent-release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-release-plugin</artifactId>
+            <configuration>
+              <arguments>-N -Pplexus-release</arguments>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+  
+</project>

Added: trunk/maven-repo-helper/src/test/resources/plexus-components.transformed
===================================================================
--- trunk/maven-repo-helper/src/test/resources/plexus-components.transformed	                        (rev 0)
+++ trunk/maven-repo-helper/src/test/resources/plexus-components.transformed	2012-01-02 20:14:07 UTC (rev 15630)
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.codehaus.plexus</groupId>
+	<artifactId>plexus-components</artifactId>
+	<version>debian</version>
+	<packaging>pom</packaging>
+	<properties>
+		<debian.hasPackageVersion/>
+		<debian.originalVersion>1.1.20-SNAPSHOT</debian.originalVersion>
+		<debian.package>libplexus-components-java</debian.package>
+	</properties>
+	
+	<name>Plexus Components</name>
+	<url>http://plexus.codehaus.org/plexus-components</url>
+	<modules>
+		<!--
+    <module>plexus-swizzle</module>
+    -->
+	</modules>
+	<scm>
+		<connection>scm:git:git at github.com:sonatype/plexus-components.git</connection>
+		<developerConnection>scm:git:git at github.com:sonatype/plexus-components.git</developerConnection>
+		<url>http://github.com/sonatype/plexus-components</url>
+	</scm>
+	<issueManagement>
+		<system>JIRA</system>
+		<url>http://jira.codehaus.org/browse/PLXCOMP</url>
+	</issueManagement>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.codehaus.plexus</groupId>
+				<artifactId>plexus-container-default</artifactId>
+				<version>debian</version>
+			</dependency>
+			<dependency>
+				<groupId>org.codehaus.plexus</groupId>
+				<artifactId>plexus-utils</artifactId>
+				<version>debian</version>
+			</dependency>
+			<dependency>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>debian</version>
+				<scope>test</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.plexus</groupId>
+				<artifactId>plexus-component-metadata</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>generate-metadata</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<profiles>
+		<profile>
+			<id>parent-release</id>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-release-plugin</artifactId>
+						<configuration>
+							<arguments>-N -Pplexus-release</arguments>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+</project>




More information about the pkg-java-commits mailing list