Author: ilgrosso
Date: Thu Jun 7 14:34:11 2012
New Revision: 1347643
URL: http://svn.apache.org/viewvc?rev=1347643&view=rev
Log:
Fixing filtered archetype-block generation, broken after adding logback.version and slf4j.version to parent POM
Modified:
cocoon/cocoon3/trunk/cocoon-archetype-block/pom.xml
cocoon/cocoon3/trunk/cocoon-archetype-block/xsl/properties-to-pom.xsl
cocoon/cocoon3/trunk/parent/pom.xml
Modified: cocoon/cocoon3/trunk/cocoon-archetype-block/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-archetype-block/pom.xml?rev=1347643&r1=1347642&r2=1347643&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-archetype-block/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-archetype-block/pom.xml Thu Jun 7 14:34:11 2012
@@ -11,7 +11,7 @@
language governing permissions and limitations under the License. -->
<!-- $Id$ -->
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -30,6 +30,9 @@
<properties>
<cocoon.version>3.0.0-beta-1-SNAPSHOT</cocoon.version>
<spring.version>3.1.1.RELEASE</spring.version>
+
+ <logback.version>1.0.5</logback.version>
+ <slf4j.version>1.6.5</slf4j.version>
</properties>
<build>
@@ -71,6 +74,12 @@
<dir>../parent</dir>
<outputDir>${basedir}/src/main/resources/archetype-resources</outputDir>
<stylesheet>${basedir}/xsl/properties-to-pom.xsl</stylesheet>
+ <outputProperties>
+ <outputProperty>
+ <name>indent</name>
+ <value>yes</value>
+ </outputProperty>
+ </outputProperties>
<includes>
<include>pom.xml</include>
</includes>
@@ -83,6 +92,14 @@
<name>springVersion</name>
<value>${spring.version}</value>
</parameter>
+ <parameter>
+ <name>slf4jVersion</name>
+ <value>${slf4j.version}</value>
+ </parameter>
+ <parameter>
+ <name>logbackVersion</name>
+ <value>${logback.version}</value>
+ </parameter>
</parameters>
</transformationSet>
</transformationSets>
Modified: cocoon/cocoon3/trunk/cocoon-archetype-block/xsl/properties-to-pom.xsl
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-archetype-block/xsl/properties-to-pom.xsl?rev=1347643&r1=1347642&r2=1347643&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-archetype-block/xsl/properties-to-pom.xsl (original)
+++ cocoon/cocoon3/trunk/cocoon-archetype-block/xsl/properties-to-pom.xsl Thu Jun 7 14:34:11 2012
@@ -19,10 +19,12 @@
-->
<!-- $Id: pom.xml 1297424 2012-03-06 11:08:46Z simonetripodi $ -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:saxon="http://saxon.sf.net/" version="2.0"
- xmlns:m="http://maven.apache.org/POM/4.0.0" xmlns="http://maven.apache.org/POM/4.0.0">
+ xmlns:saxon="http://saxon.sf.net/" version="2.0"
+ xmlns:m="http://maven.apache.org/POM/4.0.0" xmlns="http://maven.apache.org/POM/4.0.0">
<xsl:param name="cocoonVersion" />
<xsl:param name="springVersion" />
+ <xsl:param name="slf4jVersion" />
+ <xsl:param name="logbackVersion" />
<xsl:variable name="versionedDeps">
<![CDATA[<dependencies xmlns="http://maven.apache.org/POM/4.0.0">
<dependency>
@@ -67,34 +69,32 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- </dependencies>]]></xsl:variable>
+ </dependencies>]]>
+ </xsl:variable>
<xsl:variable name="deps" select="saxon:parse($versionedDeps)" />
<xsl:variable name="depsV" select="//m:dependencies" />
<xsl:template match="/">
-<xsl:comment>
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you 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
+ <xsl:comment>
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
-</xsl:comment>
- <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
-">
+ 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.
+ </xsl:comment>
+ <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">
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -115,6 +115,12 @@ http://maven.apache.org/POM/4.0.0 http:/
<spring.version>
<xsl:value-of select="$springVersion" />
</spring.version>
+ <slf4j.version>
+ <xsl:value-of select="$slf4jVersion" />
+ </slf4j.version>
+ <logback.version>
+ <xsl:value-of select="$logbackVersion" />
+ </logback.version>
</properties>
<dependencies>
<dependency>
Modified: cocoon/cocoon3/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/parent/pom.xml?rev=1347643&r1=1347642&r2=1347643&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/parent/pom.xml (original)
+++ cocoon/cocoon3/trunk/parent/pom.xml Thu Jun 7 14:34:11 2012
@@ -676,7 +676,7 @@
<name>Apache Snapshot Repository</name>
<url>http://repository.apache.org/snapshots</url>
<releases>
- <enabled>false</enabled>
+ <enabled>false</enabled>
</releases>
</pluginRepository>
</pluginRepositories>
@@ -702,9 +702,9 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.5</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.5</version>
<configuration>
<source>${javac.src.version}</source>
<target>${javac.target.version}</target>
@@ -992,6 +992,11 @@
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xml-maven-plugin</artifactId>
+ <version>1.0</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.