Author: brett Date: Sat Jun 25 04:03:36 2011 New Revision: 1139488 URL: http://svn.apache.org/viewvc?rev=1139488&view=rev Log: move "misc" to "dist" and add an intermediate parent clean up POMs
Added: incubator/npanday/trunk/dist/ - copied from r1139414, incubator/npanday/trunk/misc/ incubator/npanday/trunk/dist/pom.xml Removed: incubator/npanday/trunk/misc/ Modified: incubator/npanday/trunk/dist/dotnet-repository-builder/pom.xml incubator/npanday/trunk/dist/npanday-installer/pom.xml incubator/npanday/trunk/dist/npanday-repository-builder/pom.xml incubator/npanday/trunk/dist/npanday-skin/pom.xml incubator/npanday/trunk/pom.xml Modified: incubator/npanday/trunk/dist/dotnet-repository-builder/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dist/dotnet-repository-builder/pom.xml?rev=1139488&r1=1139414&r2=1139488&view=diff ============================================================================== --- incubator/npanday/trunk/dist/dotnet-repository-builder/pom.xml (original) +++ incubator/npanday/trunk/dist/dotnet-repository-builder/pom.xml Sat Jun 25 04:03:36 2011 @@ -20,19 +20,13 @@ 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"> <parent> <groupId>org.apache.npanday</groupId> - <artifactId>npanday-project</artifactId> + <artifactId>npanday-dist-parent</artifactId> <version>1.4.1-incubating-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>dotnet-repository-builder</artifactId> <name>NPanday :: .NET Repository Builder</name> <packaging>pom</packaging> - <scm> - <connection>scm:svn:https://npanday.svn.codeplex.com/svn/trunk/misc/dotnet-repository-builder</connection> - <developerConnection>scm:svn:https://npanday.svn.codeplex.com/svn/trunk/misc/dotnet-repository-builder</developerConnection> - <url>https://npanday.svn.codeplex.com/svn/trunk/misc/dotnet-repository-builder</url> - </scm> <dependencies> <!--assemblies--> <dependency> @@ -107,40 +101,40 @@ under the License. <groupId>org.apache.npanday.visualstudio</groupId> <artifactId>NPanday.VisualStudio.Addin</artifactId> <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>Microsoft.VisualStudio.CommandBars</groupId> - <artifactId>Microsoft.VisualStudio.CommandBars</artifactId> - </exclusion> - <exclusion> - <groupId>EnvDTE</groupId> - <artifactId>EnvDTE</artifactId> - </exclusion> - <exclusion> - <groupId>EnvDTE80</groupId> - <artifactId>EnvDTE80</artifactId> - </exclusion> - <exclusion> - <groupId>Extensibility</groupId> - <artifactId>Extensibility</artifactId> - </exclusion> - <exclusion> - <groupId>VSLangProj</groupId> - <artifactId>VSLangProj</artifactId> - </exclusion> - <exclusion> - <groupId>VSLangProj80</groupId> - <artifactId>VSLangProj80</artifactId> - </exclusion> - <exclusion> - <groupId>VsWebSite.Interop</groupId> - <artifactId>VsWebSite.Interop</artifactId> - </exclusion> - <exclusion> - <groupId>Microsoft.Build.Engine</groupId> - <artifactId>Microsoft.Build.Engine</artifactId> - </exclusion> - </exclusions> + <exclusions> + <exclusion> + <groupId>Microsoft.VisualStudio.CommandBars</groupId> + <artifactId>Microsoft.VisualStudio.CommandBars</artifactId> + </exclusion> + <exclusion> + <groupId>EnvDTE</groupId> + <artifactId>EnvDTE</artifactId> + </exclusion> + <exclusion> + <groupId>EnvDTE80</groupId> + <artifactId>EnvDTE80</artifactId> + </exclusion> + <exclusion> + <groupId>Extensibility</groupId> + <artifactId>Extensibility</artifactId> + </exclusion> + <exclusion> + <groupId>VSLangProj</groupId> + <artifactId>VSLangProj</artifactId> + </exclusion> + <exclusion> + <groupId>VSLangProj80</groupId> + <artifactId>VSLangProj80</artifactId> + </exclusion> + <exclusion> + <groupId>VsWebSite.Interop</groupId> + <artifactId>VsWebSite.Interop</artifactId> + </exclusion> + <exclusion> + <groupId>Microsoft.Build.Engine</groupId> + <artifactId>Microsoft.Build.Engine</artifactId> + </exclusion> + </exclusions> <type>visual-studio-addin</type> </dependency> Modified: incubator/npanday/trunk/dist/npanday-installer/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dist/npanday-installer/pom.xml?rev=1139488&r1=1139414&r2=1139488&view=diff ============================================================================== --- incubator/npanday/trunk/dist/npanday-installer/pom.xml (original) +++ incubator/npanday/trunk/dist/npanday-installer/pom.xml Sat Jun 25 04:03:36 2011 @@ -20,64 +20,59 @@ 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"> <parent> <groupId>org.apache.npanday</groupId> - <artifactId>npanday-project</artifactId> + <artifactId>npanday-dist-parent</artifactId> <version>1.4.1-incubating-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>npanday-installer</artifactId> <packaging>pom</packaging> <name>NPanday Windows Installer</name> - <scm> - <connection>scm:svn:https://npanday.svn.codeplex.com/svn/trunk/misc/npanday-installer</connection> - <developerConnection>scm:svn:https://npanday.svn.codeplex.com/svn/trunk/misc/npanday-installer</developerConnection> - <url>https://npanday.svn.codeplex.com/svn/trunk/misc/npanday-installer</url> - </scm> <dependencies> <dependency> <groupId>org.apache.npanday.visualstudio</groupId> <artifactId>NPanday.VisualStudio.Addin</artifactId> <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>Microsoft.VisualStudio.CommandBars</groupId> - <artifactId>Microsoft.VisualStudio.CommandBars</artifactId> - </exclusion> - <exclusion> - <groupId>EnvDTE</groupId> - <artifactId>EnvDTE</artifactId> - </exclusion> - <exclusion> - <groupId>EnvDTE80</groupId> - <artifactId>EnvDTE80</artifactId> - </exclusion> - <exclusion> - <groupId>Extensibility</groupId> - <artifactId>Extensibility</artifactId> - </exclusion> - <exclusion> - <groupId>VSLangProj</groupId> - <artifactId>VSLangProj</artifactId> - </exclusion> - <exclusion> - <groupId>VSLangProj80</groupId> - <artifactId>VSLangProj80</artifactId> - </exclusion> - <exclusion> - <groupId>VsWebSite.Interop</groupId> - <artifactId>VsWebSite.Interop</artifactId> - </exclusion> - <exclusion> - <groupId>Microsoft.Build.Engine</groupId> - <artifactId>Microsoft.Build.Engine</artifactId> - </exclusion> - </exclusions> + <exclusions> + <exclusion> + <groupId>Microsoft.VisualStudio.CommandBars</groupId> + <artifactId>Microsoft.VisualStudio.CommandBars</artifactId> + </exclusion> + <exclusion> + <groupId>EnvDTE</groupId> + <artifactId>EnvDTE</artifactId> + </exclusion> + <exclusion> + <groupId>EnvDTE80</groupId> + <artifactId>EnvDTE80</artifactId> + </exclusion> + <exclusion> + <groupId>Extensibility</groupId> + <artifactId>Extensibility</artifactId> + </exclusion> + <exclusion> + <groupId>VSLangProj</groupId> + <artifactId>VSLangProj</artifactId> + </exclusion> + <exclusion> + <groupId>VSLangProj80</groupId> + <artifactId>VSLangProj80</artifactId> + </exclusion> + <exclusion> + <groupId>VsWebSite.Interop</groupId> + <artifactId>VsWebSite.Interop</artifactId> + </exclusion> + <exclusion> + <groupId>Microsoft.Build.Engine</groupId> + <artifactId>Microsoft.Build.Engine</artifactId> + </exclusion> + </exclusions> <type>library</type> </dependency> </dependencies> <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <version>2.0</version> <executions> Modified: incubator/npanday/trunk/dist/npanday-repository-builder/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dist/npanday-repository-builder/pom.xml?rev=1139488&r1=1139414&r2=1139488&view=diff ============================================================================== --- incubator/npanday/trunk/dist/npanday-repository-builder/pom.xml (original) +++ incubator/npanday/trunk/dist/npanday-repository-builder/pom.xml Sat Jun 25 04:03:36 2011 @@ -20,21 +20,14 @@ 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"> <parent> <groupId>org.apache.npanday</groupId> - <artifactId>npanday-project</artifactId> + <artifactId>npanday-dist-parent</artifactId> <version>1.4.1-incubating-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>npanday-repository-builder</artifactId> <packaging>pom</packaging> <name>NPanday :: Repository Builder</name> - <scm> - <connection>scm:svn:https://npanday.svn.codeplex.com/svn/trunk/misc/npanday-repository-builder</connection> - <developerConnection>scm:svn:https://npanday.svn.codeplex.com/svn/trunk/misc/npanday-repository-builder</developerConnection> - <url>https://npanday.svn.codeplex.com/svn/trunk/misc/npanday-repository-builder</url> - </scm> <dependencies> - <!-- NPANDAY PLUGINS --> @@ -113,7 +106,7 @@ under the License. <artifactId>maven-xsp-plugin</artifactId> <version>1.4.1-incubating-SNAPSHOT</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.npanday.plugins</groupId> <artifactId>wix-maven-plugin</artifactId> <version>1.4.1-incubating-SNAPSHOT</version> @@ -142,12 +135,12 @@ under the License. <artifactId>NPanday.Plugin.Settings.JavaBinding</artifactId> <version>1.4.1-incubating-SNAPSHOT</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.npanday.plugins</groupId> <artifactId>NPanday.Plugin.SysRef.JavaBinding</artifactId> <version>1.4.1-incubating-SNAPSHOT</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.npanday.plugins</groupId> <artifactId>NPanday.Plugin.Msbuild.JavaBinding</artifactId> <version>1.4.1-incubating-SNAPSHOT</version> @@ -176,6 +169,7 @@ under the License. <plugins> <!-- Incorporate the .NET repository just built --> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <version>2.0</version> <executions> @@ -201,6 +195,7 @@ under the License. </executions> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> <version>2.2-beta-3</version> <configuration> @@ -218,6 +213,7 @@ under the License. </executions> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> <version>1.6</version> <executions> Modified: incubator/npanday/trunk/dist/npanday-skin/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dist/npanday-skin/pom.xml?rev=1139488&r1=1139414&r2=1139488&view=diff ============================================================================== --- incubator/npanday/trunk/dist/npanday-skin/pom.xml (original) +++ incubator/npanday/trunk/dist/npanday-skin/pom.xml Sat Jun 25 04:03:36 2011 @@ -24,9 +24,8 @@ under the License. <parent> <groupId>org.apache.npanday</groupId> - <artifactId>npanday-project</artifactId> + <artifactId>npanday-dist-parent</artifactId> <version>1.4.1-incubating-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> </parent> <artifactId>npanday-skin</artifactId> Added: incubator/npanday/trunk/dist/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dist/pom.xml?rev=1139488&view=auto ============================================================================== --- incubator/npanday/trunk/dist/pom.xml (added) +++ incubator/npanday/trunk/dist/pom.xml Sat Jun 25 04:03:36 2011 @@ -0,0 +1,37 @@ +<?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/maven-v4_0_0.xsd"> + <parent> + <groupId>org.apache.npanday</groupId> + <version>1.4.1-incubating-SNAPSHOT</version> + <artifactId>npanday-project</artifactId> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>npanday-dist-parent</artifactId> + <packaging>pom</packaging> + <name>NPanday :: Distribution Projects</name> + <modules> + <module>npanday-repository-builder</module> + <module>dotnet-repository-builder</module> + <module>npanday-installer</module> + <module>npanday-skin</module> + </modules> +</project> Modified: incubator/npanday/trunk/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/pom.xml?rev=1139488&r1=1139487&r2=1139488&view=diff ============================================================================== --- incubator/npanday/trunk/pom.xml (original) +++ incubator/npanday/trunk/pom.xml Sat Jun 25 04:03:36 2011 @@ -229,15 +229,9 @@ under the License. <module>archetypes</module> <module>plugins</module> <module>dotnet</module> - <!-- - MOVED TO RELEASE PROFILE - <module>misc/dotnet-repository-builder</module> - <module>misc/npanday-repository-builder</module> - <module>misc/npanday-installer</module> - --> </modules> <build> - <plugins> + <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> @@ -249,7 +243,7 @@ under the License. <arguments>-Pnpanday-release</arguments> <preparationGoals>clean install</preparationGoals> <autoVersionSubmodules>true</autoVersionSubmodules> - <mavenExecutorId>forked-path</mavenExecutorId> + <mavenExecutorId>forked-path</mavenExecutorId> </configuration> </plugin> <plugin> @@ -514,11 +508,9 @@ under the License. </profile> <profile> <id>npanday-release</id> - <modules> - <module>misc/dotnet-repository-builder</module> - <module>misc/npanday-repository-builder</module> - <module>misc/npanday-installer</module> - </modules> + <modules> + <module>dist</module> + </modules> <build> <plugins> <!-- Fail fast: the release build must run on Windows for the Add-in -->