Fix10 - RegexBasedInterpolatorTest fails when building with maven 3.4.0-SNAPSHOT #11

belingueres · 2016-08-21T02:46:21Z

Hi,
I've prepared this PR to solve the issue. I just used $JAVA_HOME when testing with a real env var. Used mocks on the env var Map whenever is not the focus of the test.
Gabriel

ReflectionValueExtractor version with capacity to parse expressions with arrays, lists and maps.

…t. The reason is that I've made a mistake and created a unique PR to solve several issues, which is a bad practice.

…ng with maven 3.4.0-SNAPSHOT Tests fails because the $HOME env var is no longer defined inside mvn.cmd and is not found (some tests pass even if the env var is not found!). - Changed the OperatingSystemUtils to allow mocking the Map of env vars. - Fixed tests to use mocking whenever the env vars are not the focus of the unit test. - When testing with a REAL env var, it is chosen to be $JAVA_HOME since it is required to be present to run mvn script. - Added tests to EnvarBasedValueSource and fixed.EnvarBasedValueSource.

michael-o · 2016-08-22T06:08:18Z

Please rebase your branch first and then apply your chnges within a single commit.

…ng with maven 3.4.0-SNAPSHOT Tests fails because the $HOME env var is no longer defined inside mvn.cmd and is not found (some tests pass even if the env var is not found!). - Changed the OperatingSystemUtils to allow mocking the Map of env vars. - Fixed tests to use mocking whenever the env vars are not the focus of the unit test. - When testing with a REAL env var, it is chosen to be $JAVA_HOME since it is required to be present to run mvn script. - Added tests to EnvarBasedValueSource and fixed.EnvarBasedValueSource.

belingueres · 2016-08-22T18:27:45Z

Rebased.
Thanks!
Gabriel

michael-o · 2017-05-12T19:23:20Z

Can you again resolve the merge issue? I'll test and merge.

# Conflicts: # src/test/java/org/codehaus/plexus/interpolation/fixed/FixedStringSearchInterpolatorTest.java

belingueres · 2017-05-15T01:31:57Z

Merged.

michael-o · 2017-05-15T10:52:43Z

You have now eight commits. I wanted a single commit applyable to master.

…lation into Fix10

belingueres · 2017-05-16T16:25:41Z

I can't update the PR with the squashed commit. Any ideas how to solve it?

michael-o · 2017-05-16T16:43:04Z

Create a patch from your change, reset your branch to origin/master, apply patch, resolve issues.

belingueres · 2017-05-16T18:16:53Z

Sorry can't make it work....

…lation into Fix10 # Conflicts: # src/test/java/org/codehaus/plexus/interpolation/EnvarBasedValueSourceTest.java # src/test/java/org/codehaus/plexus/interpolation/fixed/EnvarBasedValueSourceTest.java

olamy · 2017-05-17T00:25:44Z

well the github merge button offer an option to squash and merge so @michael-o can do it while merging.

michael-o · 2017-05-17T09:41:46Z

@olamy This won't help. If you rebase this branch there are a lot of merge conflicts. It is easier to rework the patch on top of master rather than reconcile this.

olamy · 2017-05-18T01:19:01Z

@michael-o conflicts? AFAICS github UI doesn't show any conflicts? Do I miss something?

belingueres · 2017-05-18T02:27:59Z

I checked the "Allow edits from maintainers." option...don't know if it does something useful.

michael-o · 2017-05-18T21:18:38Z

@olamy

mosipov@mikaw10 MINGW64 /d/Entwicklung/Projekte/plexus-interpolation (master)
$ git checkout -B pr-11
Switched to a new branch 'pr-11'

mosipov@mikaw10 MINGW64 /d/Entwicklung/Projekte/plexus-interpolation (pr-11)
$ git merge belingueres/Fix10
Updating 0d3c1d2..b7fcd97
Fast-forward
 .../interpolation/EnvarBasedValueSource.java       |  9 ++
 .../interpolation/fixed/EnvarBasedValueSource.java |  9 ++
 .../interpolation/os/OperatingSystemUtils.java     | 44 +++++++++-
 .../interpolation/EnvarBasedValueSourceTest.java   | 97 +++++++++++++++++++++
 .../interpolation/RegexBasedInterpolatorTest.java  | 24 +++++-
 .../StringSearchInterpolatorTest.java              | 25 +++++-
 .../fixed/EnvarBasedValueSourceTest.java           | 98 ++++++++++++++++++++++
 .../fixed/FixedStringSearchInterpolatorTest.java   | 25 +++++-
 8 files changed, 319 insertions(+), 12 deletions(-)
 create mode 100644 src/test/java/org/codehaus/plexus/interpolation/EnvarBasedValueSourceTest.java
 create mode 100644 src/test/java/org/codehaus/plexus/interpolation/fixed/EnvarBasedValueSourceTest.java

mosipov@mikaw10 MINGW64 /d/Entwicklung/Projekte/plexus-interpolation (pr-11)
$ git rebase master
First, rewinding head to replay your work on top of it...
Applying: Fixed MultiDelimiterStringSearchInterpolator escape String code
Using index info to reconstruct a base tree...
M       src/main/java/org/codehaus/plexus/interpolation/multi/MultiDelimiterStringSearchInterpolator.java
M       src/test/java/org/codehaus/plexus/interpolation/multi/MultiDelimiterStringSearchInterpolatorTest.java
.git/rebase-apply/patch:18: space before tab in indent.
                                --startEscapeIdx;
warning: 1 line adds whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging src/test/java/org/codehaus/plexus/interpolation/multi/MultiDelimiterStringSearchInterpolatorTest.java
CONFLICT (content): Merge conflict in src/test/java/org/codehaus/plexus/interpolation/multi/MultiDelimiterStringSearchInterpolatorTest.java
Auto-merging src/main/java/org/codehaus/plexus/interpolation/multi/MultiDelimiterStringSearchInterpolator.java
CONFLICT (content): Merge conflict in src/main/java/org/codehaus/plexus/interpolation/multi/MultiDelimiterStringSearchInterpolator.java
error: Failed to merge in the changes.
Patch failed at 0001 Fixed MultiDelimiterStringSearchInterpolator escape String code
The copy of the patch that failed is found in: .git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".

olamy · 2017-05-23T07:30:08Z

no problem here (see the branch called merge-pr-11 )

mb-olamy:plexus-interpolation olamy$ git fetch origin pull/11/head:pr-11
remote: Counting objects: 109, done.
remote: Compressing objects: 100% (16/16), done.
remote: Total 109 (delta 33), reused 59 (delta 29), pack-reused 44
Receiving objects: 100% (109/109), 23.69 KiB | 0 bytes/s, done.
Resolving deltas: 100% (34/34), completed with 12 local objects.
From https://github.com/codehaus-plexus/plexus-interpolation
 * [new ref]         refs/pull/11/head -> pr-11
mb-olamy:plexus-interpolation olamy$ git checkout pr-11
Switched to branch 'pr-11'
mb-olamy:plexus-interpolation olamy$ git checkout master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
mb-olamy:plexus-interpolation olamy$ git checkout -b merge-pr-11
Switched to a new branch 'merge-pr-11'
mb-olamy:plexus-interpolation olamy$ git merge pr-11
Updating 0d3c1d2..b7fcd97
Fast-forward
 src/main/java/org/codehaus/plexus/interpolation/EnvarBasedValueSource.java                   |  9 +++++++++
 src/main/java/org/codehaus/plexus/interpolation/fixed/EnvarBasedValueSource.java             |  9 +++++++++
 src/main/java/org/codehaus/plexus/interpolation/os/OperatingSystemUtils.java                 | 44 ++++++++++++++++++++++++++++++++++++++++++--
 src/test/java/org/codehaus/plexus/interpolation/EnvarBasedValueSourceTest.java               | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/test/java/org/codehaus/plexus/interpolation/RegexBasedInterpolatorTest.java              | 24 +++++++++++++++++++++---
 src/test/java/org/codehaus/plexus/interpolation/StringSearchInterpolatorTest.java            | 25 ++++++++++++++++++++++---
 src/test/java/org/codehaus/plexus/interpolation/fixed/EnvarBasedValueSourceTest.java         | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/test/java/org/codehaus/plexus/interpolation/fixed/FixedStringSearchInterpolatorTest.java | 25 +++++++++++++++++++++----
 8 files changed, 319 insertions(+), 12 deletions(-)
 create mode 100644 src/test/java/org/codehaus/plexus/interpolation/EnvarBasedValueSourceTest.java
 create mode 100644 src/test/java/org/codehaus/plexus/interpolation/fixed/EnvarBasedValueSourceTest.java
mb-olamy:plexus-interpolation olamy$

michael-o · 2017-05-23T08:33:25Z

@olamy Checked the branch. It now contains 4 ugly merge commits. Barely impossible to read the changes introduced.

olamy · 2017-05-23T11:11:16Z

well maybe @belingueres had some issues while rebasing.
But looking at the diff via the github ui everything looks good.

