You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2011/03/20 01:07:21 UTC
svn commit: r1083340 - in /maven/release/trunk:
maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java
pom.xml
Author: olamy
Date: Sun Mar 20 00:07:21 2011
New Revision: 1083340
URL: http://svn.apache.org/viewvc?rev=1083340&view=rev
Log:
take care about symlink
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java
maven/release/trunk/pom.xml
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java?rev=1083340&r1=1083339&r2=1083340&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java Sun Mar 20 00:07:21 2011
@@ -165,6 +165,18 @@ public class CheckoutProjectFromScm
}
String rootProjectBasedir = rootProject.getBasedir().getAbsolutePath();
+ try
+ {
+ // take care about symlink
+ if ( !rootProject.getBasedir().getAbsolutePath().equals( rootProject.getBasedir().getCanonicalPath() ) )
+ {
+ rootProjectBasedir = rootProject.getBasedir().getCanonicalPath();
+ }
+ }
+ catch ( IOException e )
+ {
+ throw new ReleaseExecutionException( e.getMessage(), e );
+ }
if ( rootProjectBasedir.length() > basedir.length() )
{
scmRelativePathProjectDirectory = rootProjectBasedir.substring( basedir.length() + 1 );
Modified: maven/release/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/pom.xml?rev=1083340&r1=1083339&r2=1083340&view=diff
==============================================================================
--- maven/release/trunk/pom.xml (original)
+++ maven/release/trunk/pom.xml Sun Mar 20 00:07:21 2011
@@ -178,4 +178,39 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>m2e</id>
+ <properties>
+ <m2BuildDirectory>target</m2BuildDirectory>
+ </properties>
+ <activation>
+ <property>
+ <name>m2e.version</name>
+ </property>
+ </activation>
+ <build>
+ <directory>${m2BuildDirectory}</directory>
+ <plugins>
+ <plugin>
+ <groupId>org.maven.ide.eclipse</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>0.10.0</version>
+ <configuration>
+ <mappingId>customizable</mappingId>
+ <configurators>
+ <configurator id="org.maven.ide.eclipse.jdt.javaConfigurator" />
+ <configurator id="org.maven.ide.eclipse.modello.modelloConfigurator" />
+ <configurator id="org.maven.ide.eclipse.plexus.annotations.plexusConfigurator" />
+ </configurators>
+ <mojoExecutions>
+ <mojoExecution>org.apache.maven.plugins:maven-resources-plugin::</mojoExecution>
+ </mojoExecutions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>