ISIS-928: single <repositories> tag in the example apps' parent pom.xml. Convert tabs to spaces.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/93a30cbb Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/93a30cbb Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/93a30cbb Branch: refs/heads/master Commit: 93a30cbb2c75291c1843d94db806dd70473463b2 Parents: cd53c31 Author: Dan Haywood <[email protected]> Authored: Sat Nov 15 10:08:47 2014 +0000 Committer: Dan Haywood <[email protected]> Committed: Sat Nov 15 10:08:47 2014 +0000 ---------------------------------------------------------------------- example/application/simpleapp/pom.xml | 206 ++++++++++++++-------------- example/application/todoapp/pom.xml | 207 +++++++++++++++-------------- 2 files changed, 207 insertions(+), 206 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/93a30cbb/example/application/simpleapp/pom.xml ---------------------------------------------------------------------- diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml index 93daa71..d8e7297 100644 --- a/example/application/simpleapp/pom.xml +++ b/example/application/simpleapp/pom.xml @@ -18,7 +18,7 @@ under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/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> <groupId>org.apache.isis.example.application</groupId> @@ -33,7 +33,7 @@ <maven>3.0.4</maven> </prerequisites> - <properties> + <properties> <isis.version>1.8.0-SNAPSHOT</isis.version> <isis-viewer-wicket.version>1.8.0-SNAPSHOT</isis-viewer-wicket.version> @@ -43,20 +43,30 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - </properties> - + </properties> + <repositories> <repository> - <id>apache.snapshots</id> - <name>Apache Snapshots</name> - <url>https://repository.apache.org/content/repositories/snapshots/</url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> + <id>apache.snapshots</id> + <name>Apache Snapshots</name> + <url>https://repository.apache.org/content/repositories/snapshots/</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + <repository> + <id>Cloudbees snapshots</id> + <url>http://repository-estatio.forge.cloudbees.com/snapshot/</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </repository> </repositories> <build> @@ -220,69 +230,71 @@ <exclude>**/*.js</exclude> </excludes> <licenses> - <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> - <licenseFamilyCategory>AL2 </licenseFamilyCategory> - <licenseFamilyName>Apache License 2.0</licenseFamilyName> - <notes /> - <patterns> - <pattern>Licensed to the Apache Software Foundation (ASF) under one</pattern> - </patterns> - </license> - <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> - <licenseFamilyCategory>JQRY</licenseFamilyCategory> - <licenseFamilyName>MIT </licenseFamilyName> - <notes /> - <patterns> - <pattern>Dual licensed under the MIT or GPL Version 2 licenses.</pattern> - </patterns> - </license> - <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> - <licenseFamilyCategory>JMOCK</licenseFamilyCategory> - <licenseFamilyName>JMock</licenseFamilyName> - <notes /> - <patterns> - <pattern>Copyright (c) 2000-2007, jMock.org</pattern> - </patterns> - </license> - <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> - <licenseFamilyCategory>DOCBK</licenseFamilyCategory> - <licenseFamilyName>DocBook 4.5</licenseFamilyName> - <notes /> - <patterns> - <pattern>Permission to copy in any form is granted for use</pattern> - <pattern>Permission to use, copy, modify and distribute the DocBook DTD</pattern> - <pattern>is hereby granted in perpetuity, provided that the above copyright</pattern> - <pattern>This is the catalog data file for DocBook XML V4.5. It is provided as</pattern> - <pattern>XML Catalog data for DocBook XML V4.5</pattern> - <pattern>DocBook additional general entities V4.5</pattern> - <pattern>XML EXCHANGE TABLE MODEL DECLARATION MODULE</pattern> - </patterns> - </license> - <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> - <licenseFamilyCategory>W3C </licenseFamilyCategory> - <licenseFamilyName>XHTML</licenseFamilyName> - <notes /> - <patterns> - <pattern>Copyright (c) 1998-2002 W3C (MIT, INRIA, Keio),</pattern> - </patterns> - </license> + <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> + <licenseFamilyCategory>AL2</licenseFamilyCategory> + <licenseFamilyName>Apache License 2.0</licenseFamilyName> + <notes/> + <patterns> + <pattern>Licensed to the Apache Software Foundation (ASF) under one</pattern> + </patterns> + </license> + <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> + <licenseFamilyCategory>JQRY</licenseFamilyCategory> + <licenseFamilyName>MIT</licenseFamilyName> + <notes/> + <patterns> + <pattern>Dual licensed under the MIT or GPL Version 2 licenses.</pattern> + </patterns> + </license> + <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> + <licenseFamilyCategory>JMOCK</licenseFamilyCategory> + <licenseFamilyName>JMock</licenseFamilyName> + <notes/> + <patterns> + <pattern>Copyright (c) 2000-2007, jMock.org</pattern> + </patterns> + </license> + <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> + <licenseFamilyCategory>DOCBK</licenseFamilyCategory> + <licenseFamilyName>DocBook 4.5</licenseFamilyName> + <notes/> + <patterns> + <pattern>Permission to copy in any form is granted for use</pattern> + <pattern>Permission to use, copy, modify and distribute the DocBook DTD</pattern> + <pattern>is hereby granted in perpetuity, provided that the above copyright + </pattern> + <pattern>This is the catalog data file for DocBook XML V4.5. It is provided as + </pattern> + <pattern>XML Catalog data for DocBook XML V4.5</pattern> + <pattern>DocBook additional general entities V4.5</pattern> + <pattern>XML EXCHANGE TABLE MODEL DECLARATION MODULE</pattern> + </patterns> + </license> + <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> + <licenseFamilyCategory>W3C</licenseFamilyCategory> + <licenseFamilyName>XHTML</licenseFamilyName> + <notes/> + <patterns> + <pattern>Copyright (c) 1998-2002 W3C (MIT, INRIA, Keio),</pattern> + </patterns> + </license> </licenses> <licenseFamilies> - <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily"> - <familyName>Apache License 2.0</familyName> - </licenseFamily> - <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily"> - <familyName>MIT</familyName> - </licenseFamily> - <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily"> - <familyName>JMock</familyName> - </licenseFamily> - <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily"> - <familyName>DocBook 4.5</familyName> - </licenseFamily> - <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily"> - <familyName>XHTML</familyName> - </licenseFamily> + <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily"> + <familyName>Apache License 2.0</familyName> + </licenseFamily> + <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily"> + <familyName>MIT</familyName> + </licenseFamily> + <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily"> + <familyName>JMock</familyName> + </licenseFamily> + <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily"> + <familyName>DocBook 4.5</familyName> + </licenseFamily> + <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily"> + <familyName>XHTML</familyName> + </licenseFamily> </licenseFamilies> </configuration> </plugin> @@ -306,25 +318,25 @@ <module>integtests</module> <module>webapp</module> </modules> - + <dependencyManagement> <dependencies> - <dependency> - <groupId>org.apache.isis.core</groupId> - <artifactId>isis</artifactId> - <version>${isis.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> + <dependency> + <groupId>org.apache.isis.core</groupId> + <artifactId>isis</artifactId> + <version>${isis.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> - <dependency> - <groupId>org.apache.isis.viewer</groupId> - <artifactId>isis-viewer-wicket</artifactId> - <version>${isis-viewer-wicket.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> + <dependency> + <groupId>org.apache.isis.viewer</groupId> + <artifactId>isis-viewer-wicket</artifactId> + <version>${isis-viewer-wicket.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> <!-- this project's own modules --> @@ -347,7 +359,7 @@ </dependencies> </dependencyManagement> - + <profiles> <profile> @@ -363,16 +375,4 @@ </profile> </profiles> - <repositories> - <repository> - <id>Cloudbees snapshots</id> - <url>http://repository-estatio.forge.cloudbees.com/snapshot/</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </repository> - </repositories> </project> http://git-wip-us.apache.org/repos/asf/isis/blob/93a30cbb/example/application/todoapp/pom.xml ---------------------------------------------------------------------- diff --git a/example/application/todoapp/pom.xml b/example/application/todoapp/pom.xml index e949ec3..c47dc8e 100644 --- a/example/application/todoapp/pom.xml +++ b/example/application/todoapp/pom.xml @@ -18,7 +18,7 @@ under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/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> <groupId>org.apache.isis.example.application</groupId> @@ -33,7 +33,7 @@ <maven>3.0.4</maven> </prerequisites> - <properties> + <properties> <isis.version>1.8.0-SNAPSHOT</isis.version> <isis-viewer-wicket.version>1.8.0-SNAPSHOT</isis-viewer-wicket.version> @@ -43,20 +43,30 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - </properties> - + </properties> + <repositories> <repository> - <id>apache.snapshots</id> - <name>Apache Snapshots</name> - <url>https://repository.apache.org/content/repositories/snapshots/</url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> + <id>apache.snapshots</id> + <name>Apache Snapshots</name> + <url>https://repository.apache.org/content/repositories/snapshots/</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + <repository> + <id>Cloudbees snapshots</id> + <url>http://repository-estatio.forge.cloudbees.com/snapshot/</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </repository> </repositories> <build> @@ -205,6 +215,7 @@ <exclude>**/*.project</exclude> <exclude>**/.classpath</exclude> <exclude>**/.settings/**</exclude> + <exclude>**/*.launch</exclude> <exclude>**/ide/eclipse/launch/**</exclude> <exclude>**/ide/intellij/launch/**</exclude> <exclude>src/site/resources/ide/eclipse/**</exclude> @@ -219,69 +230,71 @@ <exclude>**/*.js</exclude> </excludes> <licenses> - <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> - <licenseFamilyCategory>AL2 </licenseFamilyCategory> - <licenseFamilyName>Apache License 2.0</licenseFamilyName> - <notes /> - <patterns> - <pattern>Licensed to the Apache Software Foundation (ASF) under one</pattern> - </patterns> - </license> - <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> - <licenseFamilyCategory>JQRY</licenseFamilyCategory> - <licenseFamilyName>MIT </licenseFamilyName> - <notes /> - <patterns> - <pattern>Dual licensed under the MIT or GPL Version 2 licenses.</pattern> - </patterns> - </license> - <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> - <licenseFamilyCategory>JMOCK</licenseFamilyCategory> - <licenseFamilyName>JMock</licenseFamilyName> - <notes /> - <patterns> - <pattern>Copyright (c) 2000-2007, jMock.org</pattern> - </patterns> - </license> - <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> - <licenseFamilyCategory>DOCBK</licenseFamilyCategory> - <licenseFamilyName>DocBook 4.5</licenseFamilyName> - <notes /> - <patterns> - <pattern>Permission to copy in any form is granted for use</pattern> - <pattern>Permission to use, copy, modify and distribute the DocBook DTD</pattern> - <pattern>is hereby granted in perpetuity, provided that the above copyright</pattern> - <pattern>This is the catalog data file for DocBook XML V4.5. It is provided as</pattern> - <pattern>XML Catalog data for DocBook XML V4.5</pattern> - <pattern>DocBook additional general entities V4.5</pattern> - <pattern>XML EXCHANGE TABLE MODEL DECLARATION MODULE</pattern> - </patterns> - </license> - <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> - <licenseFamilyCategory>W3C </licenseFamilyCategory> - <licenseFamilyName>XHTML</licenseFamilyName> - <notes /> - <patterns> - <pattern>Copyright (c) 1998-2002 W3C (MIT, INRIA, Keio),</pattern> - </patterns> - </license> + <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> + <licenseFamilyCategory>AL2</licenseFamilyCategory> + <licenseFamilyName>Apache License 2.0</licenseFamilyName> + <notes/> + <patterns> + <pattern>Licensed to the Apache Software Foundation (ASF) under one</pattern> + </patterns> + </license> + <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> + <licenseFamilyCategory>JQRY</licenseFamilyCategory> + <licenseFamilyName>MIT</licenseFamilyName> + <notes/> + <patterns> + <pattern>Dual licensed under the MIT or GPL Version 2 licenses.</pattern> + </patterns> + </license> + <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> + <licenseFamilyCategory>JMOCK</licenseFamilyCategory> + <licenseFamilyName>JMock</licenseFamilyName> + <notes/> + <patterns> + <pattern>Copyright (c) 2000-2007, jMock.org</pattern> + </patterns> + </license> + <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> + <licenseFamilyCategory>DOCBK</licenseFamilyCategory> + <licenseFamilyName>DocBook 4.5</licenseFamilyName> + <notes/> + <patterns> + <pattern>Permission to copy in any form is granted for use</pattern> + <pattern>Permission to use, copy, modify and distribute the DocBook DTD</pattern> + <pattern>is hereby granted in perpetuity, provided that the above copyright + </pattern> + <pattern>This is the catalog data file for DocBook XML V4.5. It is provided as + </pattern> + <pattern>XML Catalog data for DocBook XML V4.5</pattern> + <pattern>DocBook additional general entities V4.5</pattern> + <pattern>XML EXCHANGE TABLE MODEL DECLARATION MODULE</pattern> + </patterns> + </license> + <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> + <licenseFamilyCategory>W3C</licenseFamilyCategory> + <licenseFamilyName>XHTML</licenseFamilyName> + <notes/> + <patterns> + <pattern>Copyright (c) 1998-2002 W3C (MIT, INRIA, Keio),</pattern> + </patterns> + </license> </licenses> <licenseFamilies> - <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily"> - <familyName>Apache License 2.0</familyName> - </licenseFamily> - <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily"> - <familyName>MIT</familyName> - </licenseFamily> - <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily"> - <familyName>JMock</familyName> - </licenseFamily> - <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily"> - <familyName>DocBook 4.5</familyName> - </licenseFamily> - <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily"> - <familyName>XHTML</familyName> - </licenseFamily> + <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily"> + <familyName>Apache License 2.0</familyName> + </licenseFamily> + <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily"> + <familyName>MIT</familyName> + </licenseFamily> + <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily"> + <familyName>JMock</familyName> + </licenseFamily> + <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily"> + <familyName>DocBook 4.5</familyName> + </licenseFamily> + <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily"> + <familyName>XHTML</familyName> + </licenseFamily> </licenseFamilies> </configuration> </plugin> @@ -305,25 +318,25 @@ <module>integtests</module> <module>webapp</module> </modules> - + <dependencyManagement> <dependencies> - <dependency> - <groupId>org.apache.isis.core</groupId> - <artifactId>isis</artifactId> - <version>${isis.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> + <dependency> + <groupId>org.apache.isis.core</groupId> + <artifactId>isis</artifactId> + <version>${isis.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> - <dependency> - <groupId>org.apache.isis.viewer</groupId> - <artifactId>isis-viewer-wicket</artifactId> - <version>${isis-viewer-wicket.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> + <dependency> + <groupId>org.apache.isis.viewer</groupId> + <artifactId>isis-viewer-wicket</artifactId> + <version>${isis-viewer-wicket.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> <!-- this project's own modules --> @@ -346,7 +359,7 @@ </dependencies> </dependencyManagement> - + <profiles> <profile> @@ -362,16 +375,4 @@ </profile> </profiles> - <repositories> - <repository> - <id>Cloudbees snapshots</id> - <url>http://repository-estatio.forge.cloudbees.com/snapshot/</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </repository> - </repositories> </project>
