Mailing-List: contact derby-dev-help@db.apache.org; run by ezmlm
Precedence: bulk
Reply-To: <derby-dev@db.apache.org>
Date: Wed, 3 Jul 2013 08:09:21 +0000 (UTC)
From: "ASF subversion and git services (JIRA)" <jira@apache.org>
To: derby-dev@db.apache.org
Message-ID: <JIRA.12614616.1351899279296.204393.1372838961812@arcas>
In-Reply-To: <JIRA.12614616.1351899279296@arcas>
References: <JIRA.12614616.1351899279296@arcas>
Subject: [jira] [Commented] (DERBY-5979) ant release target creates a
 release.properties that has conflicting line endings so automatic checkin
 fails
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit


    [ https://issues.apache.org/jira/browse/DERBY-5979?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13698728#comment-13698728 ] 

ASF subversion and git services commented on DERBY-5979:
--------------------------------------------------------

Commit 1499244 from [~dyret]
[ https://svn.apache.org/r1499244 ]

DERBY-5979: Part b: 1)  Make properties.dir absolute by prepending ${basedir}. This way the release-targets work even when cwd is not equal to ${basedir} (as could be the case when invoking those target from within an IDE). 2) Change the value of derby.junit.jvm from java to ${java.home}/bin/java. This ensures that junit-ant-tasks work even if invoked from an environment (such as an IDE) where the JAVA_HOME jvm may be different from the first jvm in PATH.
                
> ant release target creates a release.properties that has conflicting line endings so automatic checkin fails
> ------------------------------------------------------------------------------------------------------------
>
>                 Key: DERBY-5979
>                 URL: https://issues.apache.org/jira/browse/DERBY-5979
>             Project: Derby
>          Issue Type: Bug
>          Components: Build tools
>            Reporter: Kathey Marsden
>            Assignee: Dyre Tjeldvoll
>              Labels: derby_triage10_11
>         Attachments: derby-5979-1.diff, derby-5979-2.diff, derby-5979-3-a.diff, derby-5979-3-b.diff
>
>
> The ant release target  on Windows  creates release.properties with inconsistent line endings that prevent checkin.
> This may be a configuration issue.  I have *.properties = svn:eol-style=native which I think is correct but I could not diff or checkin the file until I removed the dos line endings.  There are similar issues with the release notes but because they are not checked in as part of the a script we document how to fix them up.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira