Author: brett Date: Wed Jan 4 12:43:12 2012 New Revision: 1227137 URL: http://svn.apache.org/viewvc?rev=1227137&view=rev Log: [NPANDAY-429] merge changes from trunk for release consistency
Added: incubator/npanday/branches/npanday-1.4.x/DISCLAIMER - copied unchanged from r1227136, incubator/npanday/trunk/DISCLAIMER incubator/npanday/branches/npanday-1.4.x/LICENSE - copied unchanged from r1227136, incubator/npanday/trunk/LICENSE incubator/npanday/branches/npanday-1.4.x/NOTICE - copied unchanged from r1227136, incubator/npanday/trunk/NOTICE incubator/npanday/branches/npanday-1.4.x/README - copied unchanged from r1227136, incubator/npanday/trunk/README Removed: incubator/npanday/branches/npanday-1.4.x/DISCLAIMER.txt incubator/npanday/branches/npanday-1.4.x/LICENSE.txt incubator/npanday/branches/npanday-1.4.x/NOTICE.txt incubator/npanday/branches/npanday-1.4.x/README.txt Modified: incubator/npanday/branches/npanday-1.4.x/ (props changed) incubator/npanday/branches/npanday-1.4.x/archetypes/pom.xml incubator/npanday/branches/npanday-1.4.x/components/pom.xml incubator/npanday/branches/npanday-1.4.x/dist/pom.xml incubator/npanday/branches/npanday-1.4.x/dotnet/pom.xml incubator/npanday/branches/npanday-1.4.x/npanday-it-runner/pom.xml incubator/npanday/branches/npanday-1.4.x/plugins/pom.xml incubator/npanday/branches/npanday-1.4.x/pom.xml incubator/npanday/branches/npanday-1.4.x/site/pom.xml incubator/npanday/branches/npanday-1.4.x/site/src/site/apt/download.apt.vm incubator/npanday/branches/npanday-1.4.x/site/src/site/apt/guide/installation/index.apt.vm Propchange: incubator/npanday/branches/npanday-1.4.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jan 4 12:43:12 2012 @@ -1,4 +1,4 @@ /incubator/npanday/branches/NPANDAY-410:1210743-1210765 /incubator/npanday/branches/npanday-uac-removed:1002005-1024539 /incubator/npanday/branches/npanday-vs2010-support:1002029-1025477 -/incubator/npanday/trunk:1221087,1221092,1221101,1221116-1221117,1221159,1222098-1222180,1222459-1222547,1226035,1227061,1227127 +/incubator/npanday/trunk:1221087,1221092,1221101,1221116-1221117,1221159,1222098-1222180,1222459-1222547,1226035,1227061,1227127,1227131-1227136 Modified: incubator/npanday/branches/npanday-1.4.x/archetypes/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/branches/npanday-1.4.x/archetypes/pom.xml?rev=1227137&r1=1227136&r2=1227137&view=diff ============================================================================== --- incubator/npanday/branches/npanday-1.4.x/archetypes/pom.xml (original) +++ incubator/npanday/branches/npanday-1.4.x/archetypes/pom.xml Wed Jan 4 12:43:12 2012 @@ -22,7 +22,7 @@ under the License. <parent> <groupId>org.apache.npanday</groupId> <version>1.4.1-incubating-SNAPSHOT</version> - <artifactId>npanday-project</artifactId> + <artifactId>apache-npanday</artifactId> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>dotnet-archetypes</artifactId> Modified: incubator/npanday/branches/npanday-1.4.x/components/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/branches/npanday-1.4.x/components/pom.xml?rev=1227137&r1=1227136&r2=1227137&view=diff ============================================================================== --- incubator/npanday/branches/npanday-1.4.x/components/pom.xml (original) +++ incubator/npanday/branches/npanday-1.4.x/components/pom.xml Wed Jan 4 12:43:12 2012 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.npanday</groupId> <version>1.4.1-incubating-SNAPSHOT</version> - <artifactId>npanday-project</artifactId> + <artifactId>apache-npanday</artifactId> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>dotnet-components</artifactId> Modified: incubator/npanday/branches/npanday-1.4.x/dist/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/branches/npanday-1.4.x/dist/pom.xml?rev=1227137&r1=1227136&r2=1227137&view=diff ============================================================================== --- incubator/npanday/branches/npanday-1.4.x/dist/pom.xml (original) +++ incubator/npanday/branches/npanday-1.4.x/dist/pom.xml Wed Jan 4 12:43:12 2012 @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.npanday</groupId> <version>1.4.1-incubating-SNAPSHOT</version> - <artifactId>npanday-project</artifactId> + <artifactId>apache-npanday</artifactId> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>npanday-dist-parent</artifactId> Modified: incubator/npanday/branches/npanday-1.4.x/dotnet/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/branches/npanday-1.4.x/dotnet/pom.xml?rev=1227137&r1=1227136&r2=1227137&view=diff ============================================================================== --- incubator/npanday/branches/npanday-1.4.x/dotnet/pom.xml (original) +++ incubator/npanday/branches/npanday-1.4.x/dotnet/pom.xml Wed Jan 4 12:43:12 2012 @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.npanday</groupId> <version>1.4.1-incubating-SNAPSHOT</version> - <artifactId>npanday-project</artifactId> + <artifactId>apache-npanday</artifactId> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: incubator/npanday/branches/npanday-1.4.x/npanday-it-runner/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/branches/npanday-1.4.x/npanday-it-runner/pom.xml?rev=1227137&r1=1227136&r2=1227137&view=diff ============================================================================== --- incubator/npanday/branches/npanday-1.4.x/npanday-it-runner/pom.xml (original) +++ incubator/npanday/branches/npanday-1.4.x/npanday-it-runner/pom.xml Wed Jan 4 12:43:12 2012 @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.npanday</groupId> <version>1.4.1-incubating-SNAPSHOT</version> - <artifactId>npanday-project</artifactId> + <artifactId>apache-npanday</artifactId> </parent> <modelVersion>4.0.0</modelVersion> Modified: incubator/npanday/branches/npanday-1.4.x/plugins/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/branches/npanday-1.4.x/plugins/pom.xml?rev=1227137&r1=1227136&r2=1227137&view=diff ============================================================================== --- incubator/npanday/branches/npanday-1.4.x/plugins/pom.xml (original) +++ incubator/npanday/branches/npanday-1.4.x/plugins/pom.xml Wed Jan 4 12:43:12 2012 @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.npanday</groupId> <version>1.4.1-incubating-SNAPSHOT</version> - <artifactId>npanday-project</artifactId> + <artifactId>apache-npanday</artifactId> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.npanday.plugins</groupId> Modified: incubator/npanday/branches/npanday-1.4.x/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/branches/npanday-1.4.x/pom.xml?rev=1227137&r1=1227136&r2=1227137&view=diff ============================================================================== --- incubator/npanday/branches/npanday-1.4.x/pom.xml (original) +++ incubator/npanday/branches/npanday-1.4.x/pom.xml Wed Jan 4 12:43:12 2012 @@ -26,7 +26,7 @@ under the License. <version>8</version> </parent> <groupId>org.apache.npanday</groupId> - <artifactId>npanday-project</artifactId> + <artifactId>apache-npanday</artifactId> <packaging>pom</packaging> <version>1.4.1-incubating-SNAPSHOT</version> <name>Apache NPanday</name> @@ -291,7 +291,7 @@ under the License. <branchBase>https://svn.apache.org/repos/asf/incubator/npanday/branches</branchBase> <useReleaseProfile>false</useReleaseProfile> <goals>deploy</goals> - <arguments>-Pnpanday-release,dist</arguments> + <arguments>-Papache-release,dist</arguments> <preparationGoals>clean install</preparationGoals> <autoVersionSubmodules>true</autoVersionSubmodules> <mavenExecutorId>forked-path</mavenExecutorId> @@ -571,81 +571,6 @@ under the License. <module>dist</module> </modules> </profile> - <profile> - <id>npanday-release</id> - <build> - <plugins> - <!-- Fail fast: the release build must run on Windows for the Add-in --> - <!-- TODO: consider splitting it into a separate release --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>1.0-beta-1</version> - <executions> - <execution> - <id>enforce-os</id> - <goals> - <goal>enforce</goal> - </goals> - <configuration> - <rules> - <requireOS> - <family>windows</family> - </requireOS> - </rules> - <fail>true</fail> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <inherited>false</inherited> - <configuration> - <descriptor>src/assembly/src.xml</descriptor> - <outputDirectory>target</outputDirectory> - <finalName>npanday-${project.version}</finalName> - </configuration> - <executions> - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <version>2.1.2</version> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <goal>jar-no-fork</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-gpg-plugin</artifactId> - <configuration> - <passphrase>${gpg.passphrase}</passphrase> - </configuration> - <executions> - <execution> - <goals> - <goal>sign</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> </profiles> <distributionManagement> <repository> Modified: incubator/npanday/branches/npanday-1.4.x/site/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/branches/npanday-1.4.x/site/pom.xml?rev=1227137&r1=1227136&r2=1227137&view=diff ============================================================================== --- incubator/npanday/branches/npanday-1.4.x/site/pom.xml (original) +++ incubator/npanday/branches/npanday-1.4.x/site/pom.xml Wed Jan 4 12:43:12 2012 @@ -22,7 +22,7 @@ under the License. <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.npanday</groupId> - <artifactId>npanday-project</artifactId> + <artifactId>apache-npanday</artifactId> <version>1.4.1-incubating-SNAPSHOT</version> </parent> <artifactId>npanday-site</artifactId> Modified: incubator/npanday/branches/npanday-1.4.x/site/src/site/apt/download.apt.vm URL: http://svn.apache.org/viewvc/incubator/npanday/branches/npanday-1.4.x/site/src/site/apt/download.apt.vm?rev=1227137&r1=1227136&r2=1227137&view=diff ============================================================================== --- incubator/npanday/branches/npanday-1.4.x/site/src/site/apt/download.apt.vm (original) +++ incubator/npanday/branches/npanday-1.4.x/site/src/site/apt/download.apt.vm Wed Jan 4 12:43:12 2012 @@ -36,7 +36,8 @@ Download NPanday *-------------------------------+---------+----------+-----------+ | NPanday ${npandayReleaseVersion} Binaries | {{{http://www.apache.org/dyn/closer.cgi/incubator/npanday/binaries/npanday-repository-builder-${npandayReleaseVersion}-bin.tar.gz} tar.gz}} | {{{ http://www.apache.org/dist/incubator/npanday/binaries/npanday-repository-builder-${npandayReleaseVersion}-bin.tar.gz.md5} md5}} | {{{ http://www.apache.org/dist/incubator/npanday/binaries/npanday-repository-builder-${npandayReleaseVersion}-bin.tar.gz.asc} asc}} | *-------------------------------+---------+----------+-----------+ -| NPanday ${npandayReleaseVersion} Sources | {{{http://www.apache.org/dyn/closer.cgi/incubator/npanday/sources/npanday-project-${npandayReleaseVersion}-src.zip} source zip}} | {{{ http://www.apache.org/dist/incubator/npanday/sources/npanday-project-${npandayReleaseVersion}-src.zip.md5} md5}} | {{{ http://www.apache.org/dist/incubator/npanday/sources/npanday-project-${npandayReleaseVersion}-src.zip.asc} asc}} | +| NPanday ${npandayReleaseVersion} Sources | +{{{http://www.apache.org/dyn/closer.cgi/incubator/npanday/sources/apache-npanday-${npandayReleaseVersion}-src.zip} source zip}} | {{{http://www.apache.org/dist/incubator/npanday/sources/apache-npanday-${npandayReleaseVersion}-src.zip.md5} md5}} | {{{ http://www.apache.org/dist/incubator/npanday/sources/apache-npanday-${npandayReleaseVersion}-src.zip.asc} asc}} | *-------------------------------+---------+----------+-----------+ Modified: incubator/npanday/branches/npanday-1.4.x/site/src/site/apt/guide/installation/index.apt.vm URL: http://svn.apache.org/viewvc/incubator/npanday/branches/npanday-1.4.x/site/src/site/apt/guide/installation/index.apt.vm?rev=1227137&r1=1227136&r2=1227137&view=diff ============================================================================== --- incubator/npanday/branches/npanday-1.4.x/site/src/site/apt/guide/installation/index.apt.vm (original) +++ incubator/npanday/branches/npanday-1.4.x/site/src/site/apt/guide/installation/index.apt.vm Wed Jan 4 12:43:12 2012 @@ -88,7 +88,7 @@ Installing Using the Downloaded Binary R has not been modified in Maven's <<<settings.xml>>>. For example, you may end up with a structure containing - <<<C:\\Documents and Settings\\User\\.m2\\repository\\npanday\\npanday-project\\\\${project.version}\\npanday-project-${project.version}.pom>>>. + <<<C:\\Documents and Settings\\User\\.m2\\repository\\npanday\\apache-npanday\\\\${project.version}\\apache-npanday-${project.version}.pom>>>. To confirm your installation, run the following command, replacing <<<${project.version}>>> with the version you are installing: