Copied: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/swt/pom.xml (from r887130, commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/swt/project.xml) URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/swt/pom.xml?p2=commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/swt/pom.xml&p1=commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/swt/project.xml&r1=887130&r2=887585&rev=887585&view=diff ============================================================================== --- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/swt/project.xml (original) +++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/swt/pom.xml Sat Dec 5 20:26:00 2009 @@ -17,50 +17,121 @@ limitations under the License. --> -<project> - <extend>${basedir}/../tag-project.xml</extend> +<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/maven-v4_0_0.xsd";> + <parent> + <groupId>commons-jelly</groupId> + <artifactId>commons-jelly-parent</artifactId> + <version>1.1-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> <artifactId>commons-jelly-tags-swt</artifactId> <name>commons-jelly-tags-swt</name> - <currentVersion>1.1-SNAPSHOT</currentVersion> - <package>org.apache.commons.jelly.tags.swt</package> <description>This is a Jelly interface for SWT.</description> - <shortDescription>Commons Jelly SWT Tag Library</shortDescription> - <versions> - <version> - <id>1.0</id> - <name>1.0</name> - <tag>COMMONS-JELLY-SWT-1_0</tag> - </version> - </versions> <dependencies> <!-- START for compilation --> - <!-- swt taglib --> + <!-- swt taglib --> + <!-- OS-dependent jars --> <dependency> <groupId>swt</groupId> - <artifactId>swt</artifactId> - <!-- don't know how to support OS-dependent jars in Maven yet --> - - <version>win32-2.1.0</version> - <properties> - <gump.project>eclipse</gump.project> - <gump.id>swt</gump.id> - </properties> + <artifactId>${swt.os-specific-dep}</artifactId> + <version>2.1.0</version> </dependency> + <!-- END for compilation --> <!-- START for running demos --> <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> - <version>1.0</version> + <scope>test</scope> </dependency> <dependency> <groupId>commons-jelly</groupId> <artifactId>commons-jelly-tags-log</artifactId> - <version>1.0</version> + <version>${project.version}</version> </dependency> <!-- END for running demos --> </dependencies> + + <properties> + <commons.componentid>jelly-tags-swt</commons.componentid> + </properties> + + <build> + <sourceDirectory>src/java</sourceDirectory> + <testSourceDirectory>src/test</testSourceDirectory> + + <resources> + <resource> + <directory>../..</directory> + <targetPath>META-INF</targetPath> + <includes> + <include>NOTICE.txt</include> + <include>LICENSE.txt</include> + </includes> + </resource> + </resources> + + <testResources> + <testResource> + <directory>src/test</directory> + <includes> + <include>**/*.jelly</include> + <include>**/*.properties</include> + <include>**/*.xml</include> + </includes> + </testResource> + </testResources> + + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>../jelly-tags-assembly.xml</descriptor> + </descriptors> + <tarLongFileMode>gnu</tarLongFileMode> + </configuration> + </plugin> + </plugins> + + </build> + + <profiles> + + <!-- Unix Profile --> + <profile> + <id>unix</id> + <activation> + <os><family>unix</family></os> + </activation> + <properties> + <swt.os-specific-dep>swt-linux-gtk</swt.os-specific-dep> + </properties> + </profile> + + <!-- Windows Profile --> + <profile> + <id>windows</id> + <activation> + <os><family>windows</family></os> + </activation> + <properties> + <swt.os-specific-dep>swt-win32</swt.os-specific-dep> + </properties> + </profile> + + <!-- Mac Profile --> + <profile> + <id>mac</id> + <activation> + <os><family>macosx</family></os> + </activation> + <properties> + <swt.os-specific-dep>swt-macosx</swt.os-specific-dep> + </properties> + </profile> + </profiles> </project>
Copied: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/threads/pom.xml (from r887130, commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/threads/project.xml) URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/threads/pom.xml?p2=commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/threads/pom.xml&p1=commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/threads/project.xml&r1=887130&r2=887585&rev=887585&view=diff ============================================================================== --- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/threads/project.xml (original) +++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/threads/pom.xml Sat Dec 5 20:26:00 2009 @@ -15,42 +15,83 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project> - <extend>${basedir}/../tag-project.xml</extend> +<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/maven-v4_0_0.xsd";> + <parent> + <groupId>commons-jelly</groupId> + <artifactId>commons-jelly-parent</artifactId> + <version>1.1-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> <artifactId>commons-jelly-tags-threads</artifactId> <name>commons-jelly-tags-threads</name> - <currentVersion>1.0.1-SNAPSHOT</currentVersion> - <package>org.apache.commons.jelly.tags.threads</package> <description> A library for processing Jelly scripts using multiple threads. </description> - <shortDescription>Commons Jelly Threads Tag Library</shortDescription> - - <versions> - <version> - <id>1.0</id> - <name>1.0</name> - <tag>COMMONS-JELLY-THREADS-1_0</tag> - </version> - </versions> <dependencies> + <dependency> + <groupId>commons-jelly</groupId> + <artifactId>commons-jelly</artifactId> + <version>${project.version}</version> + </dependency> + <!-- START for test --> <dependency> <groupId>commons-jelly</groupId> <artifactId>commons-jelly-tags-junit</artifactId> - <version>1.0</version> - <url>http://commons.apache.org/jelly/libs/junit/</url> - <properties> - <scope>test</scope> - </properties> + <version>${project.version}</version> + <scope>test</scope> </dependency> <!-- END for test --> </dependencies> + <properties> + <commons.componentid>jelly-tags-threads</commons.componentid> + </properties> + + <build> + <sourceDirectory>src/java</sourceDirectory> + <testSourceDirectory>src/test</testSourceDirectory> + + <resources> + <resource> + <directory>../..</directory> + <targetPath>META-INF</targetPath> + <includes> + <include>NOTICE.txt</include> + <include>LICENSE.txt</include> + </includes> + </resource> + </resources> + + <testResources> + <testResource> + <directory>src/test</directory> + <includes> + <include>**/*.jelly</include> + <include>**/*.properties</include> + <include>**/*.xml</include> + </includes> + </testResource> + </testResources> + + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>../jelly-tags-assembly.xml</descriptor> + </descriptors> + <tarLongFileMode>gnu</tarLongFileMode> + </configuration> + </plugin> + </plugins> + + </build> + </project> Copied: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/validate/pom.xml (from r887130, commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/validate/project.xml) URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/validate/pom.xml?p2=commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/validate/pom.xml&p1=commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/validate/project.xml&r1=887130&r2=887585&rev=887585&view=diff ============================================================================== --- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/validate/project.xml (original) +++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/validate/pom.xml Sat Dec 5 20:26:00 2009 @@ -17,36 +17,28 @@ limitations under the License. --> -<project> - <extend>${basedir}/../tag-project.xml</extend> +<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/maven-v4_0_0.xsd";> + <parent> + <groupId>commons-jelly</groupId> + <artifactId>commons-jelly-parent</artifactId> + <version>1.1-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> <artifactId>commons-jelly-tags-validate</artifactId> <name>commons-jelly-tags-validate</name> - <currentVersion>1.0.1-SNAPSHOT</currentVersion> - <package>org.apache.commons.jelly.tags.validate</package> <description>This is a Jelly interface for XML validation.</description> - <shortDescription>Commons Jelly Validate Tag Library</shortDescription> - <versions> - <version> - <id>1.0</id> - <name>1.0</name> - <tag>COMMONS-JELLY-VALIDATE-1_0</tag> - </version> - </versions> <dependencies> <!-- START for compilation --> <dependency> + <groupId>commons-jelly</groupId> + <artifactId>commons-jelly</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>msv</groupId> <artifactId>isorelax</artifactId> <version>20030807</version> - <properties> - <gump.project>iso-relax</gump.project> - </properties> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> </dependency> <dependency> <groupId>msv</groupId> @@ -65,9 +57,6 @@ <groupId>msv</groupId> <artifactId>relaxngDatatype</artifactId> <version>20030807</version> - <properties> - <gump.project>relaxng</gump.project> - </properties> </dependency> <!-- END runtime --> <!-- START for test --> @@ -75,11 +64,7 @@ <dependency> <groupId>commons-jelly</groupId> <artifactId>commons-jelly-tags-junit</artifactId> - <version>1.0</version> - <url>http://commons.apache.org/jelly/libs/junit/</url> - <properties> - <scope>test</scope> - </properties> + <version>${project.version}</version> </dependency> <!-- END for test --> <!-- START for running demos --> @@ -87,9 +72,54 @@ <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> - <version>1.0</version> + <scope>test</scope> </dependency> <!-- END for running demos --> </dependencies> + + <properties> + <commons.componentid>jelly-tags-validate</commons.componentid> + </properties> + + <build> + <sourceDirectory>src/java</sourceDirectory> + <testSourceDirectory>src/test</testSourceDirectory> + + <resources> + <resource> + <directory>../..</directory> + <targetPath>META-INF</targetPath> + <includes> + <include>NOTICE.txt</include> + <include>LICENSE.txt</include> + </includes> + </resource> + </resources> + + <testResources> + <testResource> + <directory>src/test</directory> + <includes> + <include>**/*.jelly</include> + <include>**/*.dtd</include> + <include>**/*.rng</include> + </includes> + </testResource> + </testResources> + + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>../jelly-tags-assembly.xml</descriptor> + </descriptors> + <tarLongFileMode>gnu</tarLongFileMode> + </configuration> + </plugin> + </plugins> + + </build> + </project> Copied: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/velocity/pom.xml (from r887130, commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/velocity/project.xml) URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/velocity/pom.xml?p2=commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/velocity/pom.xml&p1=commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/velocity/project.xml&r1=887130&r2=887585&rev=887585&view=diff ============================================================================== --- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/velocity/project.xml (original) +++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/velocity/pom.xml Sat Dec 5 20:26:00 2009 @@ -15,43 +15,81 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project> - <extend>${basedir}/../tag-project.xml</extend> +<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/maven-v4_0_0.xsd";> + <parent> + <groupId>commons-jelly</groupId> + <artifactId>commons-jelly-parent</artifactId> + <version>1.1-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> <artifactId>commons-jelly-tags-velocity</artifactId> <name>commons-jelly-tags-velocity</name> - <currentVersion>1.0.1-SNAPSHOT</currentVersion> - - <package>org.apache.commons.jelly.tags.velocity</package> <description> This is a Jelly interface for Velocity. </description> - <shortDescription>Commons Jelly Velocity Tag Library</shortDescription> - - <versions> - <version> - <id>1.0</id> - <name>1.0</name> - <tag>COMMONS_JELLY_VELOCITY-1_0</tag> - </version> - </versions> <dependencies> + <dependency> + <groupId>commons-jelly</groupId> + <artifactId>commons-jelly</artifactId> + <version>${project.version}</version> + </dependency> + <!-- START for compilation --> <dependency> <groupId>velocity</groupId> <artifactId>velocity</artifactId> <version>1.3</version> - <url>http://jakarta.apache.org/velocity/</url> - <properties> - <gump.project>jakarta-velocity</gump.project> - <gump.id>velocity</gump.id> - </properties> </dependency> <!-- END for compilation --> </dependencies> + <properties> + <commons.componentid>jelly-tags-velocity</commons.componentid> + </properties> + + <build> + <sourceDirectory>src/java</sourceDirectory> + <testSourceDirectory>src/test</testSourceDirectory> + + <resources> + <resource> + <directory>../..</directory> + <targetPath>META-INF</targetPath> + <includes> + <include>NOTICE.txt</include> + <include>LICENSE.txt</include> + </includes> + </resource> + </resources> + + <testResources> + <testResource> + <directory>src/test</directory> + <includes> + <include>**/*.jelly</include> + <include>**/*.properties</include> + <include>**/*.xml</include> + </includes> + </testResource> + </testResources> + + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>../jelly-tags-assembly.xml</descriptor> + </descriptors> + <tarLongFileMode>gnu</tarLongFileMode> + </configuration> + </plugin> + </plugins> + + </build> + </project> Copied: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/xmlunit/pom.xml (from r887130, commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/xmlunit/project.xml) URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/xmlunit/pom.xml?p2=commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/xmlunit/pom.xml&p1=commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/xmlunit/project.xml&r1=887130&r2=887585&rev=887585&view=diff ============================================================================== --- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/xmlunit/project.xml (original) +++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/xmlunit/pom.xml Sat Dec 5 20:26:00 2009 @@ -17,65 +17,94 @@ limitations under the License. --> -<project> - <extend>${basedir}/../tag-project.xml</extend> +<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/maven-v4_0_0.xsd";> + <parent> + <groupId>commons-jelly</groupId> + <artifactId>commons-jelly-parent</artifactId> + <version>1.1-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> <artifactId>commons-jelly-tags-xmlunit</artifactId> <name>commons-jelly-tags-xmlunit</name> - <currentVersion>1.0.1-SNAPSHOT</currentVersion> - <package>org.apache.commons.jelly.tags.xmlunit</package> <description>This is a Jelly interface for unit testing XML applications.</description> - <shortDescription>Commons Jelly XMLUnit Tag Library</shortDescription> - <versions> - <version> - <id>1.0</id> - <name>1.0</name> - <tag>COMMONS-JELLY-XMLUNIT-1_0</tag> - </version> - </versions> <dependencies> <!-- START for compilation --> <dependency> + <groupId>commons-jelly</groupId> + <artifactId>commons-jelly</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>xmlunit</groupId> <artifactId>xmlunit</artifactId> <version>1.0</version> </dependency> - <!-- for some reason I had to add this in or the 1.3.1 compiler barfed --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> + <groupId>commons-jelly</groupId> + <artifactId>commons-jelly-tags-junit</artifactId> + <version>${project.version}</version> </dependency> + <!-- END for compilation --> <!-- START for testing --> <dependency> <groupId>commons-jelly</groupId> - <artifactId>commons-jelly-tags-junit</artifactId> - <version>1.0</version> - <url>http://commons.apache.org/jelly/tags/junit/</url> - <properties> - <scope>test</scope> - </properties> - </dependency> - <dependency> - <groupId>commons-jelly</groupId> <artifactId>commons-jelly-tags-xml</artifactId> - <version>1.0</version> - <properties> - <scope>test</scope> - </properties> + <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>xalan</groupId> <artifactId>xalan</artifactId> <version>2.3.1</version> - <url>http://xml.apache.org/xalan-j/</url> - <properties> - <scope>test</scope> - </properties> + <scope>test</scope> </dependency> <!-- END for testing --> </dependencies> + + <properties> + <commons.componentid>jelly-tags-xmlunit</commons.componentid> + </properties> + + <build> + <sourceDirectory>src/java</sourceDirectory> + <testSourceDirectory>src/test</testSourceDirectory> + + <resources> + <resource> + <directory>../..</directory> + <targetPath>META-INF</targetPath> + <includes> + <include>NOTICE.txt</include> + <include>LICENSE.txt</include> + </includes> + </resource> + </resources> + + <testResources> + <testResource> + <directory>src/test</directory> + <includes> + <include>**/*.jelly</include> + <include>**/*.properties</include> + <include>**/*.xml</include> + </includes> + </testResource> + </testResources> + + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>../jelly-tags-assembly.xml</descriptor> + </descriptors> + <tarLongFileMode>gnu</tarLongFileMode> + </configuration> + </plugin> + </plugins> + + </build> </project> Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/pom.xml?rev=887585&r1=887584&r2=887585&view=diff ============================================================================== --- commons/proper/jelly/branches/MAVEN-2-BRANCH/pom.xml (original) +++ commons/proper/jelly/branches/MAVEN-2-BRANCH/pom.xml Sat Dec 5 20:26:00 2009 @@ -45,8 +45,6 @@ <modules> <module>jelly</module> - <module>jelly-tags/junit</module> - <module>jelly-tags/util</module> <module>jelly-tags/ant</module> <module>jelly-tags/antlr</module> <module>jelly-tags/avalon</module> @@ -56,8 +54,33 @@ <module>jelly-tags/bsf</module> <module>jelly-tags/define</module> <module>jelly-tags/dynabean</module> + <module>jelly-tags/email</module> + <module>jelly-tags/fmt</module> + <module>jelly-tags/html</module> + <module>jelly-tags/http</module> + <module>jelly-tags/interaction</module> + <module>jelly-tags/jaxme</module> + <module>jelly-tags/jetty</module> + <module>jelly-tags/jface</module> + <module>jelly-tags/jms</module> + <module>jelly-tags/jmx</module> + <module>jelly-tags/jsl</module> + <module>jelly-tags/junit</module> <module>jelly-tags/log</module> + <module>jelly-tags/memory</module> + <module>jelly-tags/ojb</module> + <module>jelly-tags/quartz</module> + <module>jelly-tags/regexp</module> + <module>jelly-tags/soap</module> + <module>jelly-tags/sql</module> + <module>jelly-tags/swing</module> + <module>jelly-tags/swt</module> + <module>jelly-tags/threads</module> + <module>jelly-tags/util</module> + <module>jelly-tags/validate</module> + <module>jelly-tags/velocity</module> <module>jelly-tags/xml</module> + <module>jelly-tags/xmlunit</module> </modules> <properties>
