Re: [maven-release] branch master updated: Expose dependency.dev and dependency.rel properties

classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

Re: [maven-release] branch master updated: Expose dependency.dev and dependency.rel properties

rfscholte
Hi Petar, 

Is this related to https://issues.apache.org/jira/browse/MRELEASE-985 [https://issues.apache.org/jira/browse/MRELEASE-985] ? 

Robert
On 27-10-2019 08:22:12, [hidden email] <[hidden email]> wrote:
This is an automated email from the ASF dual-hosted git repository.

ptahchiev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git


The following commit(s) were added to refs/heads/master by this push:
new d371cc0 Expose dependency.dev and dependency.rel properties
d371cc0 is described below

commit d371cc0d3e76190f9f92781d9921d6e7e0d9acbd
Author: petar.tahchiev
AuthorDate: Sun Oct 27 09:17:14 2019 +0200

Expose dependency.dev and dependency.rel properties

As part of this: https://github.com/apache/maven-release/pull/18 and this: https://issues.apache.org/jira/browse/MRELEASE-985
we need to check if the command line property starts with dependency.dev or dependency.rel to be able to override the value of the
property.
---
.../org/apache/maven/shared/release/config/ReleaseUtils.java | 10 ++++++++++
1 file changed, 10 insertions(+)

diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
index 3b4f14b..9200ee2 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
@@ -172,6 +172,16 @@ public class ReleaseUtils
builder.addDevelopmentVersion( property.substring( "project.dev.".length() ),
properties.getProperty( property ) );
}
+ else if ( property.startsWith( "dependency.rel." ) )
+ {
+ builder.addDependencyReleaseVersion( property.substring( "dependency.rel.".length() ),
+ properties.getProperty( property ) );
+ }
+ else if ( property.startsWith( "dependency.dev." ) )
+ {
+ builder.addDependencyDevelopmentVersion( property.substring( "dependency.dev.".length() ),
+ properties.getProperty( property ) );
+ }
else if ( property.startsWith( "project.scm." ) )
{
int index = property.lastIndexOf( '.' );

Reply | Threaded
Open this post in threaded view
|

Re: [maven-release] branch master updated: Expose dependency.dev and dependency.rel properties

Petar Tahchiev
Hi Robert,

yes I noticed today it somehow was left behind. As the message in the
commit says it is for MRELEASE-985 and we need it to be able to override
certain dependency versions from command line.

На нд, 27.10.2019 г. в 20:35 ч. Robert Scholte <[hidden email]>
написа:

> Hi Petar,
>
> Is this related to https://issues.apache.org/jira/browse/MRELEASE-985 ?
>
> Robert
>
> On 27-10-2019 08:22:12, [hidden email] <[hidden email]> wrote:
> This is an automated email from the ASF dual-hosted git repository.
>
> ptahchiev pushed a commit to branch master
> in repository https://gitbox.apache.org/repos/asf/maven-release.git
>
>
> The following commit(s) were added to refs/heads/master by this push:
> new d371cc0 Expose dependency.dev and dependency.rel properties
> d371cc0 is described below
>
> commit d371cc0d3e76190f9f92781d9921d6e7e0d9acbd
> Author: petar.tahchiev
> AuthorDate: Sun Oct 27 09:17:14 2019 +0200
>
> Expose dependency.dev and dependency.rel properties
>
> As part of this: https://github.com/apache/maven-release/pull/18 and
> this: https://issues.apache.org/jira/browse/MRELEASE-985
> we need to check if the command line property starts with dependency.dev
> or dependency.rel to be able to override the value of the
> property.
> ---
> .../org/apache/maven/shared/release/config/ReleaseUtils.java | 10
> ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git
> a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
> b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
>
> index 3b4f14b..9200ee2 100644
> ---
> a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
>
> +++
> b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
>
> @@ -172,6 +172,16 @@ public class ReleaseUtils
> builder.addDevelopmentVersion( property.substring( "project.dev.".length()
> ),
> properties.getProperty( property ) );
> }
> + else if ( property.startsWith( "dependency.rel." ) )
> + {
> + builder.addDependencyReleaseVersion( property.substring(
> "dependency.rel.".length() ),
> + properties.getProperty( property ) );
> + }
> + else if ( property.startsWith( "dependency.dev." ) )
> + {
> + builder.addDependencyDevelopmentVersion( property.substring( "
> dependency.dev.".length() ),
> + properties.getProperty( property ) );
> + }
> else if ( property.startsWith( "project.scm." ) )
> {
> int index = property.lastIndexOf( '.' );
>
>

--
Regards, Petar!
Karlovo, Bulgaria.
---
Public PGP Key at:
http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x19658550C3110611
Key Fingerprint: A369 A7EE 61BC 93A3 CDFF  55A5 1965 8550 C311 0611
Reply | Threaded
Open this post in threaded view
|

Re: [maven-release] branch master updated: Expose dependency.dev and dependency.rel properties

rfscholte
I thought this was already fixed (as the issue is closed). I remember we had a discussion about the solution, just want to be sure you don't break anything. This should already have been covered by an integrationtest, so I'm suprised by this change.
On 27-10-2019 19:46:25, Petar Tahchiev <[hidden email]> wrote:
Hi Robert,

yes I noticed today it somehow was left behind. As the message in the
commit says it is for MRELEASE-985 and we need it to be able to override
certain dependency versions from command line.

На нд, 27.10.2019 г. в 20:35 ч. Robert Scholte
написа:

> Hi Petar,
>
> Is this related to https://issues.apache.org/jira/browse/MRELEASE-985 ?
>
> Robert
>
> On 27-10-2019 08:22:12, [hidden email] wrote:
> This is an automated email from the ASF dual-hosted git repository.
>
> ptahchiev pushed a commit to branch master
> in repository https://gitbox.apache.org/repos/asf/maven-release.git
>
>
> The following commit(s) were added to refs/heads/master by this push:
> new d371cc0 Expose dependency.dev and dependency.rel properties
> d371cc0 is described below
>
> commit d371cc0d3e76190f9f92781d9921d6e7e0d9acbd
> Author: petar.tahchiev
> AuthorDate: Sun Oct 27 09:17:14 2019 +0200
>
> Expose dependency.dev and dependency.rel properties
>
> As part of this: https://github.com/apache/maven-release/pull/18 and
> this: https://issues.apache.org/jira/browse/MRELEASE-985
> we need to check if the command line property starts with dependency.dev
> or dependency.rel to be able to override the value of the
> property.
> ---
> .../org/apache/maven/shared/release/config/ReleaseUtils.java | 10
> ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git
> a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
> b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
>
> index 3b4f14b..9200ee2 100644
> ---
> a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
>
> +++
> b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
>
> @@ -172,6 +172,16 @@ public class ReleaseUtils
> builder.addDevelopmentVersion( property.substring( "project.dev.".length()
> ),
> properties.getProperty( property ) );
> }
> + else if ( property.startsWith( "dependency.rel." ) )
> + {
> + builder.addDependencyReleaseVersion( property.substring(
> "dependency.rel.".length() ),
> + properties.getProperty( property ) );
> + }
> + else if ( property.startsWith( "dependency.dev." ) )
> + {
> + builder.addDependencyDevelopmentVersion( property.substring( "
> dependency.dev.".length() ),
> + properties.getProperty( property ) );
> + }
> else if ( property.startsWith( "project.scm." ) )
> {
> int index = property.lastIndexOf( '.' );
>
>

--
Regards, Petar!
Karlovo, Bulgaria.
---
Public PGP Key at:
http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x19658550C3110611
Key Fingerprint: A369 A7EE 61BC 93A3 CDFF 55A5 1965 8550 C311 0611
Reply | Threaded
Open this post in threaded view
|

Re: [maven-release] branch master updated: Expose dependency.dev and dependency.rel properties

Petar Tahchiev
I think it's fine. I don't think it's going to break anything. For some
reason these changes got left behind and I had to add them.

На нд, 27.10.2019 г. в 21:00 ч. Robert Scholte <[hidden email]>
написа:

> I thought this was already fixed (as the issue is closed). I remember we
> had a discussion about the solution, just want to be sure you don't break
> anything. This should already have been covered by an integrationtest, so
> I'm suprised by this change.
> On 27-10-2019 19:46:25, Petar Tahchiev <[hidden email]> wrote:
> Hi Robert,
>
> yes I noticed today it somehow was left behind. As the message in the
> commit says it is for MRELEASE-985 and we need it to be able to override
> certain dependency versions from command line.
>
> На нд, 27.10.2019 г. в 20:35 ч. Robert Scholte
> написа:
>
> > Hi Petar,
> >
> > Is this related to https://issues.apache.org/jira/browse/MRELEASE-985 ?
> >
> > Robert
> >
> > On 27-10-2019 08:22:12, [hidden email] wrote:
> > This is an automated email from the ASF dual-hosted git repository.
> >
> > ptahchiev pushed a commit to branch master
> > in repository https://gitbox.apache.org/repos/asf/maven-release.git
> >
> >
> > The following commit(s) were added to refs/heads/master by this push:
> > new d371cc0 Expose dependency.dev and dependency.rel properties
> > d371cc0 is described below
> >
> > commit d371cc0d3e76190f9f92781d9921d6e7e0d9acbd
> > Author: petar.tahchiev
> > AuthorDate: Sun Oct 27 09:17:14 2019 +0200
> >
> > Expose dependency.dev and dependency.rel properties
> >
> > As part of this: https://github.com/apache/maven-release/pull/18 and
> > this: https://issues.apache.org/jira/browse/MRELEASE-985
> > we need to check if the command line property starts with dependency.dev
> > or dependency.rel to be able to override the value of the
> > property.
> > ---
> > .../org/apache/maven/shared/release/config/ReleaseUtils.java | 10
> > ++++++++++
> > 1 file changed, 10 insertions(+)
> >
> > diff --git
> >
> a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
> >
> b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
> >
> > index 3b4f14b..9200ee2 100644
> > ---
> >
> a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
> >
> > +++
> >
> b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
> >
> > @@ -172,6 +172,16 @@ public class ReleaseUtils
> > builder.addDevelopmentVersion( property.substring( "project.dev
> .".length()
> > ),
> > properties.getProperty( property ) );
> > }
> > + else if ( property.startsWith( "dependency.rel." ) )
> > + {
> > + builder.addDependencyReleaseVersion( property.substring(
> > "dependency.rel.".length() ),
> > + properties.getProperty( property ) );
> > + }
> > + else if ( property.startsWith( "dependency.dev." ) )
> > + {
> > + builder.addDependencyDevelopmentVersion( property.substring( "
> > dependency.dev.".length() ),
> > + properties.getProperty( property ) );
> > + }
> > else if ( property.startsWith( "project.scm." ) )
> > {
> > int index = property.lastIndexOf( '.' );
> >
> >
>
> --
> Regards, Petar!
> Karlovo, Bulgaria.
> ---
> Public PGP Key at:
> http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x19658550C3110611
> Key Fingerprint: A369 A7EE 61BC 93A3 CDFF 55A5 1965 8550 C311 0611
>


--
Regards, Petar!
Karlovo, Bulgaria.
---
Public PGP Key at:
http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x19658550C3110611
Key Fingerprint: A369 A7EE 61BC 93A3 CDFF  55A5 1965 8550 C311 0611
Reply | Threaded
Open this post in threaded view
|

Re: [maven-release] branch master updated: Expose dependency.dev and dependency.rel properties

rfscholte
I wrote an extra integration test, it confirms still change is indeed required to match the original requirements.

Robert

On 27-10-2019 20:26:37, Petar Tahchiev <[hidden email]> wrote:
I think it's fine. I don't think it's going to break anything. For some
reason these changes got left behind and I had to add them.

На нд, 27.10.2019 г. в 21:00 ч. Robert Scholte
написа:

> I thought this was already fixed (as the issue is closed). I remember we
> had a discussion about the solution, just want to be sure you don't break
> anything. This should already have been covered by an integrationtest, so
> I'm suprised by this change.
> On 27-10-2019 19:46:25, Petar Tahchiev wrote:
> Hi Robert,
>
> yes I noticed today it somehow was left behind. As the message in the
> commit says it is for MRELEASE-985 and we need it to be able to override
> certain dependency versions from command line.
>
> На нд, 27.10.2019 г. в 20:35 ч. Robert Scholte
> написа:
>
> > Hi Petar,
> >
> > Is this related to https://issues.apache.org/jira/browse/MRELEASE-985 ?
> >
> > Robert
> >
> > On 27-10-2019 08:22:12, [hidden email] wrote:
> > This is an automated email from the ASF dual-hosted git repository.
> >
> > ptahchiev pushed a commit to branch master
> > in repository https://gitbox.apache.org/repos/asf/maven-release.git
> >
> >
> > The following commit(s) were added to refs/heads/master by this push:
> > new d371cc0 Expose dependency.dev and dependency.rel properties
> > d371cc0 is described below
> >
> > commit d371cc0d3e76190f9f92781d9921d6e7e0d9acbd
> > Author: petar.tahchiev
> > AuthorDate: Sun Oct 27 09:17:14 2019 +0200
> >
> > Expose dependency.dev and dependency.rel properties
> >
> > As part of this: https://github.com/apache/maven-release/pull/18 and
> > this: https://issues.apache.org/jira/browse/MRELEASE-985
> > we need to check if the command line property starts with dependency.dev
> > or dependency.rel to be able to override the value of the
> > property.
> > ---
> > .../org/apache/maven/shared/release/config/ReleaseUtils.java | 10
> > ++++++++++
> > 1 file changed, 10 insertions(+)
> >
> > diff --git
> >
> a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
> >
> b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
> >
> > index 3b4f14b..9200ee2 100644
> > ---
> >
> a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
> >
> > +++
> >
> b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
> >
> > @@ -172,6 +172,16 @@ public class ReleaseUtils
> > builder.addDevelopmentVersion( property.substring( "project.dev
> .".length()
> > ),
> > properties.getProperty( property ) );
> > }
> > + else if ( property.startsWith( "dependency.rel." ) )
> > + {
> > + builder.addDependencyReleaseVersion( property.substring(
> > "dependency.rel.".length() ),
> > + properties.getProperty( property ) );
> > + }
> > + else if ( property.startsWith( "dependency.dev." ) )
> > + {
> > + builder.addDependencyDevelopmentVersion( property.substring( "
> > dependency.dev.".length() ),
> > + properties.getProperty( property ) );
> > + }
> > else if ( property.startsWith( "project.scm." ) )
> > {
> > int index = property.lastIndexOf( '.' );
> >
> >
>
> --
> Regards, Petar!
> Karlovo, Bulgaria.
> ---
> Public PGP Key at:
> http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x19658550C3110611
> Key Fingerprint: A369 A7EE 61BC 93A3 CDFF 55A5 1965 8550 C311 0611
>


--
Regards, Petar!
Karlovo, Bulgaria.
---
Public PGP Key at:
http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x19658550C3110611
Key Fingerprint: A369 A7EE 61BC 93A3 CDFF 55A5 1965 8550 C311 0611