Uploaded image for project: 'Jenkins'
  1. Jenkins
  2. JENKINS-6966

Dependent plugins shows same description on installed page

    • Icon: Bug Bug
    • Resolution: Fixed
    • Icon: Minor Minor
    • core
    • None

      Installed plugins have the same description in the installed page as the plugins they depend on.

      e.g. ci-game, findbugs, and Static Analysis Collector Plug-in.
      screenshot attached.

      The details is on the IRC chat (dvaske, mindless and kohsuke) from [19:22:06]:
      http://echelog.matzon.dk/logs/browse/hudson/1278972000

          [JENKINS-6966] Dependent plugins shows same description on installed page

          dvaske added a comment -

          Major->minor issue.

          dvaske added a comment - Major->minor issue.

          Code changed in hudson
          User: : mindless
          Path:
          trunk/hudson/main/core/src/main/java/hudson/ClassicPluginStrategy.java
          trunk/hudson/main/core/src/main/java/hudson/PluginWrapper.java
          trunk/hudson/main/test/src/test/java/hudson/ClassicPluginStrategyTest.java
          trunk/hudson/main/test/src/test/resources/hudson/ClassicPluginStrategyTest/testDependencyClassLoader.zip
          trunk/www/changelog.html
          http://jenkins-ci.org/commit/32876
          Log:
          [FIXED JENKINS-6966] Plugins with dependencies show wrong description on
          installed plugins page. DependencyClassLoader checks dependencies before
          this plugin, so wrong index.jelly is found for plugins with dependencies.
          Added implementation of findResources in DependencyClassLoader, and use
          getResources to find the right index.jelly in PluginWrapper.getIndexPage().

          SCM/JIRA link daemon added a comment - Code changed in hudson User: : mindless Path: trunk/hudson/main/core/src/main/java/hudson/ClassicPluginStrategy.java trunk/hudson/main/core/src/main/java/hudson/PluginWrapper.java trunk/hudson/main/test/src/test/java/hudson/ClassicPluginStrategyTest.java trunk/hudson/main/test/src/test/resources/hudson/ClassicPluginStrategyTest/testDependencyClassLoader.zip trunk/www/changelog.html http://jenkins-ci.org/commit/32876 Log: [FIXED JENKINS-6966] Plugins with dependencies show wrong description on installed plugins page. DependencyClassLoader checks dependencies before this plugin, so wrong index.jelly is found for plugins with dependencies. Added implementation of findResources in DependencyClassLoader, and use getResources to find the right index.jelly in PluginWrapper.getIndexPage().

          Ulli Hafner added a comment -

          Some plug-ins still have wrong texts, see screenshot.

          Ulli Hafner added a comment - Some plug-ins still have wrong texts, see screenshot.

          Ulli Hafner added a comment -

          First two entries have wrong text.

          Ulli Hafner added a comment - First two entries have wrong text.

          Alan Harder added a comment -

          Ok, the problem here is those plugins don't have their own src/main/resources/index.jelly.. my fix above gets all the index.jelly in the classpath and picks the last one, which will be from THIS plugin if it exists. However, in these cases the plugin doesn't have one itself, so the last one in the list is from one of the dependencies.
          Perhaps I can check the result here and if it doesn't have the artifactId of this plugin in it somewhere, just return null.

          Alan Harder added a comment - Ok, the problem here is those plugins don't have their own src/main/resources/index.jelly .. my fix above gets all the index.jelly in the classpath and picks the last one, which will be from THIS plugin if it exists. However, in these cases the plugin doesn't have one itself, so the last one in the list is from one of the dependencies. Perhaps I can check the result here and if it doesn't have the artifactId of this plugin in it somewhere, just return null.

          Code changed in hudson
          User: : drulli
          Path:
          trunk/hudson/plugins/analysis-collector/src/main/resources/index.jelly
          trunk/hudson/plugins/analysis-core/src/main/resources/index.jelly
          http://jenkins-ci.org/commit/33310
          Log:
          [FIXED JENKINS-6966]: added missing index files.

          SCM/JIRA link daemon added a comment - Code changed in hudson User: : drulli Path: trunk/hudson/plugins/analysis-collector/src/main/resources/index.jelly trunk/hudson/plugins/analysis-core/src/main/resources/index.jelly http://jenkins-ci.org/commit/33310 Log: [FIXED JENKINS-6966] : added missing index files.

          Alan Harder added a comment -

          assigning back to me for fix mentioned above..

          Alan Harder added a comment - assigning back to me for fix mentioned above..

          Code changed in hudson
          User: : mindless
          Path:
          trunk/hudson/main/core/src/main/java/hudson/PluginWrapper.java
          http://jenkins-ci.org/commit/33311
          Log:
          [FIXED JENKINS-6966] in getIndexPage(), check that result has this plugin's artifactId
          in it, in case plugin has dependencies but is missing its own index.jelly.

          SCM/JIRA link daemon added a comment - Code changed in hudson User: : mindless Path: trunk/hudson/main/core/src/main/java/hudson/PluginWrapper.java http://jenkins-ci.org/commit/33311 Log: [FIXED JENKINS-6966] in getIndexPage(), check that result has this plugin's artifactId in it, in case plugin has dependencies but is missing its own index.jelly.

          Ulli Hafner added a comment -

          Integrated in Hudson Plug-ins (Compile) #31
          [FIXED JENKINS-6966]: added missing index files.
          [FIXED JENKINS-6966]: added missing index files.

          Ulli Hafner added a comment - Integrated in Hudson Plug-ins (Compile) #31 [FIXED JENKINS-6966] : added missing index files. [FIXED JENKINS-6966] : added missing index files.

            mindless Alan Harder
            dvaske dvaske
            Votes:
            0 Vote for this issue
            Watchers:
            1 Start watching this issue

              Created:
              Updated:
              Resolved: