[maven-resolver] branch MRESOLVER-127 updated (fcf6a8f -> 930359a)

[mi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a change to branch MRESOLVER-127
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git.


 discard fcf6a8f  [MRESOLVER-127] Don't use boolean for property 'aether.updateCheckManager.sessionState'
     new 930359a  [MRESOLVER-127] Don't use boolean for property 'aether.updateCheckManager.sessionState'

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (fcf6a8f)
            \
             N -- N -- N   refs/heads/MRESOLVER-127 (930359a)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

[maven-resolver] 01/01: [MRESOLVER-127] Don't use boolean for property 'aether.updateCheckManager.sessionState'

[mi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch MRESOLVER-127
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git

commit 930359a6833c14eb7f5871c6323305a0388c7846
Author: Michael Osipov <mi...@siemens.com>
AuthorDate: Tue Jun 23 10:21:04 2020 +0200

    [MRESOLVER-127] Don't use boolean for property 'aether.updateCheckManager.sessionState'
    
    This closes #62
---
 .../org/eclipse/aether/internal/impl/DefaultUpdateCheckManager.java | 4 ++--
 .../eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManager.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManager.java
index e7f2c8e..f1892c5 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManager.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManager.java
@@ -446,8 +446,8 @@ public class DefaultUpdateCheckManager
 
     private int getSessionState( RepositorySystemSession session )
     {
-        String mode = ConfigUtils.getString( session, "true", CONFIG_PROP_SESSION_STATE );
-        if ( Boolean.parseBoolean( mode ) )
+        String mode = ConfigUtils.getString( session, "enabled", CONFIG_PROP_SESSION_STATE );
+        if ( Boolean.parseBoolean( mode ) || "enabled".equalsIgnoreCase( mode ) )
         {
             // perform update check at most once per session, regardless of update policy
             return STATE_ENABLED;
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java
index 8ca42c0..3b38e8b 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java
@@ -8,9 +8,9 @@ package org.eclipse.aether.internal.impl;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -338,10 +338,12 @@ public class DefaultUpdateCheckManagerTest
         resetSessionData( session );
         manager.touchMetadata( session, check );
 
+        // TODO This will be changed to 'enabled' in a future version
         session.setConfigProperty( DefaultUpdateCheckManager.CONFIG_PROP_SESSION_STATE, "true" );
         manager.checkMetadata( session, check );
         assertEquals( false, check.isRequired() );
 
+        // TODO This will be changed to 'disabled' in a future version
         session.setConfigProperty( DefaultUpdateCheckManager.CONFIG_PROP_SESSION_STATE, "false" );
         manager.checkMetadata( session, check );
         assertEquals( true, check.isRequired() );