XMLWordPrintable

    Details

    • Type: Bug
    • Status: Closed (View Workflow)
    • Priority: Major
    • Resolution: Done
    • Affects Version/s: 10.2.0.GA
    • Fix Version/s: 10.3.0.GA
    • Component/s: BPEL
    • Labels:
      None

      Description

      Reason: Mirror the Neon org.eclipse bpel and modify the IS to pull it on.
      Project page/sources: http://download.jboss.org/jbosstools/updates/requirements/bpel/1.1.0.Final/
      Version: .1.1.0.Final
      License and owner: EPL
      Original p2 repo:
      JBoss mirror: http://download.jboss.org/jbosstools/updates/requirements/bpel/1.1.0.Final/
      Include Sources: Yes
      Affected JBoss Tools components: Integration Stack
      Include in JBDS: Yes DevstudioIS
      Type of dependency: distribution
      List of bundles added/removed:

      diff --git a/target-platform/src/targets/community.target b/target-platform/src/targets/community.target
      index 221f8f5..5dbf8cc 100644
      --- a/target-platform/src/targets/community.target
      +++ b/target-platform/src/targets/community.target
      @@ -15,10 +15,10 @@
             <unit id="org.jboss.tools.project.examples.feature.feature.group" version="3.1.3.v20170210-2258"/>
             <unit id="org.jboss.tools.central.feature.feature.group" version="2.1.3.v20170116-1347"/>
             <!-- <repository location="http://download.jboss.org/jbosstools/neon/snapshots/builds/jbosstools-build-sites.aggregate.site_master/2016-04-22_12-52-32-B12137/all/repo/"/> -->
      -      <!-- <repository id="jbt-core-4.4.3.AM2" location="http://download.jboss.org/jbosstools/neon/staging/updates/core/4.4.3.AM2/"/> -->
      +      <repository id="jbt-core-4.4.4.AM2" location="http://download.jboss.org/jbosstools/neon/staging/updates/core/4.4.4.AM2/"/>
             <!-- <repository id="jbt-core-4.4.3.AM2" location="http://download.jboss.org/jbosstools/static/neon/development/updates/core/4.4.3.AM2/"/> -->
             <!-- <repository id="jbt-core-4.4.2.Final" location="http://download.jboss.org/jbosstools/static/neon/stable/updates/core/4.4.2.Final/"/> -->
      -      <repository id="jbt-core-4.4.3.Final" location="http://download.jboss.org/jbosstools/neon/stable/updates/core/"/>
      +      <!-- <repository id="jbt-core-4.4.3.Final" location="http://download.jboss.org/jbosstools/neon/stable/updates/core/"/> -->
           </location>
       
         </locations>
      diff --git a/target-platform/src/targets/core-base.target b/target-platform/src/targets/core-base.target
      index 4371409..845d8a6 100644
      --- a/target-platform/src/targets/core-base.target
      +++ b/target-platform/src/targets/core-base.target
      @@ -10,28 +10,28 @@
           <!-- JBoss Tools Core Base Dependencies
                ref: <repository loc>/site.properties -->
           <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
      -       <unit id="org.hibernate.eclipse.feature.feature.group" version="5.1.3.v20170210-1113"/>
      -       <unit id="org.jboss.ide.eclipse.archives.feature.feature.group" version="3.6.103.v20170119-2212"/>
      -       <unit id="org.jboss.ide.eclipse.as.feature.feature.group" version="3.2.3.v20170215-2039"/>
      +       <unit id="org.hibernate.eclipse.feature.feature.group" version="5.1.4.v20170320-1114"/>
      +       <unit id="org.jboss.ide.eclipse.archives.feature.feature.group" version="3.6.104.v20170308-1740"/>
      +       <unit id="org.jboss.ide.eclipse.as.feature.feature.group" version="3.2.4.v20170329-2139"/>
              <unit id="org.jboss.ide.eclipse.freemarker.feature.feature.group" version="1.5.300.v20161214-1103"/>
              <unit id="org.jboss.tools.cdi.deltaspike.feature.feature.group" version="1.8.3.v20161214-1452"/>
              <unit id="org.jboss.tools.cdi.feature.feature.group" version="1.8.3.v20161214-1452"/>
              <unit id="org.jboss.tools.cdi.seam.feature.feature.group" version="1.8.3.v20161214-1452"/>
              <unit id="org.jboss.tools.central.feature.feature.group" version="2.1.3.v20170116-1347"/>
              <unit id="org.jboss.tools.discovery.core" version="1.2.3.v20161214-0939"/>
      -       <unit id="org.jboss.tools.common.core.feature.feature.group" version="3.8.3.v20161213-1258"/>
      -       <unit id="org.jboss.tools.common.feature.feature.group" version="3.8.3.v20161213-1258"/>
      -       <unit id="org.jboss.tools.common.jdt.feature.feature.group" version="3.8.3.v20161213-1258"/>
      -       <unit id="org.jboss.tools.common.mylyn.feature.feature.group" version="3.8.3.v20161219-1810"/>
      -       <unit id="org.jboss.tools.common.text.ext.feature.feature.group" version="3.8.3.v20161213-1258"/>
      -       <unit id="org.jboss.tools.common.ui.feature.feature.group" version="3.8.3.v20161213-1258"/>
      -       <unit id="org.jboss.tools.common.verification.feature.feature.group" version="3.8.3.v20161213-1258"/>
      -       <unit id="org.jboss.tools.common.feature.feature.group" version="3.8.3.v20161213-1258"/>
      -       <unit id="org.jboss.tools.foundation.feature.feature.group" version="1.3.3.v20170217-0505"/>
      -       <unit id="org.jboss.tools.foundation.security.linux.feature.feature.group" version="1.3.3.v20161213-1258"/>
      -       <unit id="org.jboss.tools.foundation.help.ui" version="1.3.3.v20161213-1258"/>
      -       <unit id="org.jboss.tools.foundation.license.feature.feature.group" version="1.3.3.v20161213-1258"/>
      -       <unit id="org.jboss.tools.jmx.feature.feature.group" version="1.8.3.v20170207-2236"/>
      +       <unit id="org.jboss.tools.common.core.feature.feature.group" version="3.8.4.v20170316-1803"/>
      +       <unit id="org.jboss.tools.common.feature.feature.group" version="3.8.4.v20170316-1803"/>
      +       <unit id="org.jboss.tools.common.jdt.feature.feature.group" version="3.8.4.v20170316-1803"/>
      +       <unit id="org.jboss.tools.common.mylyn.feature.feature.group" version="3.8.4.v20170315-2230"/>
      +       <unit id="org.jboss.tools.common.text.ext.feature.feature.group" version="3.8.4.v20170316-1803"/>
      +       <unit id="org.jboss.tools.common.ui.feature.feature.group" version="3.8.4.v20170316-1803"/>
      +       <unit id="org.jboss.tools.common.verification.feature.feature.group" version="3.8.4.v20170316-1803"/>
      +       <unit id="org.jboss.tools.common.feature.feature.group" version="3.8.4.v20170316-1803"/>
      +       <unit id="org.jboss.tools.foundation.feature.feature.group" version="1.3.4.v20170330-0227"/>
      +       <unit id="org.jboss.tools.foundation.security.linux.feature.feature.group" version="1.3.4.v20170316-1803"/>
      +       <unit id="org.jboss.tools.foundation.help.ui" version="1.3.4.v20170316-1803"/>
      +       <unit id="org.jboss.tools.foundation.license.feature.feature.group" version="1.3.4.v20170316-1803"/>
      +       <unit id="org.jboss.tools.jmx.feature.feature.group" version="1.9.0.v20170329-1707"/>
              <unit id="org.jboss.tools.jsf.feature.feature.group" version="3.8.3.v20161214-1452"/>
              <unit id="org.jboss.tools.jst.feature.feature.group" version="3.8.3.v20161214-1634"/>
              <unit id="org.jboss.tools.maven.apt.feature.feature.group" version="1.3.0.201610261805"/>
      @@ -44,14 +44,14 @@
              <unit id="org.jboss.tools.maven.project.examples.feature.feature.group" version="3.1.3.v20161214-0939"/>
              <unit id="org.jboss.tools.maven.seam.feature.feature.group" version="1.8.3.v20161214-0939"/>
              <unit id="org.jboss.tools.maven.sourcelookup.feature.feature.group" version="1.8.3.v20161214-0939"/>
      -       <unit id="org.jboss.tools.openshift.cdk.feature.feature.group" version="3.3.2.v20170216-0102"/>
      -       <unit id="org.jboss.tools.openshift.egit.integration.feature.feature.group" version="3.3.2.v20161213-1011"/>
      -       <unit id="org.jboss.tools.openshift.express.feature.feature.group" version="3.3.2.v20170206-2133"/>
      -       <unit id="org.jboss.tools.openshift.feature.feature.group" version="3.3.2.v20170217-1414"/>
      -       <unit id="org.jboss.tools.openshift.js.feature.feature.group" version="3.3.2.v20170119-1710"/>
      +       <unit id="org.jboss.tools.openshift.cdk.feature.feature.group" version="3.3.3.v20170323-1409"/>
      +       <unit id="org.jboss.tools.openshift.egit.integration.feature.feature.group" version="3.3.3.v20170329-0817"/>
      +       <unit id="org.jboss.tools.openshift.express.feature.feature.group" version="3.3.3.v20170329-0817"/>
      +       <unit id="org.jboss.tools.openshift.feature.feature.group" version="3.3.3.v20170330-0321"/>
      +       <unit id="org.jboss.tools.openshift.js.feature.feature.group" version="3.3.3.v20170329-2232"/>
              <unit id="org.jboss.tools.portlet.feature.feature.group" version="1.6.0.Final-v20141209-0339-B20"/>
              <unit id="org.jboss.tools.project.examples.feature.feature.group" version="3.1.3.v20170210-2258"/>
      -       <unit id="org.jboss.tools.runtime.core.feature.feature.group" version="3.2.3.v20170125-1654"/>
      +       <unit id="org.jboss.tools.runtime.core.feature.feature.group" version="3.2.4.v20170316-1803"/>
              <unit id="org.jboss.tools.runtime.seam.detector.feature.feature.group" version="3.8.3.v20161214-1452"/>
              <unit id="org.jboss.tools.seam.feature.feature.group" version="3.8.3.v20161214-1452"/>
              <unit id="org.jboss.tools.stacks.core.feature.feature.group" version="1.3.3.v20161213-1258"/>
      @@ -60,11 +60,11 @@
              <unit id="org.mozilla.xpcom" version="1.9.2.16"/>
       
             <!-- <repository location="http://download.jboss.org/jbosstools/neon/snapshots/builds/jbosstools-build-sites.aggregate.site_master/2016-04-22_12-52-32-B12137/all/repo/"/> -->
      -      <!-- <repository id="jbt-core-4.4.3.AM2" location="http://download.jboss.org/jbosstools/neon/staging/updates/core/4.4.3.AM2/"/> -->
      +      <repository id="jbt-core-4.4.4.AM2" location="http://download.jboss.org/jbosstools/neon/staging/updates/core/4.4.4.AM2/"/>
             <!-- <repository id="jbt-core-4.4.3.AM2" location="http://download.jboss.org/jbosstools/static/neon/development/updates/core/4.4.3.AM2/"/> -->
             <!-- <repository location="http://download.jboss.org/jbosstools/neon/snapshots/updates/core/master"/> -->
             <!-- <repository id="jbt-core-4.4.3.Final" location="http://download.jboss.org/jbosstools/neon/staging/updates/core/4.4.3.Final/"/> -->
      -      <repository id="jbt-core-4.4.3.Final" location="http://download.jboss.org/jbosstools/neon/stable/updates/core/"/>
      +      <!-- <repository id="jbt-core-4.4.3.Final" location="http://download.jboss.org/jbosstools/neon/stable/updates/core/"/> -->
           </location>
       
         </locations>
      diff --git a/target-platform/src/targets/integration-stack-base-ea.target b/target-platform/src/targets/integration-stack-base-ea.target
      index a237c54..c0711e9 100644
      --- a/target-platform/src/targets/integration-stack-base-ea.target
      +++ b/target-platform/src/targets/integration-stack-base-ea.target
      @@ -15,27 +15,27 @@
             <!-- TODO: consider migrating UI tests to https://github.com/jbosstools/jbosstools-integration-tests/ so they're built downstream instead of within the components' builds -->
             <unit id="org.jboss.tools.test.feature.feature.group" version="3.7.3.v20161213-1258"/>
             <unit id="org.jboss.tools.tests" version="3.7.3.v20161213-1258"/>
      -      <unit id="org.jboss.tools.as.test.core" version="3.2.3.v20170119-2212"/>
      -      <unit id="org.jboss.tools.common.base.test" version="3.8.3.v20161213-1258"/>
      -      <unit id="org.jboss.tools.common.test" version="3.8.3.v20161213-1258"/>
      -      <unit id="org.jboss.tools.jmx.core.test" version="1.8.3.v20170119-2212"/>
      +      <unit id="org.jboss.tools.as.test.core" version="3.2.4.v20170329-2126"/>
      +      <unit id="org.jboss.tools.common.base.test" version="3.8.4.v20170316-1803"/>
      +      <unit id="org.jboss.tools.common.test" version="3.8.4.v20170316-1803"/>
      +      <unit id="org.jboss.tools.jmx.core.test" version="1.9.0.v20170329-1655"/>
       
             <!-- <repository location="http://download.jboss.org/jbosstools/neon/snapshots/builds/jbosstools-build-sites.aggregate.coretests-site_master/2016-04-22_12-52-32-B5049/all/repo/"/>-->
             <!-- <repository location="http://download.jboss.org/jbosstools/static/mars/stable/updates/coretests/4.3.0.Final/"/> -->
      -      <!-- <repository location="http://download.jboss.org/jbosstools/neon/staging/updates/coretests/4.4.2.Final/"/> -->
      +      <repository  id="jbt-coretests-4.4.4.AM2" location="http://download.jboss.org/jbosstools/neon/staging/updates/coretests/4.4.4.AM2/"/>
             <!-- <repository id="jbt-coretests-4.4.2.Final" location="http://download.jboss.org/jbosstools/static/neon/development/updates/coretests/4.4.3.AM2/"/> -->
      -      <repository id="jbt-coretests-4.4.3.Final" location="http://download.jboss.org/jbosstools/static/neon/stable/updates/coretests/4.4.3.Final/"/>
      +      <!-- <repository id="jbt-coretests-4.4.3.Final" location="http://download.jboss.org/jbosstools/static/neon/stable/updates/coretests/4.4.3.Final/"/> -->
          </location>
       
          <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
      -      <unit id="org.jboss.tools.common" version="3.8.3.v20161213-1258"/>
      +      <unit id="org.jboss.tools.common" version="3.8.4.v20170316-1803"/>
       
             <!-- <repository location="http://download.jboss.org/jbosstools/neon/snapshots/builds/jbosstools-build-sites.aggregate.site_master/2016-04-22_12-52-32-B12137/all/repo/"/> -->
      -      <!-- <repository id="jbt-core-4.4.3.AM2" location="http://download.jboss.org/jbosstools/neon/staging/updates/core/4.4.3.AM2/"/> -->
      +      <repository id="jbt-core-4.4.4.AM2" location="http://download.jboss.org/jbosstools/neon/staging/updates/core/4.4.4.AM2/"/>
             <!-- <repository id="jbt-core-4.4.3.AM2" location="http://download.jboss.org/jbosstools/static/neon/development/updates/core/4.4.3.AM2/"/> -->
             <!-- <repository location="http://download.jboss.org/jbosstools/neon/staging/updates/core/4.4.2.Final/"/> -->
             <!-- <repository id="jbt-core-4.4.2.Final" location="http://download.jboss.org/jbosstools/static/neon/stable/updates/core/4.4.2.Final/"/> -->
      -      <repository id="jbt-core-4.4.3.Final" location="http://download.jboss.org/jbosstools/neon/stable/updates/core/"/>
      +      <!-- <repository id="jbt-core-4.4.3.Final" location="http://download.jboss.org/jbosstools/neon/stable/updates/core/"/> -->
          </location>
       
         </locations>
      diff --git a/target-platform/src/targets/integration-stack-base.target b/target-platform/src/targets/integration-stack-base.target
      index e51d725..a6fe17f 100644
      --- a/target-platform/src/targets/integration-stack-base.target
      +++ b/target-platform/src/targets/integration-stack-base.target
      @@ -17,13 +17,19 @@
           
           <!-- BPEL -->
           <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
      -      <unit id="org.eclipse.bpel.common.feature.feature.group" version="1.0.5.Final-v20160115-1558"/>
      -      <unit id="org.eclipse.bpel.feature.feature.group" version="1.0.5.Final-v20160115-1558"/>
      -      <unit id="org.eclipse.bpel.apache.ode.runtime.feature.feature.group" version="1.0.5.Final-v20160115-1558"/>
      -      <unit id="org.eclipse.bpel.common.feature.source.feature.group" version="1.0.5.Final-v20160115-1558"/>
      -      <unit id="org.eclipse.bpel.feature.source.feature.group" version="1.0.5.Final-v20160115-1558"/>
      -      <unit id="org.eclipse.bpel.apache.ode.runtime.feature.source.feature.group" version="1.0.5.Final-v20160115-1558"/>
      -      <repository id="jbt-bpel" location="http://download.jboss.org/jbosstools/updates/requirements/bpel/"/>
      +      <unit id="org.eclipse.bpel.common.feature.feature.group" version="1.1.0.Final-v20160121-1401"/>
      +      <unit id="org.eclipse.bpel.feature.feature.group" version="1.1.0.Final-v20160121-1401"/>
      +      <unit id="org.eclipse.bpel.apache.ode.runtime.feature.feature.group" version="1.1.0.Final-v20160121-1401"/>
      +      <unit id="org.eclipse.bpel.common.feature.source.feature.group" version="1.1.0.Final-v20160121-1401"/>
      +      <unit id="org.eclipse.bpel.feature.source.feature.group" version="1.1.0.Final-v20160121-1401"/>
      +      <unit id="org.eclipse.bpel.apache.ode.runtime.feature.source.feature.group" version="1.1.0.Final-v20160121-1401"/>
      +      <repository id="jbt-bpel" location="http://download.jboss.org/jbosstools/updates/requirements/bpel/1.1.0.Final/"/>
      +    </location>
      +
      +    <!-- Reddeer - QE -->
      +    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
      +       <unit id="org.jboss.reddeer.graphiti.feature.feature.group" version="1.2.1.Final"/>
      +      <repository id="jbt-reddeer" location="http://download.jboss.org/jbosstools/neon/stable/updates/reddeer/1.2.1/"/>
           </location>
       
           <!-- JBoss Tools Locus - objects either not in Eclipse Orbit or needed sooner than scheduled. -->
      @@ -71,7 +77,7 @@
             <unit id="org.eclipse.emf.ecore.feature.group" version="2.12.0.v20160420-0247"/>
             <unit id="org.eclipse.emf.codegen.ecore.ui.feature.group" version="2.12.0.v20160526-0356"/>
       
      -      <unit id="org.eclipse.uml2.feature.group" version="5.2.2.v20161114-0827"/>
      +      <unit id="org.eclipse.uml2.feature.group" version="5.2.3.v20170227-0935"/>
       
             <!-- Google Guava : Eclipse EMF -->
             <unit id="com.google.guava" version="15.0.0.v201403281430"/>
      @@ -141,7 +147,7 @@
             <unit id="org.eclipse.birt.core" version="4.6.0.v201606072122"/>
       
             <!-- <repository id="jbt-neon" location="http://download.jboss.org/jbosstools/updates/requirements/neon/"/>  -->
      -      <repository id="jbt-neon" location="http://download.jboss.org/jbosstools/updates/requirements/neon/201612071000-RC4/"/> 
      +      <repository id="jbt-neon" location="http://download.jboss.org/jbosstools/updates/requirements/neon/201703231000-Neon.3/"/> 
           </location>
       
           <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
      @@ -239,25 +245,27 @@
             <!-- TODO: consider migrating UI tests to https://github.com/jbosstools/jbosstools-integration-tests/ so they're built downstream instead of within the components' builds -->
             <unit id="org.jboss.tools.test.feature.feature.group" version="3.7.3.v20161213-1258"/>
             <unit id="org.jboss.tools.tests" version="3.7.3.v20161213-1258"/>
      -      <unit id="org.jboss.tools.as.test.core" version="3.2.3.v20170119-2212"/>
      -      <unit id="org.jboss.tools.common.base.test" version="3.8.3.v20161213-1258"/>
      -      <unit id="org.jboss.tools.common.test" version="3.8.3.v20161213-1258"/>
      -      <unit id="org.jboss.tools.jmx.core.test" version="1.8.3.v20170119-2212"/>
      +      <unit id="org.jboss.tools.as.test.core" version="3.2.4.v20170329-2126"/>
      +      <unit id="org.jboss.tools.common.base.test" version="3.8.4.v20170316-1803"/>
      +      <unit id="org.jboss.tools.common.test" version="3.8.4.v20170316-1803"/>
      +      <unit id="org.jboss.tools.jmx.core.test" version="1.9.0.v20170329-1655"/>
       
             <!-- <repository location="http://download.jboss.org/jbosstools/neon/snapshots/builds/jbosstools-build-sites.aggregate.coretests-site_master/2016-04-22_12-52-32-B5049/all/repo/"/>-->
             <!-- <repository location="http://download.jboss.org/jbosstools/static/mars/stable/updates/coretests/4.3.0.Final/"/> -->
             <!-- <repository location="http://download.jboss.org/jbosstools/neon/staging/updates/coretests/4.4.2.Final/"/> -->
      +      <repository id="jbt-core-tests-4.4.4.AM2" location="http://download.jboss.org/jbosstools/neon/staging/updates/coretests/4.4.4.AM2/"/>
             <!-- <repository id="jbt-core-4.4.3.AM2" location="http://download.jboss.org/jbosstools/static/neon/development/updates/coretests/4.4.3.AM2/"/> -->
      -      <repository id="jbt-coretests-4.4.3.Final" location="http://download.jboss.org/jbosstools/static/neon/stable/updates/coretests/4.4.3.Final/"/>
      +      <!-- <repository id="jbt-coretests-4.4.3.Final" location="http://download.jboss.org/jbosstools/static/neon/stable/updates/coretests/4.4.3.Final/"/> -->
             <!-- <repository id="jbt-coretests-4.4.2.Final" location="http://download.jboss.org/jbosstools/static/neon/stable/updates/coretests/4.4.2.Final/"/> -->
          </location>
       
          <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
      -      <unit id="org.jboss.tools.common" version="3.8.3.v20161213-1258"/>
      +      <unit id="org.jboss.tools.common" version="3.8.4.v20170316-1803"/>
       
             <!-- <repository location="http://download.jboss.org/jbosstools/neon/snapshots/builds/jbosstools-build-sites.aggregate.site_master/2016-04-22_12-52-32-B12137/all/repo/"/> -->
      -      <!-- <repository id="jbt-core-4.4.3.AM2" location="http://download.jboss.org/jbosstools/static/neon/development/updates/core/4.4.3.AM2/"/> -->
      -      <repository id="jbt-core-4.4.3.Final" location="http://download.jboss.org/jbosstools/neon/stable/updates/core/"/>
      +      <repository id="jbt-core-4.4.4.AM2" location="http://download.jboss.org/jbosstools/neon/staging/updates/core/4.4.4.AM2/"/>
      +      <!-- <repository id="jbt-core-4.4.3.AM2" location="http://download.jboss.org/jbosstools/static/neon/development/updates/core/4.4.4.AM1/"/> -->
      +      <!-- <repository id="jbt-core-4.4.3.Final" location="http://download.jboss.org/jbosstools/neon/stable/updates/core/"/> -->
             <!-- <repository id="jbt-core-4.4.2.Final" location="http://download.jboss.org/jbosstools/static/neon/stable/updates/core/4.4.2.Final/"/> -->
          </location>
      

        Gliffy Diagrams

          Attachments

            Activity

              People

              • Assignee:
                pleacu Paul Leacu
                Reporter:
                pleacu Paul Leacu
              • Votes:
                0 Vote for this issue
                Watchers:
                1 Start watching this issue

                Dates

                • Created:
                  Updated:
                  Resolved: