Author: craigmcc Date: Fri Jun 9 22:41:58 2006 New Revision: 413253 URL: http://svn.apache.org/viewvc?rev=413253&view=rev Log: Correct line endings.
Modified: struts/shale/branches/mvn_reorg/pom.xml struts/shale/branches/mvn_reorg/shale-core/pom.xml struts/shale/branches/mvn_reorg/shale-spring/pom.xml struts/shale/branches/mvn_reorg/shale-tiles/pom.xml Modified: struts/shale/branches/mvn_reorg/pom.xml URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/pom.xml?rev=413253&r1=413252&r2=413253&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/pom.xml (original) +++ struts/shale/branches/mvn_reorg/pom.xml Fri Jun 9 22:41:58 2006 @@ -1,336 +1,336 @@ -<!-- -/* - * Copyright 2006 The Apache Software 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. - * - * $Id: pom.xml 160293 2006-06-01 16:29:07Z jmitchell $ - */ ---> -<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> - <parent> - <groupId>org.apache.struts</groupId> - <artifactId>struts-parent</artifactId> - <version>2</version> - </parent> - <groupId>org.apache.struts.shale</groupId> - <artifactId>shale-parent</artifactId> - <version>1.0.3-SNAPSHOT</version> - <packaging>pom</packaging> - <name>Apache Shale Framework</name> - <url>http://struts.apache.org/struts-shale</url> - - <!-- http://jira.codehaus.org/browse/MNG-2136 --> - <profiles> - <profile> - <id>designtime</id> - <modules> - <module>shale-designtime</module> - </modules> - </profile> - <profile> - <activation> - <jdk>1.5</jdk> - </activation> - <modules> - <module>shale-tiger</module> - </modules> - </profile> - <profile> - <id>myfaces</id> - <activation> - <activeByDefault>true</activeByDefault> - <property> - <name>maven.shale.jsf.impl</name> - <value>myfaces</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>myfaces</groupId> - <artifactId>myfaces-api</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>myfaces</groupId> - <artifactId>myfaces-impl</artifactId> - <version>1.1.1</version> - <scope>runtime</scope> - </dependency> - <!-- These should be specified in the myfaces pom --> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.2</version> - </dependency> - <dependency> - <groupId>commons-el</groupId> - <artifactId>commons-el</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - <version>1.0</version> - </dependency> - </dependencies> - </profile> - <profile> - <id>jsfri</id> - <activation> - <property> - <name>maven.shale.jsf.impl</name> - <value>jsfri</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.1_02</version> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>1.1_02</version> - <scope>runtime</scope> - </dependency> - </dependencies> - </profile> - </profiles> - - <modules> - <module>shale-clay</module> - <module>shale-core</module> - <module>shale-remoting</module> - <module>shale-spring</module> - <module>shale-test</module> - <module>shale-tiger</module> - <module>shale-tiles</module> - <module>shale-apps</module> - </modules> - - <repositories> - <repository> - <id>apache.snapshots</id> - <name>Apache Maven Repository (Snapshots and Test Builds)</name> - <url>http://people.apache.org/maven-snapshot-repository</url> - <releases><enabled>true</enabled></releases> - <snapshots><enabled>true</enabled></snapshots> - </repository> - <repository> - <id>java.net</id> - <name>java.net Maven 1 Repository</name> - <url>https://maven-repository.dev.java.net/nonav/repository</url> - <layout>legacy</layout> - </repository> - </repositories> - - <build> - - <pluginManagement> - <plugins> - <!-- - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <includes> - <include>**/*TestCase.java</include> - </includes> - </configuration> - </plugin> - --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.4</source> - <target>1.4</target> - </configuration> - </plugin> - <!-- - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <configuration> - <siteDirectory>../src/site</siteDirectory> - </configuration> - </plugin> - --> - </plugins> - </pluginManagement> - </build> - - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <!--aggregate>true</aggregate--> - <links> - <link>http://java.sun.com/j2se/1.4.2/docs/api</link> - <link>http://java.sun.com/j2ee/sdk_1.2.1/techdocs/api</link> - <link>http://jakarta.apache.org/commons/chain/apidocs</link> - <link>http://jakarta.apache.org/commons/digester/commons-digester-1.6/docs/api</link> - <link>http://jakarta.apache.org/commons/logging/commons-logging-1.0.4/docs/apidocs</link> - </links> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-report-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <configuration> - <configLocation>org/apache/struts/build/struts_checks.xml</configLocation> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jxr-maven-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> - </plugins> - </reporting> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.6.2</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>xerces</groupId> - <artifactId>xmlParserAPIs</artifactId> - <version>2.6.2</version> - <scope>test</scope> - </dependency> - - - <!-- Needs a different xml-apis jar - <dependency> (or 2.4.0) - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.7.1</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - <version>2.0.2</version> - <scope>test</scope> - </dependency> - --> - - <!-- - <dependency> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - <version>2.7.0</version> - <scope>test</scope> - </dependency> - --> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - <!--exclusions> - <exclusion> - <groupId>servletapi</groupId> - <artifactId>servletapi</artifactId> - </exclusion> - </exclusions--> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jsp-api</artifactId> - <version>2.0</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.7.0</version> - </dependency> - - <dependency> - <groupId>commons-chain</groupId> - <artifactId>commons-chain</artifactId> - <version>1.0</version> - </dependency> - - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.0</version> - </dependency> - - <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>1.6</version> - </dependency> - - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.0.4</version> - </dependency> - - <dependency> - <groupId>commons-validator</groupId> - <artifactId>commons-validator</artifactId> - <version>1.3.0</version> - </dependency> - - <dependency> - <groupId>oro</groupId> - <artifactId>oro</artifactId> - <version>2.0.8</version> - </dependency> - - <dependency> - <groupId>antlr</groupId> - <artifactId>antlr</artifactId> - <version>2.7.2</version> - </dependency> - </dependencies> - </dependencyManagement> - - -</project> +<!-- +/* + * Copyright 2006 The Apache Software 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. + * + * $Id: pom.xml 160293 2006-06-01 16:29:07Z jmitchell $ + */ +--> +<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> + <parent> + <groupId>org.apache.struts</groupId> + <artifactId>struts-parent</artifactId> + <version>2</version> + </parent> + <groupId>org.apache.struts.shale</groupId> + <artifactId>shale-parent</artifactId> + <version>1.0.3-SNAPSHOT</version> + <packaging>pom</packaging> + <name>Apache Shale Framework</name> + <url>http://struts.apache.org/struts-shale</url> + + <!-- http://jira.codehaus.org/browse/MNG-2136 --> + <profiles> + <profile> + <id>designtime</id> + <modules> + <module>shale-designtime</module> + </modules> + </profile> + <profile> + <activation> + <jdk>1.5</jdk> + </activation> + <modules> + <module>shale-tiger</module> + </modules> + </profile> + <profile> + <id>myfaces</id> + <activation> + <activeByDefault>true</activeByDefault> + <property> + <name>maven.shale.jsf.impl</name> + <value>myfaces</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>myfaces</groupId> + <artifactId>myfaces-api</artifactId> + <version>1.1.1</version> + </dependency> + <dependency> + <groupId>myfaces</groupId> + <artifactId>myfaces-impl</artifactId> + <version>1.1.1</version> + <scope>runtime</scope> + </dependency> + <!-- These should be specified in the myfaces pom --> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>commons-el</groupId> + <artifactId>commons-el</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>1.0</version> + </dependency> + </dependencies> + </profile> + <profile> + <id>jsfri</id> + <activation> + <property> + <name>maven.shale.jsf.impl</name> + <value>jsfri</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>1.1_02</version> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>1.1_02</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + </profiles> + + <modules> + <module>shale-clay</module> + <module>shale-core</module> + <module>shale-remoting</module> + <module>shale-spring</module> + <module>shale-test</module> + <module>shale-tiger</module> + <module>shale-tiles</module> + <module>shale-apps</module> + </modules> + + <repositories> + <repository> + <id>apache.snapshots</id> + <name>Apache Maven Repository (Snapshots and Test Builds)</name> + <url>http://people.apache.org/maven-snapshot-repository</url> + <releases><enabled>true</enabled></releases> + <snapshots><enabled>true</enabled></snapshots> + </repository> + <repository> + <id>java.net</id> + <name>java.net Maven 1 Repository</name> + <url>https://maven-repository.dev.java.net/nonav/repository</url> + <layout>legacy</layout> + </repository> + </repositories> + + <build> + + <pluginManagement> + <plugins> + <!-- + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <includes> + <include>**/*TestCase.java</include> + </includes> + </configuration> + </plugin> + --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.4</source> + <target>1.4</target> + </configuration> + </plugin> + <!-- + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <configuration> + <siteDirectory>../src/site</siteDirectory> + </configuration> + </plugin> + --> + </plugins> + </pluginManagement> + </build> + + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-project-info-reports-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <!--aggregate>true</aggregate--> + <links> + <link>http://java.sun.com/j2se/1.4.2/docs/api</link> + <link>http://java.sun.com/j2ee/sdk_1.2.1/techdocs/api</link> + <link>http://jakarta.apache.org/commons/chain/apidocs</link> + <link>http://jakarta.apache.org/commons/digester/commons-digester-1.6/docs/api</link> + <link>http://jakarta.apache.org/commons/logging/commons-logging-1.0.4/docs/apidocs</link> + </links> + </configuration> + </plugin> + <plugin> + <artifactId>maven-surefire-report-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <configuration> + <configLocation>org/apache/struts/build/struts_checks.xml</configLocation> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jxr-maven-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-pmd-plugin</artifactId> + </plugin> + </plugins> + </reporting> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.6.2</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>xerces</groupId> + <artifactId>xmlParserAPIs</artifactId> + <version>2.6.2</version> + <scope>test</scope> + </dependency> + + + <!-- Needs a different xml-apis jar + <dependency> (or 2.4.0) + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.7.1</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <version>2.0.2</version> + <scope>test</scope> + </dependency> + --> + + <!-- + <dependency> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + <version>2.7.0</version> + <scope>test</scope> + </dependency> + --> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + <!--exclusions> + <exclusion> + <groupId>servletapi</groupId> + <artifactId>servletapi</artifactId> + </exclusion> + </exclusions--> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <version>2.0</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.7.0</version> + </dependency> + + <dependency> + <groupId>commons-chain</groupId> + <artifactId>commons-chain</artifactId> + <version>1.0</version> + </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.0</version> + </dependency> + + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>1.6</version> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.4</version> + </dependency> + + <dependency> + <groupId>commons-validator</groupId> + <artifactId>commons-validator</artifactId> + <version>1.3.0</version> + </dependency> + + <dependency> + <groupId>oro</groupId> + <artifactId>oro</artifactId> + <version>2.0.8</version> + </dependency> + + <dependency> + <groupId>antlr</groupId> + <artifactId>antlr</artifactId> + <version>2.7.2</version> + </dependency> + </dependencies> + </dependencyManagement> + + +</project> Modified: struts/shale/branches/mvn_reorg/shale-core/pom.xml URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-core/pom.xml?rev=413253&r1=413252&r2=413253&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-core/pom.xml (original) +++ struts/shale/branches/mvn_reorg/shale-core/pom.xml Fri Jun 9 22:41:58 2006 @@ -1,82 +1,82 @@ -<!-- -/* - * Copyright 2006 The Apache Software 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. - * - * $Id: pom.xml 160291 2006-05-31 20:49:24Z wsmoak $ - */ ---> -<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> - - <parent> - <groupId>org.apache.struts.shale</groupId> - <artifactId>shale-parent</artifactId> - <version>1.0.3-SNAPSHOT</version> - </parent> - - <artifactId>shale-core</artifactId> - <packaging>jar</packaging> - <name>Shale Core Library</name> - <url>http://struts.apache.org/struts-shale</url> - - <dependencies> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - <dependency> - <groupId>commons-chain</groupId> - <artifactId>commons-chain</artifactId> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jsp-api</artifactId> - </dependency> - <dependency> - <groupId>commons-validator</groupId> - <artifactId>commons-validator</artifactId> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.struts.shale</groupId> - <artifactId>shale-test</artifactId> - <version>${version}</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemProperties> - <property> - <name>documentRoot</name> - <value>${basedir}/target/test-classes</value> - </property> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - -</project> +<!-- +/* + * Copyright 2006 The Apache Software 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. + * + * $Id: pom.xml 160291 2006-05-31 20:49:24Z wsmoak $ + */ +--> +<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> + + <parent> + <groupId>org.apache.struts.shale</groupId> + <artifactId>shale-parent</artifactId> + <version>1.0.3-SNAPSHOT</version> + </parent> + + <artifactId>shale-core</artifactId> + <packaging>jar</packaging> + <name>Shale Core Library</name> + <url>http://struts.apache.org/struts-shale</url> + + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </dependency> + <dependency> + <groupId>commons-chain</groupId> + <artifactId>commons-chain</artifactId> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + </dependency> + <dependency> + <groupId>commons-validator</groupId> + <artifactId>commons-validator</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.struts.shale</groupId> + <artifactId>shale-test</artifactId> + <version>${version}</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemProperties> + <property> + <name>documentRoot</name> + <value>${basedir}/target/test-classes</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + +</project> Modified: struts/shale/branches/mvn_reorg/shale-spring/pom.xml URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-spring/pom.xml?rev=413253&r1=413252&r2=413253&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-spring/pom.xml (original) +++ struts/shale/branches/mvn_reorg/shale-spring/pom.xml Fri Jun 9 22:41:58 2006 @@ -1,75 +1,75 @@ -<!-- -/* - * Copyright 2006 The Apache Software 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. - * - * $Id: pom.xml 160258 2006-05-21 01:56:12Z wsmoak $ - */ ---> -<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> - - <parent> - <groupId>org.apache.struts.shale</groupId> - <artifactId>shale-parent</artifactId> - <version>1.0.3-SNAPSHOT</version> - </parent> - - <artifactId>shale-spring</artifactId> - <packaging>jar</packaging> - <name>Shale-Spring Integration</name> - <url>http://struts.apache.org/struts-shale</url> - - <dependencies> - - <dependency> - <groupId>org.apache.struts.shale</groupId> - <artifactId>shale-core</artifactId> - <version>1.0.3-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - <version>1.2.2</version> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <version>1.2.2</version> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - <version>1.2.2</version> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - <version>1.2.2</version> - <exclusions> - <exclusion> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - </exclusion> - </exclusions> - </dependency> - - </dependencies> - -</project> +<!-- +/* + * Copyright 2006 The Apache Software 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. + * + * $Id: pom.xml 160258 2006-05-21 01:56:12Z wsmoak $ + */ +--> +<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> + + <parent> + <groupId>org.apache.struts.shale</groupId> + <artifactId>shale-parent</artifactId> + <version>1.0.3-SNAPSHOT</version> + </parent> + + <artifactId>shale-spring</artifactId> + <packaging>jar</packaging> + <name>Shale-Spring Integration</name> + <url>http://struts.apache.org/struts-shale</url> + + <dependencies> + + <dependency> + <groupId>org.apache.struts.shale</groupId> + <artifactId>shale-core</artifactId> + <version>1.0.3-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + <version>1.2.2</version> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>1.2.2</version> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>1.2.2</version> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + <version>1.2.2</version> + <exclusions> + <exclusion> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + </exclusion> + </exclusions> + </dependency> + + </dependencies> + +</project> Modified: struts/shale/branches/mvn_reorg/shale-tiles/pom.xml URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-tiles/pom.xml?rev=413253&r1=413252&r2=413253&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-tiles/pom.xml (original) +++ struts/shale/branches/mvn_reorg/shale-tiles/pom.xml Fri Jun 9 22:41:58 2006 @@ -1,52 +1,52 @@ -<!-- -/* - * Copyright 2006 The Apache Software 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. - * - * $Id: pom.xml 160258 2006-05-21 01:56:12Z wsmoak $ - */ ---> -<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> - - <parent> - <groupId>org.apache.struts.shale</groupId> - <artifactId>shale-parent</artifactId> - <version>1.0.3-SNAPSHOT</version> - </parent> - - <artifactId>shale-tiles</artifactId> - <packaging>jar</packaging> - <name>Shale Tiles Integration</name> - <url>http://struts.apache.org/struts-shale</url> - - <dependencies> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.struts.shale</groupId> - <artifactId>shale-core</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>org.apache.struts.tiles</groupId> - <artifactId>tiles-core</artifactId> - <version>0.2-SNAPSHOT</version> - </dependency> - </dependencies> - -</project> +<!-- +/* + * Copyright 2006 The Apache Software 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. + * + * $Id: pom.xml 160258 2006-05-21 01:56:12Z wsmoak $ + */ +--> +<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> + + <parent> + <groupId>org.apache.struts.shale</groupId> + <artifactId>shale-parent</artifactId> + <version>1.0.3-SNAPSHOT</version> + </parent> + + <artifactId>shale-tiles</artifactId> + <packaging>jar</packaging> + <name>Shale Tiles Integration</name> + <url>http://struts.apache.org/struts-shale</url> + + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.struts.shale</groupId> + <artifactId>shale-core</artifactId> + <version>${pom.version}</version> + </dependency> + <dependency> + <groupId>org.apache.struts.tiles</groupId> + <artifactId>tiles-core</artifactId> + <version>0.2-SNAPSHOT</version> + </dependency> + </dependencies> + +</project>