belingueres · 2017-05-23T12:42:31Z

Thanks you guys for your help. I think the problem was the squashing...I must be doing something wrong. Maybe you could squash the last changes into one commit in the merge-pr-11 branch and post the sequence of commands to illustrate how to do it right?

michael-o · 2017-05-24T08:57:34Z

I tried that locally with rebase. It produces non-mergable commits which must be resolved locally.

olamy · 2017-05-24T23:10:53Z

Ok so as said previously local merge works for me and github ui doesn't mention any conflict.
Sorry @belingueres I have to give here up as it looks impossible to convince @michael-o .....
I'm tired to waste my time....

michael-o · 2017-05-25T07:21:01Z

@olamy Can you squash the branch into one commit and push?

belingueres added 5 commits July 9, 2016 17:58

Fixed MultiDelimiterStringSearchInterpolator escape String code

2976eff

Modified ReflectionValueExtractor to a more up to date version

a3937b2

ReflectionValueExtractor version with capacity to parse expressions with arrays, lists and maps.

Commit to undo the changes I've made since forked the original projec…

4d088de

…t. The reason is that I've made a mistake and created a unique PR to solve several issues, which is a bad practice.

Merge remote-tracking branch 'upstream/master'

0eff699

belingueres force-pushed the Fix10 branch from 0af4e03 to 0ce53ef Compare August 22, 2016 17:59

belingueres force-pushed the Fix10 branch from 0ce53ef to 2307195 Compare August 22, 2016 18:24

Merge remote-tracking branch 'upstream/master' into Fix10

a1ef097

# Conflicts: # src/test/java/org/codehaus/plexus/interpolation/fixed/FixedStringSearchInterpolatorTest.java

Merge branch 'Fix10' of https://github.com/belingueres/plexus-interpo…

f9d4d43

…lation into Fix10

belingueres force-pushed the Fix10 branch from f8f8c36 to f9d4d43 Compare May 16, 2017 03:21

Reseted branch commit

acbce69

belingueres force-pushed the Fix10 branch from 5d806a2 to acbce69 Compare May 16, 2017 18:09

belingueres force-pushed the Fix10 branch from acbce69 to f9d4d43 Compare May 17, 2017 00:04

olamy merged commit d187343 into codehaus-plexus:master May 25, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix10 - RegexBasedInterpolatorTest fails when building with maven 3.4.0-SNAPSHOT #11

Fix10 - RegexBasedInterpolatorTest fails when building with maven 3.4.0-SNAPSHOT #11

belingueres commented Aug 21, 2016

michael-o commented Aug 22, 2016

belingueres commented Aug 22, 2016

michael-o commented May 12, 2017

belingueres commented May 15, 2017

michael-o commented May 15, 2017

belingueres commented May 16, 2017

michael-o commented May 16, 2017

belingueres commented May 16, 2017

olamy commented May 17, 2017

michael-o commented May 17, 2017 •

edited

Loading

olamy commented May 18, 2017

belingueres commented May 18, 2017

michael-o commented May 18, 2017 •

edited

Loading

olamy commented May 23, 2017 •

edited

Loading

michael-o commented May 23, 2017

olamy commented May 23, 2017

belingueres commented May 23, 2017

michael-o commented May 24, 2017

olamy commented May 24, 2017

michael-o commented May 25, 2017

Fix10 - RegexBasedInterpolatorTest fails when building with maven 3.4.0-SNAPSHOT #11

Fix10 - RegexBasedInterpolatorTest fails when building with maven 3.4.0-SNAPSHOT #11

Conversation

belingueres commented Aug 21, 2016

michael-o commented Aug 22, 2016

belingueres commented Aug 22, 2016

michael-o commented May 12, 2017

belingueres commented May 15, 2017

michael-o commented May 15, 2017

belingueres commented May 16, 2017

michael-o commented May 16, 2017

belingueres commented May 16, 2017

olamy commented May 17, 2017

michael-o commented May 17, 2017 • edited Loading

olamy commented May 18, 2017

belingueres commented May 18, 2017

michael-o commented May 18, 2017 • edited Loading

olamy commented May 23, 2017 • edited Loading

michael-o commented May 23, 2017

olamy commented May 23, 2017

belingueres commented May 23, 2017

michael-o commented May 24, 2017

olamy commented May 24, 2017

michael-o commented May 25, 2017

michael-o commented May 17, 2017 •

edited

Loading

michael-o commented May 18, 2017 •

edited

Loading

olamy commented May 23, 2017 •

edited

Loading