You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2012/03/01 20:55:08 UTC
svn commit: r1295762 [3/3] - in /maven/release/trunk: ./
maven-release-manager/src/test/resources/projects/generate-release-poms/basic-pom-entities/
maven-release-manager/src/test/resources/projects/generate-release-poms/basic-pom-namespace/
maven-rele...
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-released-parent/subproject1/expected-release-pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-released-parent/subproject1/expected-release-pom.xml?rev=1295762&r1=1295761&r2=1295762&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-released-parent/subproject1/expected-release-pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-released-parent/subproject1/expected-release-pom.xml Thu Mar 1 19:55:05 2012
@@ -1,25 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>groupId</groupId>
<artifactId>subproject1</artifactId>
<version>2.0</version>
<build>
- <sourceDirectory>src/main/java</sourceDirectory>
+ <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
<scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
- <testSourceDirectory>src/test/java</testSourceDirectory>
- <outputDirectory>target/classes</outputDirectory>
- <testOutputDirectory>target/test-classes</testOutputDirectory>
+ <testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
+ <outputDirectory>${project.build.directory}/classes</outputDirectory>
+ <testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory>
<resources>
<resource>
- <directory>src/main/resources</directory>
+ <directory>${project.basedir}/src/main/resources</directory>
</resource>
</resources>
<testResources>
<testResource>
- <directory>src/test/resources</directory>
+ <directory>${project.basedir}/src/test/resources</directory>
</testResource>
</testResources>
- <directory>target</directory>
+ <directory>${project.basedir}/target</directory>
+ <finalName>${project.artifactId}-${project.version}</finalName>
</build>
<repositories>
<repository>
@@ -41,6 +44,7 @@
</pluginRepository>
</pluginRepositories>
<reporting>
+ <excludeDefaults>false</excludeDefaults>
<outputDirectory>target/site</outputDirectory>
</reporting>
</project>
\ No newline at end of file
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-without-extension-version/expected-release-pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-without-extension-version/expected-release-pom.xml?rev=1295762&r1=1295761&r2=1295762&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-without-extension-version/expected-release-pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-without-extension-version/expected-release-pom.xml Thu Mar 1 19:55:05 2012
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>groupId</groupId>
<artifactId>artifactId</artifactId>
<version>1.0</version>
<build>
- <sourceDirectory>src/main/java</sourceDirectory>
+ <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
<scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
- <testSourceDirectory>src/test/java</testSourceDirectory>
- <outputDirectory>target/classes</outputDirectory>
- <testOutputDirectory>target/test-classes</testOutputDirectory>
+ <testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
+ <outputDirectory>${project.build.directory}/classes</outputDirectory>
+ <testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory>
<extensions>
<extension>
<groupId>groupId</groupId>
@@ -18,15 +20,16 @@
</extensions>
<resources>
<resource>
- <directory>src/main/resources</directory>
+ <directory>${project.basedir}/src/main/resources</directory>
</resource>
</resources>
<testResources>
<testResource>
- <directory>src/test/resources</directory>
+ <directory>${project.basedir}/src/test/resources</directory>
</testResource>
</testResources>
- <directory>target</directory>
+ <directory>${project.basedir}/target</directory>
+ <finalName>${project.artifactId}-${project.version}</finalName>
</build>
<repositories>
<repository>
@@ -48,6 +51,7 @@
</pluginRepository>
</pluginRepositories>
<reporting>
+ <excludeDefaults>false</excludeDefaults>
<outputDirectory>target/site</outputDirectory>
</reporting>
</project>
\ No newline at end of file
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-values/expected-release-pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-values/expected-release-pom.xml?rev=1295762&r1=1295761&r2=1295762&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-values/expected-release-pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-values/expected-release-pom.xml Thu Mar 1 19:55:05 2012
@@ -1,31 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>groupId</groupId>
<artifactId>artifactId</artifactId>
- <packaging>pom</packaging>
<version>1.0</version>
+ <packaging>pom</packaging>
<scm>
<connection>scm:svn:file://localhost/tmp/scm-repo/tags/release-label</connection>
<developerConnection>scm:svn:file://localhost/tmp/scm-repo/tags/release-label</developerConnection>
<url>file://localhost/tmp/scm-repo/tags/release-label</url>
</scm>
<build>
- <sourceDirectory>src/main/java</sourceDirectory>
+ <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
<scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
- <testSourceDirectory>src/test/java</testSourceDirectory>
- <outputDirectory>target/classes</outputDirectory>
- <testOutputDirectory>target/test-classes</testOutputDirectory>
+ <testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
+ <outputDirectory>${project.build.directory}/classes</outputDirectory>
+ <testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory>
<resources>
<resource>
- <directory>src/main/resources</directory>
+ <directory>${project.basedir}/src/main/resources</directory>
</resource>
</resources>
<testResources>
<testResource>
- <directory>src/test/resources</directory>
+ <directory>${project.basedir}/src/test/resources</directory>
</testResource>
</testResources>
- <directory>target</directory>
+ <directory>${project.basedir}/target</directory>
+ <finalName>${project.artifactId}-${project.version}</finalName>
</build>
<modules>
<module>subproject1</module>
@@ -51,6 +54,7 @@
</pluginRepository>
</pluginRepositories>
<reporting>
+ <excludeDefaults>false</excludeDefaults>
<outputDirectory>target/site</outputDirectory>
</reporting>
</project>
\ No newline at end of file
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-values/subproject1/expected-release-pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-values/subproject1/expected-release-pom.xml?rev=1295762&r1=1295761&r2=1295762&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-values/subproject1/expected-release-pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-values/subproject1/expected-release-pom.xml Thu Mar 1 19:55:05 2012
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>groupId</groupId>
<artifactId>subproject1</artifactId>
@@ -9,22 +11,23 @@
<url>file://localhost/tmp/scm-repo/tags/release-label</url>
</scm>
<build>
- <sourceDirectory>src/main/java</sourceDirectory>
+ <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
<scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
- <testSourceDirectory>src/test/java</testSourceDirectory>
- <outputDirectory>target/classes</outputDirectory>
- <testOutputDirectory>target/test-classes</testOutputDirectory>
+ <testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
+ <outputDirectory>${project.build.directory}/classes</outputDirectory>
+ <testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory>
<resources>
<resource>
- <directory>src/main/resources</directory>
+ <directory>${project.basedir}/src/main/resources</directory>
</resource>
</resources>
<testResources>
<testResource>
- <directory>src/test/resources</directory>
+ <directory>${project.basedir}/src/test/resources</directory>
</testResource>
</testResources>
- <directory>target</directory>
+ <directory>${project.basedir}/target</directory>
+ <finalName>${project.artifactId}-${project.version}</finalName>
</build>
<repositories>
<repository>
@@ -46,6 +49,7 @@
</pluginRepository>
</pluginRepositories>
<reporting>
+ <excludeDefaults>false</excludeDefaults>
<outputDirectory>target/site</outputDirectory>
</reporting>
</project>
\ No newline at end of file
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-values/subproject2/expected-release-pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-values/subproject2/expected-release-pom.xml?rev=1295762&r1=1295761&r2=1295762&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-values/subproject2/expected-release-pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-values/subproject2/expected-release-pom.xml Thu Mar 1 19:55:05 2012
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>groupId</groupId>
<artifactId>subproject2</artifactId>
@@ -9,22 +11,23 @@
<url>file://localhost/tmp/scm-repo/tags/release-label</url>
</scm>
<build>
- <sourceDirectory>src/main/java</sourceDirectory>
+ <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
<scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
- <testSourceDirectory>src/test/java</testSourceDirectory>
- <outputDirectory>target/classes</outputDirectory>
- <testOutputDirectory>target/test-classes</testOutputDirectory>
+ <testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
+ <outputDirectory>${project.build.directory}/classes</outputDirectory>
+ <testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory>
<resources>
<resource>
- <directory>src/main/resources</directory>
+ <directory>${project.basedir}/src/main/resources</directory>
</resource>
</resources>
<testResources>
<testResource>
- <directory>src/test/resources</directory>
+ <directory>${project.basedir}/src/test/resources</directory>
</testResource>
</testResources>
- <directory>target</directory>
+ <directory>${project.basedir}/target</directory>
+ <finalName>${project.artifactId}-${project.version}</finalName>
<plugins>
<plugin>
<groupId>groupId</groupId>
@@ -61,6 +64,7 @@
</dependency>
</dependencies>
<reporting>
+ <excludeDefaults>false</excludeDefaults>
<outputDirectory>target/site</outputDirectory>
</reporting>
</project>
\ No newline at end of file
Modified: maven/release/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/pom.xml?rev=1295762&r1=1295761&r2=1295762&view=diff
==============================================================================
--- maven/release/trunk/pom.xml (original)
+++ maven/release/trunk/pom.xml Thu Mar 1 19:55:05 2012
@@ -131,7 +131,7 @@
<properties>
<scmVersion>1.6</scmVersion>
<mavenPluginPluginVersion>2.8</mavenPluginPluginVersion>
- <mavenVersion>2.0.9</mavenVersion>
+ <mavenVersion>2.2.1</mavenVersion>
</properties>
<dependencyManagement>