Uploaded image for project: 'RH-SSO'
  1. RH-SSO
  2. RHSSO-1279

Conflict detected in Windows env. when applying patch

XMLWordPrintable

    • Icon: Bug Bug
    • Resolution: Done
    • Icon: Critical Critical
    • RH-SSO-7.2.1.CR3
    • RH-SSO-7.2.0.CR1
    • Distribution
    • None
    • Hide

      1) Install rh-sso 7.2.0 by unzipping the zip installer (https://access.redhat.com/jbossnetwork/restricted/softwareDetail.html?softwareId=55951&product=core.service.rhsso&version=7.2&downloadType=distributions)

      2) Download "rh-sso-7.2.1.CR3-patch.zip" internal release

      3) > jboss-cli.bat --commands="patch apply D:\tmp\rh-sso-7.2.1.CR3-patch.zip"

      4) output:
      D:\applications\rh-sso-7.2\bin>jboss-cli.bat --command="patch apply D:\tmp\rh-sso-7.2.1.CR3
      -patch.zip"
      Conflicts detected: docs/licenses-rh-sso/org.keycloak,keycloak-authz-policy-drools,3.4.3.Final-redha
      t-2,Apache Software License 2.0.txt, docs/licenses-rh-sso/org.keycloak,keycloak-common,3.4.3.Final-r
      edhat-2,Apache Software License 2.0.txt, docs/licenses-rh-sso/org.keycloak,keycloak-core,3.4.3.Final
      -redhat-2,Apache Software License 2.0.txt, docs/licenses-rh-sso/org.keycloak,keycloak-js-adapter,3.4
      .3.Final-redhat-2,Apache Software License 2.0.txt, docs/licenses-rh-sso/org.keycloak,keycloak-kerber
      os-federation,3.4.3.Final-redhat-2,Apache Software License 2.0.txt, docs/licenses-rh-sso/org.keycloa
      k,keycloak-ldap-federation,3.4.3.Final-redhat-2,Apache Software License 2.0.txt, docs/licenses-rh-ss
      o/org.keycloak,keycloak-model-infinispan,3.4.3.Final-redhat-2,Apache Software License 2.0.txt, docs/
      licenses-rh-sso/org.keycloak,keycloak-model-jpa,3.4.3.Final-redhat-2,Apache Software License 2.0.txt
      , docs/licenses-rh-sso/org.keycloak,keycloak-saml-core,3.4.3.Final-redhat-2,Apache Software License
      2.0.txt, docs/licenses-rh-sso/org.keycloak,keycloak-saml-core-public,3.4.3.Final-redhat-2,Apache Sof
      tware License 2.0.txt, docs/licenses-rh-sso/org.keycloak,keycloak-server-spi,3.4.3.Final-redhat-2,Ap
      ache Software License 2.0.txt, docs/licenses-rh-sso/org.keycloak,keycloak-server-spi-private,3.4.3.F
      inal-redhat-2,Apache Software License 2.0.txt, docs/licenses-rh-sso/org.keycloak,keycloak-services,3
      .4.3.Final-redhat-2,Apache Software License 2.0.txt, docs/licenses-rh-sso/org.keycloak,keycloak-sssd
      -federation,3.4.3.Final-redhat-2,Apache Software License 2.0.txt, docs/licenses-rh-sso/org.keycloak,
      keycloak-wildfly-adduser,3.4.3.Final-redhat-2,Apache Software License 2.0.txt, docs/licenses-rh-sso/
      org.keycloak,keycloak-wildfly-extensions,3.4.3.Final-redhat-2,Apache Software License 2.0.txt, docs/
      licenses-rh-sso/org.keycloak,keycloak-wildfly-server-subsystem,3.4.3.Final-redhat-2,Apache Software
      License 2.0.txt
      Use the --override-all, --override=[] or --preserve=[] arguments in order to resolve the conflict.

      Show
      1) Install rh-sso 7.2.0 by unzipping the zip installer ( https://access.redhat.com/jbossnetwork/restricted/softwareDetail.html?softwareId=55951&product=core.service.rhsso&version=7.2&downloadType=distributions ) 2) Download "rh-sso-7.2.1.CR3-patch.zip" internal release 3) > jboss-cli.bat --commands="patch apply D:\tmp\rh-sso-7.2.1.CR3-patch.zip" 4) output: D:\applications\rh-sso-7.2\bin>jboss-cli.bat --command="patch apply D:\tmp\rh-sso-7.2.1.CR3 -patch.zip" Conflicts detected: docs/licenses-rh-sso/org.keycloak,keycloak-authz-policy-drools,3.4.3.Final-redha t-2,Apache Software License 2.0.txt, docs/licenses-rh-sso/org.keycloak,keycloak-common,3.4.3.Final-r edhat-2,Apache Software License 2.0.txt, docs/licenses-rh-sso/org.keycloak,keycloak-core,3.4.3.Final -redhat-2,Apache Software License 2.0.txt, docs/licenses-rh-sso/org.keycloak,keycloak-js-adapter,3.4 .3.Final-redhat-2,Apache Software License 2.0.txt, docs/licenses-rh-sso/org.keycloak,keycloak-kerber os-federation,3.4.3.Final-redhat-2,Apache Software License 2.0.txt, docs/licenses-rh-sso/org.keycloa k,keycloak-ldap-federation,3.4.3.Final-redhat-2,Apache Software License 2.0.txt, docs/licenses-rh-ss o/org.keycloak,keycloak-model-infinispan,3.4.3.Final-redhat-2,Apache Software License 2.0.txt, docs/ licenses-rh-sso/org.keycloak,keycloak-model-jpa,3.4.3.Final-redhat-2,Apache Software License 2.0.txt , docs/licenses-rh-sso/org.keycloak,keycloak-saml-core,3.4.3.Final-redhat-2,Apache Software License 2.0.txt, docs/licenses-rh-sso/org.keycloak,keycloak-saml-core-public,3.4.3.Final-redhat-2,Apache Sof tware License 2.0.txt, docs/licenses-rh-sso/org.keycloak,keycloak-server-spi,3.4.3.Final-redhat-2,Ap ache Software License 2.0.txt, docs/licenses-rh-sso/org.keycloak,keycloak-server-spi-private,3.4.3.F inal-redhat-2,Apache Software License 2.0.txt, docs/licenses-rh-sso/org.keycloak,keycloak-services,3 .4.3.Final-redhat-2,Apache Software License 2.0.txt, docs/licenses-rh-sso/org.keycloak,keycloak-sssd -federation,3.4.3.Final-redhat-2,Apache Software License 2.0.txt, docs/licenses-rh-sso/org.keycloak, keycloak-wildfly-adduser,3.4.3.Final-redhat-2,Apache Software License 2.0.txt, docs/licenses-rh-sso/ org.keycloak,keycloak-wildfly-extensions,3.4.3.Final-redhat-2,Apache Software License 2.0.txt, docs/ licenses-rh-sso/org.keycloak,keycloak-wildfly-server-subsystem,3.4.3.Final-redhat-2,Apache Software License 2.0.txt Use the --override-all, --override=[] or --preserve=[] arguments in order to resolve the conflict.

      In Windows env., applying the server patch using CLI command line tool will lead to unwanted conflict report, the affected files are some licence txt files in /docs folder.

      During investigation, it looks like the root case was wrong hash code are used for affected files in "patch.xml" A lot of files using same hash code "05cec7c34d97427588cd521b7b408705986f7685"

      However, the different behaviour (no conflict report on Linux) suggests there might be some problem in validation code in JBoss CLI .

              mkanis Martin Kanis
              rhn-support-lywang Lyle Wang (Inactive)
              Votes:
              0 Vote for this issue
              Watchers:
              7 Start watching this issue

                Created:
                Updated:
                Resolved: