You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ni...@apache.org on 2009/12/05 04:15:29 UTC
svn commit: r887487 - in /commons/proper/jelly/branches/MAVEN-2-BRANCH: ./
jelly-tags/antlr/ jelly-tags/avalon/ jelly-tags/bean/ jelly-tags/beanshell/
jelly-tags/betwixt/ jelly-tags/bsf/ jelly-tags/define/ jelly-tags/dynabean/
jelly-tags/log/ jelly-tag...
Author: niallp
Date: Sat Dec 5 03:14:49 2009
New Revision: 887487
URL: http://svn.apache.org/viewvc?rev=887487&view=rev
Log:
m2 build: add pom.xml for some more jelly tags
Added:
commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/antlr/pom.xml
- copied, changed from r887130, commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/antlr/project.xml
commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/avalon/pom.xml
- copied, changed from r887130, commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/avalon/project.xml
commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/bean/pom.xml
- copied, changed from r887130, commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/bean/project.xml
commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/beanshell/pom.xml
- copied, changed from r887130, commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/beanshell/project.xml
commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/betwixt/pom.xml
- copied, changed from r887130, commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/betwixt/project.xml
commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/bsf/pom.xml
- copied, changed from r887130, commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/bsf/project.xml
commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/define/pom.xml
- copied, changed from r887130, commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/define/project.xml
commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/dynabean/pom.xml
- copied, changed from r887130, commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/dynabean/project.xml
commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/log/pom.xml
- copied, changed from r887130, commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/log/project.xml
commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/xml/pom.xml
- copied, changed from r887130, commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/xml/project.xml
Modified:
commons/proper/jelly/branches/MAVEN-2-BRANCH/pom.xml
Copied: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/antlr/pom.xml (from r887130, commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/antlr/project.xml)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/antlr/pom.xml?p2=commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/antlr/pom.xml&p1=commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/antlr/project.xml&r1=887130&r2=887487&rev=887487&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/antlr/project.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/antlr/pom.xml Sat Dec 5 03:14:49 2009
@@ -15,38 +15,82 @@
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-antlr</artifactId>
<name>commons-jelly-tags-antlr</name>
- <currentVersion>1.0.1-SNAPSHOT</currentVersion>
- <package>org.apache.commons.jelly.tags.antlr</package>
<description>
This is a Jelly interface for Antlr.
</description>
- <shortDescription>Commons Jelly Antlr Tag Library</shortDescription>
-
- <versions>
- <version>
- <id>1.0</id>
- <name>1.0</name>
- <tag>COMMONS_JELLY_ANTLR-1_0</tag>
- </version>
- </versions>
<dependencies>
<!-- START for compilation -->
+
+ <dependency>
+ <groupId>commons-jelly</groupId>
+ <artifactId>commons-jelly</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<dependency>
<artifactId>antlr</artifactId>
<groupId>antlr</groupId>
<version>2.7.1</version>
- <jar>antlrall-2.7.1.jar</jar>
</dependency>
<!-- END for compilation -->
</dependencies>
-
+
+ <properties>
+ <commons.componentid>jelly-tags-antlr</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/avalon/pom.xml (from r887130, commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/avalon/project.xml)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/avalon/pom.xml?p2=commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/avalon/pom.xml&p1=commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/avalon/project.xml&r1=887130&r2=887487&rev=887487&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/avalon/project.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/avalon/pom.xml Sat Dec 5 03:14:49 2009
@@ -15,37 +15,34 @@
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-avalon</artifactId>
<name>commons-jelly-tags-avalon</name>
- <currentVersion>1.0.1-SNAPSHOT</currentVersion>
- <package>org.apache.commons.jelly.avalon</package>
<description>
This is a Jelly library for Avalon
</description>
- <shortDescription>This is a Jelly library for Avalon</shortDescription>
-
- <versions>
- <version>
- <id>1.0</id>
- <name>1.0</name>
- <tag>COMMONS_JELLY_AVALON-1_0</tag>
- </version>
- </versions>
<dependencies>
<!-- START for compilation -->
<dependency>
+ <groupId>commons-jelly</groupId>
+ <artifactId>commons-jelly</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
<artifactId>avalon-framework</artifactId>
<groupId>avalon-framework</groupId>
<version>4.1.3</version>
- <properties>
- <gump.project>avalon-framework-api</gump.project>
- </properties>
</dependency>
<!-- START for running demos -->
@@ -54,9 +51,54 @@
<artifactId>commons-cli</artifactId>
<groupId>commons-cli</groupId>
<version>1.0</version>
+ <scope>test</scope>
</dependency>
<!-- END for running demos -->
</dependencies>
+ <properties>
+ <commons.componentid>jelly-tags-avalon</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/bean/pom.xml (from r887130, commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/bean/project.xml)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/bean/pom.xml?p2=commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/bean/pom.xml&p1=commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/bean/project.xml&r1=887130&r2=887487&rev=887487&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/bean/project.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/bean/pom.xml Sat Dec 5 03:14:49 2009
@@ -15,25 +15,19 @@
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-bean</artifactId>
<name>commons-jelly-tags-bean</name>
- <currentVersion>1.0.1-SNAPSHOT</currentVersion>
- <package>org.apache.commons.jelly.tags.bean</package>
<description>
The Jelly Bean Tag Library
</description>
- <shortDescription>Commons Jelly Bean Tag Library</shortDescription>
-
- <versions>
- <version>
- <id>1.0</id>
- <name>1.0</name>
- <tag>COMMONS_JELLY_BEAN-1_0</tag>
- </version>
- </versions>
<dependencies>
@@ -41,20 +35,71 @@
<dependency>
<groupId>commons-jelly</groupId>
+ <artifactId>commons-jelly</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-log</artifactId>
- <version>1.0</version>
- <url>http://commons.apache.org/jelly/libs/log/</url>
+ <version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-junit</artifactId>
- <version>1.0</version>
- <url>http://commons.apache.org/jelly/libs/junit/</url>
+ <version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<!-- END for test -->
</dependencies>
+
+ <properties>
+ <commons.componentid>jelly-tags-bean</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/beanshell/pom.xml (from r887130, commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/beanshell/project.xml)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/beanshell/pom.xml?p2=commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/beanshell/pom.xml&p1=commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/beanshell/project.xml&r1=887130&r2=887487&rev=887487&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/beanshell/project.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/beanshell/pom.xml Sat Dec 5 03:14:49 2009
@@ -15,25 +15,19 @@
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-beanshell</artifactId>
<name>commons-jelly-tags-beanshell</name>
- <currentVersion>1.0.1-SNAPSHOT</currentVersion>
- <package>org.apache.commons.jelly.tags.beanshell</package>
<description>
This is a Jelly interface for BeanShell.
</description>
- <shortDescription>Commons Jelly BeanShell Tag Library</shortDescription>
-
- <versions>
- <version>
- <id>1.0</id>
- <name>1.0</name>
- <tag>COMMONS_JELLY_BEANSHELL-1_0</tag>
- </version>
- </versions>
<dependencies>
@@ -41,6 +35,12 @@
<!-- START for compilation -->
<dependency>
+ <groupId>commons-jelly</groupId>
+ <artifactId>commons-jelly</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
<artifactId>bsh</artifactId>
<groupId>bsh</groupId>
<version>2.0b1</version>
@@ -51,15 +51,57 @@
<dependency>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-junit</artifactId>
- <version>1.0.1-SNAPSHOT</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 testing -->
</dependencies>
+
+ <properties>
+ <commons.componentid>jelly-tags-beanshell</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/betwixt/pom.xml (from r887130, commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/betwixt/project.xml)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/betwixt/pom.xml?p2=commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/betwixt/pom.xml&p1=commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/betwixt/project.xml&r1=887130&r2=887487&rev=887487&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/betwixt/project.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/betwixt/pom.xml Sat Dec 5 03:14:49 2009
@@ -15,41 +15,40 @@
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-betwixt</artifactId>
<name>commons-jelly-tags-betwixt</name>
- <currentVersion>1.1-SNAPSHOT</currentVersion>
- <package>org.apache.commons.jelly.tags.betwixt</package>
<description>
This is a Jelly interface for Betwixt.
</description>
- <shortDescription>Commons Jelly Betwixt Tag Library</shortDescription>
-
- <versions>
- <version>
- <id>1.0</id>
- <name>1.0</name>
- <tag>COMMONS_JELLY_BETWIXT-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>commons-betwixt</groupId>
<artifactId>commons-betwixt</artifactId>
<version>0.6</version>
- <url>http://commons.apache.org/betwixt/</url>
</dependency>
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<version>1.6</version>
- <url>http://commons.apache.org/digester/</url>
</dependency>
<!-- END for compilation -->
@@ -59,25 +58,62 @@
<dependency>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-log</artifactId>
- <version>1.0</version>
- <url>http://commons.apache.org/jelly/tags/log/</url>
- <properties>
- <scope>test</scope>
- </properties>
+ <version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<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>
+ <version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<!-- END for test -->
</dependencies>
+ <properties>
+ <commons.componentid>jelly-tags-betwixt</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/bsf/pom.xml (from r887130, commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/bsf/project.xml)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/bsf/pom.xml?p2=commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/bsf/pom.xml&p1=commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/bsf/project.xml&r1=887130&r2=887487&rev=887487&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/bsf/project.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/bsf/pom.xml Sat Dec 5 03:14:49 2009
@@ -15,25 +15,19 @@
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-bsf</artifactId>
<name>commons-jelly-tags-bsf</name>
- <currentVersion>1.0.1-SNAPSHOT</currentVersion>
- <package>org.apache.commons.jelly.tags.bsf</package>
<description>
This is a Jelly interface for the Bean Scripting Framework
</description>
- <shortDescription>Commons Jelly BSF Tag Library</shortDescription>
-
- <versions>
- <version>
- <id>1.0</id>
- <name>1.0</name>
- <tag>COMMONS_JELLY_BSF-1_0</tag>
- </version>
- </versions>
<dependencies>
@@ -41,13 +35,15 @@
<!-- START for compilation -->
<dependency>
+ <groupId>commons-jelly</groupId>
+ <artifactId>commons-jelly</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>bsf</groupId>
<artifactId>bsf</artifactId>
<version>2.3.0</version>
- <url>http://jakarta.apache.org/bsf</url>
- <properties>
- <gump.project>jakarta-bsf</gump.project>
- </properties>
</dependency>
<!-- END for compilation -->
@@ -55,4 +51,48 @@
</dependencies>
+ <properties>
+ <commons.componentid>jelly-tags-bsf</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/define/pom.xml (from r887130, commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/define/project.xml)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/define/pom.xml?p2=commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/define/pom.xml&p1=commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/define/project.xml&r1=887130&r2=887487&rev=887487&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/define/project.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/define/pom.xml Sat Dec 5 03:14:49 2009
@@ -15,26 +15,19 @@
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-define</artifactId>
<name>commons-jelly-tags-define</name>
- <currentVersion>1.0.1-SNAPSHOT</currentVersion>
-
- <package>org.apache.commons.jelly.tags.define</package>
<description>
The Jelly Define Tag Library
</description>
- <shortDescription>Commons Jelly Define Tag Library</shortDescription>
-
- <versions>
- <version>
- <id>1.0</id>
- <name>1.0</name>
- <tag>COMMONS_JELLY_DEFINE-1_0</tag>
- </version>
- </versions>
<dependencies>
@@ -42,42 +35,36 @@
<dependency>
<groupId>commons-jelly</groupId>
+ <artifactId>commons-jelly</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-dynabean</artifactId>
- <version>1.0</version>
- <url>http://commons.apache.org/jelly/tags/dynabean/</url>
- <properties>
- <scope>test</scope>
- </properties>
+ <version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<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>
+ <version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-log</artifactId>
- <version>1.0</version>
- <url>http://commons.apache.org/jelly/tags/log/</url>
- <properties>
- <scope>test</scope>
- </properties>
+ <version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-xml</artifactId>
- <version>1.0</version>
- <url>http://commons.apache.org/jelly/tags/xml/</url>
- <properties>
- <scope>test</scope>
- </properties>
+ <version>${project.version}</version>
+ <scope>test</scope>
</dependency>
@@ -95,4 +82,48 @@
</dependencies>
+ <properties>
+ <commons.componentid>jelly-tags-define</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/dynabean/pom.xml (from r887130, commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/dynabean/project.xml)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/dynabean/pom.xml?p2=commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/dynabean/pom.xml&p1=commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/dynabean/project.xml&r1=887130&r2=887487&rev=887487&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/dynabean/project.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/dynabean/pom.xml Sat Dec 5 03:14:49 2009
@@ -15,43 +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-dynabean</artifactId>
<name>commons-jelly-tags-dynabean</name>
- <currentVersion>1.0.1-SNAPSHOT</currentVersion>
-
- <package>org.apache.commons.jelly.tags.dynabean</package>
<description>
The Jelly DynaBean Tag Library
</description>
- <shortDescription>Commons Jelly Dyna Bean Tag Library</shortDescription>
-
- <versions>
- <version>
- <id>1.0</id>
- <name>1.0</name>
- <tag>COMMONS_JELLY_DYNABEAN-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/tags/junit/</url>
- <properties>
- <scope>test</scope>
- </properties>
+ <version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<!-- END for test -->
</dependencies>
+ <properties>
+ <commons.componentid>jelly-tags-dynabean</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/log/pom.xml (from r887130, commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/log/project.xml)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/log/pom.xml?p2=commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/log/pom.xml&p1=commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/log/project.xml&r1=887130&r2=887487&rev=887487&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/log/project.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/log/pom.xml Sat Dec 5 03:14:49 2009
@@ -15,36 +15,79 @@
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-log</artifactId>
<name>commons-jelly-tags-log</name>
- <currentVersion>1.0.1-SNAPSHOT</currentVersion>
-
- <package>org.apache.commons.jelly.tags.log</package>
<description>
The Jelly Log Tag Library
</description>
- <shortDescription>Commons Jelly Log Tag Library</shortDescription>
-
- <versions>
- <version>
- <id>1.0</id>
- <name>1.0</name>
- <tag>COMMONS_JELLY_LOG-1_0</tag>
- </version>
- </versions>
<dependencies>
<dependency>
<groupId>commons-jelly</groupId>
+ <artifactId>commons-jelly</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-junit</artifactId>
- <version>1.0</version>
- <url>http://commons.apache.org/jelly/tags/junit/</url>
+ <version>${project.version}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
+ <properties>
+ <commons.componentid>jelly-tags-log</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/xml/pom.xml (from r887130, commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/xml/project.xml)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/xml/pom.xml?p2=commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/xml/pom.xml&p1=commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/xml/project.xml&r1=887130&r2=887487&rev=887487&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/xml/project.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/xml/pom.xml Sat Dec 5 03:14:49 2009
@@ -17,31 +17,21 @@
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-xml</artifactId>
<name>commons-jelly-tags-xml</name>
- <currentVersion>1.2-SNAPSHOT</currentVersion>
- <package>org.apache.commons.jelly.tags.xml</package>
<description>The Jelly XML Tag Library</description>
- <shortDescription>Commons Jelly XML Tag Library</shortDescription>
- <versions>
- <version>
- <id>1.0</id>
- <name>1.0</name>
- <tag>COMMONS_JELLY_XML-1_0</tag>
- </version>
- <version>
- <id>1.1</id>
- <name>1.1</name>
- <tag>commons-jelly-tags-xml-1.1</tag>
- </version>
- </versions>
<dependencies>
<dependency>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly</artifactId>
- <version>1.0</version>
+ <version>${project.version}</version>
</dependency>
<!-- run time / in testing-->
@@ -54,11 +44,53 @@
<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>
</dependencies>
+
+ <properties>
+ <commons.componentid>jelly-tags-xml</commons.componentid>
+ </properties>
+
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <!-- comment out test source until tests stop failing -->
+ <!--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=887487&r1=887486&r2=887487&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/pom.xml Sat Dec 5 03:14:49 2009
@@ -48,6 +48,16 @@
<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>
+ <module>jelly-tags/bean</module>
+ <module>jelly-tags/beanshell</module>
+ <module>jelly-tags/betwixt</module>
+ <module>jelly-tags/bsf</module>
+ <module>jelly-tags/define</module>
+ <module>jelly-tags/dynabean</module>
+ <module>jelly-tags/log</module>
+ <module>jelly-tags/xml</module>
</modules>
<properties>