Author: olamy Date: Wed Aug 1 15:11:02 2012 New Revision: 1368043 URL: http://svn.apache.org/viewvc?rev=1368043&view=rev Log: move to a flat structure to be able to release archetype per archetype more easily
Added: maven/archetypes/trunk/maven-archetype-parent/ maven/archetypes/trunk/maven-archetype-parent/maven-archetype-bundles (1).iml maven/archetypes/trunk/maven-archetype-parent/pom.xml (with props) maven/archetypes/trunk/maven-archetype-parent/target/ maven/archetypes/trunk/maven-archetype-parent/target/.plxarc maven/archetypes/trunk/maven-archetype-parent/target/maven-shared-archive-resources/ maven/archetypes/trunk/maven-archetype-parent/target/maven-shared-archive-resources/META-INF/ maven/archetypes/trunk/maven-archetype-parent/target/maven-shared-archive-resources/META-INF/DEPENDENCIES maven/archetypes/trunk/maven-archetype-parent/target/maven-shared-archive-resources/META-INF/LICENSE maven/archetypes/trunk/maven-archetype-parent/target/maven-shared-archive-resources/META-INF/NOTICE maven/archetypes/trunk/maven-archetype-parent/target/rat.txt (with props) Modified: maven/archetypes/trunk/maven-archetype-archetype/pom.xml maven/archetypes/trunk/maven-archetype-j2ee-simple/pom.xml maven/archetypes/trunk/maven-archetype-plugin-site/pom.xml maven/archetypes/trunk/maven-archetype-plugin/pom.xml maven/archetypes/trunk/maven-archetype-portlet/pom.xml maven/archetypes/trunk/maven-archetype-profiles/pom.xml maven/archetypes/trunk/maven-archetype-quickstart/pom.xml maven/archetypes/trunk/maven-archetype-simple/pom.xml maven/archetypes/trunk/maven-archetype-site-simple/pom.xml maven/archetypes/trunk/maven-archetype-site/pom.xml maven/archetypes/trunk/maven-archetype-webapp/pom.xml maven/archetypes/trunk/pom.xml Modified: maven/archetypes/trunk/maven-archetype-archetype/pom.xml URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-archetype/pom.xml?rev=1368043&r1=1368042&r2=1368043&view=diff ============================================================================== --- maven/archetypes/trunk/maven-archetype-archetype/pom.xml (original) +++ maven/archetypes/trunk/maven-archetype-archetype/pom.xml Wed Aug 1 15:11:02 2012 @@ -27,6 +27,7 @@ under the License. <artifactId>maven-archetype-bundles</artifactId> <groupId>org.apache.maven.archetypes</groupId> <version>5-SNAPSHOT</version> + <relativePath>../maven-archetype-parent</relativePath> </parent> <artifactId>maven-archetype-archetype</artifactId> Modified: maven/archetypes/trunk/maven-archetype-j2ee-simple/pom.xml URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-j2ee-simple/pom.xml?rev=1368043&r1=1368042&r2=1368043&view=diff ============================================================================== --- maven/archetypes/trunk/maven-archetype-j2ee-simple/pom.xml (original) +++ maven/archetypes/trunk/maven-archetype-j2ee-simple/pom.xml Wed Aug 1 15:11:02 2012 @@ -27,6 +27,7 @@ under the License. <artifactId>maven-archetype-bundles</artifactId> <groupId>org.apache.maven.archetypes</groupId> <version>5-SNAPSHOT</version> + <relativePath>../maven-archetype-parent</relativePath> </parent> <artifactId>maven-archetype-j2ee-simple</artifactId> Added: maven/archetypes/trunk/maven-archetype-parent/maven-archetype-bundles (1).iml URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-parent/maven-archetype-bundles%20%281%29.iml?rev=1368043&view=auto ============================================================================== --- maven/archetypes/trunk/maven-archetype-parent/maven-archetype-bundles (1).iml (added) +++ maven/archetypes/trunk/maven-archetype-parent/maven-archetype-bundles (1).iml Wed Aug 1 15:11:02 2012 @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/target/classes" /> + <output-test url="file://$MODULE_DIR$/target/test-classes" /> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <excludeFolder url="file://$MODULE_DIR$/target" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + </component> +</module> + Added: maven/archetypes/trunk/maven-archetype-parent/pom.xml URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-parent/pom.xml?rev=1368043&view=auto ============================================================================== --- maven/archetypes/trunk/maven-archetype-parent/pom.xml (added) +++ maven/archetypes/trunk/maven-archetype-parent/pom.xml Wed Aug 1 15:11:02 2012 @@ -0,0 +1,115 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +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. +--> + +<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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.maven.archetype</groupId> + <artifactId>maven-archetype</artifactId> + <version>2.2</version> + </parent> + + <groupId>org.apache.maven.archetypes</groupId> + <artifactId>maven-archetype-bundles</artifactId> + <version>5-SNAPSHOT</version> + <packaging>pom</packaging> + + <name>Maven Archetypes</name> + <description>Archetypes provided by Maven.</description> + + <scm> + <connection>scm:svn:http://svn.apache.org/repos/asf/maven/archetypes/trunk</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/archetypes/trunk</developerConnection> + <url>http://svn.apache.org/viewvc/maven/archetypes/trunk</url> + </scm> + <issueManagement> + <system>jira</system> + <url>http://jira.codehaus.org/browse/MARCHETYPES</url> + </issueManagement> + + <build> + <extensions> + <extension> + <groupId>org.apache.maven.archetype</groupId> + <artifactId>archetype-packaging</artifactId> + <version>2.2</version> + </extension> + </extensions> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-archetype-plugin</artifactId> + <version>2.2</version> + </plugin> + </plugins> + </pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <exclude>.gitignore</exclude> + <exclude>DEPENDENCIES</exclude> + <exclude>README.txt</exclude> + <exclude>*.sh</exclude> + <exclude>.git/**</exclude> + <exclude>.idea/**</exclude> + <exclude>**/generated-sources/**</exclude> + <exclude>**/.gitattributes</exclude> + <!-- disable test directories --> + <exclude>src/test/**</exclude> + <exclude>src/it/**</exclude> + <exclude>.repository/**</exclude><!-- for CI --> + <exclude>**/archetype-resources/**</exclude> + <exclude>**/archetype-resources/**</exclude> + </excludes> + </configuration> + <executions> + <execution> + <id>rat-check</id> + <goals> + <goal>check</goal> + </goals> + <phase>verify</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <repositories> + <repository> + <id>apache.snapshots</id> + <name>Apache Snapshot Repository</name> + <url>http://repository.apache.org/snapshots</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + </repositories> + +</project> Propchange: maven/archetypes/trunk/maven-archetype-parent/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/archetypes/trunk/maven-archetype-parent/pom.xml ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Added: maven/archetypes/trunk/maven-archetype-parent/target/.plxarc URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-parent/target/.plxarc?rev=1368043&view=auto ============================================================================== --- maven/archetypes/trunk/maven-archetype-parent/target/.plxarc (added) +++ maven/archetypes/trunk/maven-archetype-parent/target/.plxarc Wed Aug 1 15:11:02 2012 @@ -0,0 +1 @@ +maven-shared-archive-resources \ No newline at end of file Added: maven/archetypes/trunk/maven-archetype-parent/target/maven-shared-archive-resources/META-INF/DEPENDENCIES URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-parent/target/maven-shared-archive-resources/META-INF/DEPENDENCIES?rev=1368043&view=auto ============================================================================== --- maven/archetypes/trunk/maven-archetype-parent/target/maven-shared-archive-resources/META-INF/DEPENDENCIES (added) +++ maven/archetypes/trunk/maven-archetype-parent/target/maven-shared-archive-resources/META-INF/DEPENDENCIES Wed Aug 1 15:11:02 2012 @@ -0,0 +1,11 @@ +// ------------------------------------------------------------------ +// Transitive dependencies of this project determined from the +// maven pom organized by organization. +// ------------------------------------------------------------------ + +Maven Archetypes + + + + + Added: maven/archetypes/trunk/maven-archetype-parent/target/maven-shared-archive-resources/META-INF/LICENSE URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-parent/target/maven-shared-archive-resources/META-INF/LICENSE?rev=1368043&view=auto ============================================================================== --- maven/archetypes/trunk/maven-archetype-parent/target/maven-shared-archive-resources/META-INF/LICENSE (added) +++ maven/archetypes/trunk/maven-archetype-parent/target/maven-shared-archive-resources/META-INF/LICENSE Wed Aug 1 15:11:02 2012 @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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. Added: maven/archetypes/trunk/maven-archetype-parent/target/maven-shared-archive-resources/META-INF/NOTICE URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-parent/target/maven-shared-archive-resources/META-INF/NOTICE?rev=1368043&view=auto ============================================================================== --- maven/archetypes/trunk/maven-archetype-parent/target/maven-shared-archive-resources/META-INF/NOTICE (added) +++ maven/archetypes/trunk/maven-archetype-parent/target/maven-shared-archive-resources/META-INF/NOTICE Wed Aug 1 15:11:02 2012 @@ -0,0 +1,8 @@ + +Maven Archetypes +Copyright 2007-2012 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + + Added: maven/archetypes/trunk/maven-archetype-parent/target/rat.txt URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-parent/target/rat.txt?rev=1368043&view=auto ============================================================================== --- maven/archetypes/trunk/maven-archetype-parent/target/rat.txt (added) +++ maven/archetypes/trunk/maven-archetype-parent/target/rat.txt Wed Aug 1 15:11:02 2012 @@ -0,0 +1,37 @@ + +***************************************************** +Summary +------- +Notes: 0 +Binaries: 0 +Archives: 0 +Standards: 1 + +Apache Licensed: 1 +Generated Documents: 0 + +JavaDocs are generated and so license header is optional +Generated files do not required license headers + +0 Unknown Licenses + +******************************* + +Unapproved licenses: + + +******************************* + +Archives: + +***************************************************** + Files with Apache License headers will be marked AL + Binary files (which do not require AL headers) will be marked B + Compressed archives will be marked A + Notices, licenses etc will be marked N + AL /Users/olamy/dev/sources/maven/archetypes/maven-archetype-parent/pom.xml + + ***************************************************** + Printing headers for files without AL header... + + \ No newline at end of file Propchange: maven/archetypes/trunk/maven-archetype-parent/target/rat.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/archetypes/trunk/maven-archetype-parent/target/rat.txt ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Modified: maven/archetypes/trunk/maven-archetype-plugin-site/pom.xml URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-plugin-site/pom.xml?rev=1368043&r1=1368042&r2=1368043&view=diff ============================================================================== --- maven/archetypes/trunk/maven-archetype-plugin-site/pom.xml (original) +++ maven/archetypes/trunk/maven-archetype-plugin-site/pom.xml Wed Aug 1 15:11:02 2012 @@ -26,6 +26,7 @@ under the License. <artifactId>maven-archetype-bundles</artifactId> <groupId>org.apache.maven.archetypes</groupId> <version>5-SNAPSHOT</version> + <relativePath>../maven-archetype-parent</relativePath> </parent> <artifactId>maven-archetype-plugin-site</artifactId> Modified: maven/archetypes/trunk/maven-archetype-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-plugin/pom.xml?rev=1368043&r1=1368042&r2=1368043&view=diff ============================================================================== --- maven/archetypes/trunk/maven-archetype-plugin/pom.xml (original) +++ maven/archetypes/trunk/maven-archetype-plugin/pom.xml Wed Aug 1 15:11:02 2012 @@ -26,6 +26,7 @@ under the License. <artifactId>maven-archetype-bundles</artifactId> <groupId>org.apache.maven.archetypes</groupId> <version>5-SNAPSHOT</version> + <relativePath>../maven-archetype-parent</relativePath> </parent> <artifactId>maven-archetype-plugin</artifactId> Modified: maven/archetypes/trunk/maven-archetype-portlet/pom.xml URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-portlet/pom.xml?rev=1368043&r1=1368042&r2=1368043&view=diff ============================================================================== --- maven/archetypes/trunk/maven-archetype-portlet/pom.xml (original) +++ maven/archetypes/trunk/maven-archetype-portlet/pom.xml Wed Aug 1 15:11:02 2012 @@ -27,6 +27,7 @@ under the License. <artifactId>maven-archetype-bundles</artifactId> <groupId>org.apache.maven.archetypes</groupId> <version>5-SNAPSHOT</version> + <relativePath>../maven-archetype-parent</relativePath> </parent> <artifactId>maven-archetype-portlet</artifactId> Modified: maven/archetypes/trunk/maven-archetype-profiles/pom.xml URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-profiles/pom.xml?rev=1368043&r1=1368042&r2=1368043&view=diff ============================================================================== --- maven/archetypes/trunk/maven-archetype-profiles/pom.xml (original) +++ maven/archetypes/trunk/maven-archetype-profiles/pom.xml Wed Aug 1 15:11:02 2012 @@ -27,6 +27,7 @@ under the License. <artifactId>maven-archetype-bundles</artifactId> <groupId>org.apache.maven.archetypes</groupId> <version>5-SNAPSHOT</version> + <relativePath>../maven-archetype-parent</relativePath> </parent> <artifactId>maven-archetype-profiles</artifactId> Modified: maven/archetypes/trunk/maven-archetype-quickstart/pom.xml URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-quickstart/pom.xml?rev=1368043&r1=1368042&r2=1368043&view=diff ============================================================================== --- maven/archetypes/trunk/maven-archetype-quickstart/pom.xml (original) +++ maven/archetypes/trunk/maven-archetype-quickstart/pom.xml Wed Aug 1 15:11:02 2012 @@ -26,6 +26,7 @@ under the License. <artifactId>maven-archetype-bundles</artifactId> <groupId>org.apache.maven.archetypes</groupId> <version>5-SNAPSHOT</version> + <relativePath>../maven-archetype-parent</relativePath> </parent> <artifactId>maven-archetype-quickstart</artifactId> Modified: maven/archetypes/trunk/maven-archetype-simple/pom.xml URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-simple/pom.xml?rev=1368043&r1=1368042&r2=1368043&view=diff ============================================================================== --- maven/archetypes/trunk/maven-archetype-simple/pom.xml (original) +++ maven/archetypes/trunk/maven-archetype-simple/pom.xml Wed Aug 1 15:11:02 2012 @@ -27,6 +27,7 @@ under the License. <artifactId>maven-archetype-bundles</artifactId> <groupId>org.apache.maven.archetypes</groupId> <version>5-SNAPSHOT</version> + <relativePath>../maven-archetype-parent</relativePath> </parent> <artifactId>maven-archetype-simple</artifactId> Modified: maven/archetypes/trunk/maven-archetype-site-simple/pom.xml URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-site-simple/pom.xml?rev=1368043&r1=1368042&r2=1368043&view=diff ============================================================================== --- maven/archetypes/trunk/maven-archetype-site-simple/pom.xml (original) +++ maven/archetypes/trunk/maven-archetype-site-simple/pom.xml Wed Aug 1 15:11:02 2012 @@ -26,6 +26,7 @@ under the License. <artifactId>maven-archetype-bundles</artifactId> <groupId>org.apache.maven.archetypes</groupId> <version>5-SNAPSHOT</version> + <relativePath>../maven-archetype-parent</relativePath> </parent> <artifactId>maven-archetype-site-simple</artifactId> Modified: maven/archetypes/trunk/maven-archetype-site/pom.xml URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-site/pom.xml?rev=1368043&r1=1368042&r2=1368043&view=diff ============================================================================== --- maven/archetypes/trunk/maven-archetype-site/pom.xml (original) +++ maven/archetypes/trunk/maven-archetype-site/pom.xml Wed Aug 1 15:11:02 2012 @@ -26,6 +26,7 @@ under the License. <artifactId>maven-archetype-bundles</artifactId> <groupId>org.apache.maven.archetypes</groupId> <version>5-SNAPSHOT</version> + <relativePath>../maven-archetype-parent</relativePath> </parent> <artifactId>maven-archetype-site</artifactId> Modified: maven/archetypes/trunk/maven-archetype-webapp/pom.xml URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-webapp/pom.xml?rev=1368043&r1=1368042&r2=1368043&view=diff ============================================================================== --- maven/archetypes/trunk/maven-archetype-webapp/pom.xml (original) +++ maven/archetypes/trunk/maven-archetype-webapp/pom.xml Wed Aug 1 15:11:02 2012 @@ -27,6 +27,7 @@ under the License. <artifactId>maven-archetype-bundles</artifactId> <groupId>org.apache.maven.archetypes</groupId> <version>5-SNAPSHOT</version> + <relativePath>../maven-archetype-parent</relativePath> </parent> <artifactId>maven-archetype-webapp</artifactId> Modified: maven/archetypes/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/pom.xml?rev=1368043&r1=1368042&r2=1368043&view=diff ============================================================================== --- maven/archetypes/trunk/pom.xml (original) +++ maven/archetypes/trunk/pom.xml Wed Aug 1 15:11:02 2012 @@ -29,14 +29,15 @@ under the License. </parent> <groupId>org.apache.maven.archetypes</groupId> - <artifactId>maven-archetype-bundles</artifactId> - <version>5-SNAPSHOT</version> + <artifactId>maven-archetype-bundles-aggregator</artifactId> + <version>1-SNAPSHOT</version> <packaging>pom</packaging> <name>Maven Archetypes</name> <description>Archetypes provided by Maven.</description> <modules> + <module>maven-archetype-parent</module> <module>maven-archetype-archetype</module> <module>maven-archetype-j2ee-simple</module> <module>maven-archetype-plugin</module> @@ -50,68 +51,6 @@ under the License. <module>maven-archetype-webapp</module> </modules> - <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/maven/archetypes/trunk</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/archetypes/trunk</developerConnection> - <url>http://svn.apache.org/viewvc/maven/archetypes/trunk</url> - </scm> - <issueManagement> - <system>jira</system> - <url>http://jira.codehaus.org/browse/MARCHETYPES</url> - </issueManagement> - - <build> - <extensions> - <extension> - <groupId>org.apache.maven.archetype</groupId> - <artifactId>archetype-packaging</artifactId> - <version>2.2</version> - </extension> - </extensions> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-archetype-plugin</artifactId> - <version>2.2</version> - </plugin> - </plugins> - </pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes> - <exclude>.gitignore</exclude> - <exclude>DEPENDENCIES</exclude> - <exclude>README.txt</exclude> - <exclude>*.sh</exclude> - <exclude>.git/**</exclude> - <exclude>.idea/**</exclude> - <exclude>**/generated-sources/**</exclude> - <exclude>**/.gitattributes</exclude> - <!-- disable test directories --> - <exclude>src/test/**</exclude> - <exclude>src/it/**</exclude> - <exclude>.repository/**</exclude><!-- for CI --> - <exclude>**/archetype-resources/**</exclude> - <exclude>**/archetype-resources/**</exclude> - </excludes> - </configuration> - <executions> - <execution> - <id>rat-check</id> - <goals> - <goal>check</goal> - </goals> - <phase>verify</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> - <repositories> <repository> <id>apache.snapshots</id>