apache · mbien · Jan 9, 2024 · Dec 6, 2023
diff --git a/ide/hudson.git/src/org/netbeans/modules/hudson/git/Bundle.properties b/ide/hudson.git/src/org/netbeans/modules/hudson/git/Bundle.properties
@@ -14,4 +14,4 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-OpenIDE-Module-Name=Hudson Git Bindings
+OpenIDE-Module-Name=Jenkins Git Bindings
diff --git a/ide/hudson.git/src/org/netbeans/modules/hudson/git/HudsonGitSCM.java b/ide/hudson.git/src/org/netbeans/modules/hudson/git/HudsonGitSCM.java
@@ -60,8 +60,8 @@ public class HudsonGitSCM implements HudsonSCM {
     private static final Logger LOG = Logger.getLogger(HudsonGitSCM.class.getName());
 
     @Messages({
-        "# {0} - original URL", "# {1} - replacement URL", "ro_replacement=Replacing {0} with {1} in Hudson configuration.",
-        "# {0} - repository location", "warning.local_repo={0} will only be accessible from a Hudson server on the same machine."
+        "# {0} - original URL", "# {1} - replacement URL", "ro_replacement=Replacing {0} with {1} in Jenkins configuration.",
+        "# {0} - repository location", "warning.local_repo={0} will only be accessible from a Jenkins server on the same machine."
     })
     @Override public Configuration forFolder(File folder) {
         if (!new File(folder, ".git").isDirectory()) {

diff --git a/ide/hudson.mercurial/src/org/netbeans/modules/hudson/mercurial/Bundle.properties b/ide/hudson.mercurial/src/org/netbeans/modules/hudson/mercurial/Bundle.properties
@@ -14,4 +14,4 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-OpenIDE-Module-Name=Hudson Mercurial Bindings
+OpenIDE-Module-Name=Jenkins Mercurial Bindings
diff --git a/ide/hudson.mercurial/src/org/netbeans/modules/hudson/mercurial/HudsonMercurialSCM.java b/ide/hudson.mercurial/src/org/netbeans/modules/hudson/mercurial/HudsonMercurialSCM.java
@@ -61,7 +61,7 @@ public class HudsonMercurialSCM implements HudsonSCM {
 
     @Messages({
         "# {0} - repository location",
-        "warning.local_repo={0} will only be accessible from a Hudson server on the same machine.",
+        "warning.local_repo={0} will only be accessible from a Jenkins server on the same machine.",
         "error.repo.in.parent=Cannot find repository metadata in the project folder. Please configure the build manually."
     })
     public Configuration forFolder(File folder) {

diff --git a/ide/hudson.subversion/src/org/netbeans/modules/hudson/subversion/Bundle.properties b/ide/hudson.subversion/src/org/netbeans/modules/hudson/subversion/Bundle.properties
@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-OpenIDE-Module-Name=Hudson Subversion Bindings
+OpenIDE-Module-Name=Jenkins Subversion Bindings
 # {0} - file basename
 # {1} - revision number
 SubversionHyperlink.title={0} #{1,number,#}
diff --git a/ide/hudson.tasklist/src/org/netbeans/modules/hudson/tasklist/Bundle.properties b/ide/hudson.tasklist/src/org/netbeans/modules/hudson/tasklist/Bundle.properties
@@ -14,4 +14,4 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-OpenIDE-Module-Name=Hudson Action Items
+OpenIDE-Module-Name=Jenkins Action Items
diff --git a/ide/hudson.tasklist/src/org/netbeans/modules/hudson/tasklist/HudsonScanner.java b/ide/hudson.tasklist/src/org/netbeans/modules/hudson/tasklist/HudsonScanner.java
@@ -58,8 +58,8 @@ private static class CacheEntry {
     private final Map<Project,CacheEntry> cache = new WeakHashMap<Project,CacheEntry>();
 
     @Messages({
-        "HudsonScanner.displayName=Hudson Warnings",
-        "HudsonScanner.description=Warnings and other action items coming from Hudson servers, currently supporting the Static Analysis plugin suite."
+        "HudsonScanner.displayName=Jenkins Warnings",
+        "HudsonScanner.description=Warnings and other action items coming from Jenkins servers, currently supporting the Static Analysis plugin suite."
     })
     public HudsonScanner() {
         super(HudsonScanner_displayName(), HudsonScanner_description(), null);

diff --git a/ide/hudson.ui/licenseinfo.xml b/ide/hudson.ui/licenseinfo.xml
@@ -23,8 +23,14 @@
     <fileset>
         <file>src/org/netbeans/modules/hudson/ui/resources/notification.png</file>
         <file>src/org/netbeans/modules/hudson/ui/resources/hudson.png</file>
-        <file>src/org/netbeans/modules/hudson/ui/resources/instance.png</file>
         <license ref="Apache-2.0-ASF" />
         <comment type="COMMENT_UNSUPPORTED" />
     </fileset>
+    <fileset>
+        <file>src/org/netbeans/modules/hudson/ui/resources/instance.png</file>
+        <license ref="CC-BY-SA-3.0" />
+        <notice>Original image from the Jenkins project (https://jenkins.io/):
+https://github.com/jenkins-infra/jenkins.io/blob/master/content/images/logos/jenkins/jenkins.svg
+(placed on square background, rendered to 16x16px with inkscape)</notice>
+    </fileset>
 </licenseinfo>
diff --git a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/Bundle.properties b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/Bundle.properties
@@ -16,7 +16,7 @@
 # under the License.
 
 OpenIDE-Module-Display-Category=Base IDE
-OpenIDE-Module-Name=Hudson UI
+OpenIDE-Module-Name=Jenkins UI
 
 FormLogin.locationLabel.text=&Server:
 FormLogin.userLabel.text=&Username:
@@ -25,4 +25,4 @@ APITokenConnectionAuthenticator.userLabel.text=&Username:
 APITokenConnectionAuthenticator.locationLabel.text=&Server:
 APITokenConnectionAuthenticator.tokLabel.text=API &Token:
 APITokenConnectionAuthenticator.tokButton.text=&Find...
-OpenIDE-Module-Short-Description=User Interface and IDE integration for Hudson Support
+OpenIDE-Module-Short-Description=User Interface and IDE integration for Jenkins Support
diff --git a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/FormLogin.java b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/FormLogin.java
@@ -49,7 +49,7 @@ private FormLogin() {
     public static class AuthImpl implements PasswordAuthorizer {
 
         @Messages({
-            "FormLogin.log_in=Log in to Hudson",
+            "FormLogin.log_in=Log in to Jenkins",
             "# {0} - server location", "# {1} - user name", "FormLogin.password_description=Password for {1} on {0}"
         })
         @Override

diff --git a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/actions/AddInstanceAction.java b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/actions/AddInstanceAction.java
@@ -26,7 +26,7 @@
 import org.openide.util.NbBundle;
 
 /**
- * Add Hudson instance action launches the wizard.
+ * Add Jenkins instance action launches the wizard.
  */
 public class AddInstanceAction extends AbstractAction {
 

diff --git a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/actions/AddTestInstanceAction.java b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/actions/AddTestInstanceAction.java
@@ -45,7 +45,7 @@ public class AddTestInstanceAction extends AbstractAction implements Runnable {
 
     private static final Logger LOG = Logger.getLogger(AddTestInstanceAction.class.getName());
 
-    @Messages("AddTestInstanceAction.label=Try Hudson on &Localhost")
+    @Messages("AddTestInstanceAction.label=Try Jenkins on &Localhost")
     public AddTestInstanceAction() {
         super(Bundle.AddTestInstanceAction_label());
     }
@@ -57,8 +57,8 @@ public void actionPerformed(ActionEvent e) {
 
     @Messages({
         "# {0} - path to javaws", "AddTestInstanceAction.no_javaws=Could not find {0}. Run: javaws https://hudson.dev.java.net/hudson.jnlp",
-        "AddTestInstanceAction.could_not_run=Could not download or run Hudson. Run: javaws https://hudson.dev.java.net/hudson.jnlp",
-        "AddTestInstanceAction.starting=Downloading & running Hudson...",
+        "AddTestInstanceAction.could_not_run=Could not download or run Jenkins. Run: javaws https://hudson.dev.java.net/hudson.jnlp",
+        "AddTestInstanceAction.starting=Downloading & running Jenkins...",
         "AddTestInstanceAction.instance_name=Local Test Server"
     })
     @Override

diff --git a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/actions/Bundle.properties b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/actions/Bundle.properties
@@ -15,18 +15,18 @@
 # specific language governing permissions and limitations
 # under the License.
 
-LBL_Add_Instance=&Add Hudson Instance...
+LBL_Add_Instance=&Add jenkins Instance...
 
 LBL_StartJobAction=&Start Job
 ShowChanges.label=Show Changes
 ShowChanges.no_changes=No changes.
 # {0} - job #build
 ShowChanges.title={0} changes
-CreateJobPanel.pick_server=Pick a Hudson server to create a job on.
+CreateJobPanel.pick_server=Pick a Jenkins server to create a job on.
 CreateJobPanel.pick_project=Pick a project to create a job for.
 CreateJobPanel.unknown_project_type=The IDE does not know how to set up a job for this project.
 CreateJobPanel.name_taken=This name is taken. Pick another.
-CreateJobPanel.already_associated=This project already seems to be associated with a Hudson job.
+CreateJobPanel.already_associated=This project already seems to be associated with a Jenkins job.
 CreateJobPanel.AccessibleContext.accessibleDescription=Create a new build job for a project.
 CreateJobPanel.explanationLabel.text=<html>Build Server will automatically get the sources and libraries from the same\n<br>source code repository and run the same build targets as your local project.
 CreateJobPanel.browse.AccessibleContext.accessibleDescription=Select a project to build from disk.

diff --git a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/actions/CreateJob.java b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/actions/CreateJob.java
@@ -139,10 +139,10 @@ boolean runCustomActionIfAvailable(ActionEvent e) {
         "CreateJob.failure=Could not create job. Please check your server's log for details.",
         "# UI logging of creating new build job",
         "# {0} - project type",
-        "UI_HUDSON_JOB_CREATED=New Hudson build job created [project type: {0}]",
+        "UI_HUDSON_JOB_CREATED=New Jenkins build job created [project type: {0}]",
         "# Usage Logging",
         "# {0} - project type",
-        "USG_HUDSON_JOB_CREATED=New Hudson build job created [project type: {0}]"
+        "USG_HUDSON_JOB_CREATED=New Jenkins build job created [project type: {0}]"
     })
     private void finalizeJob(HudsonInstance instance, ProjectHudsonJobCreator creator, String name, Project project) {
         try {

diff --git a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/actions/ProjectAssociationAction.java b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/actions/ProjectAssociationAction.java
@@ -60,8 +60,8 @@ public ProjectAssociationAction(HudsonJob job) {
     @Messages({
         "ProjectAssociationAction.open_some_projects=Open some projects to choose from.",
         "ProjectAssociationAction.title_select_project=Select Project",
-        "ProjectAssociationAction.could_not_associate=Failed to record a Hudson job association.",
-        "ProjectAssociationAction.could_not_dissociate=Failed to find the Hudson job association to be removed."
+        "ProjectAssociationAction.could_not_associate=Failed to record a Jenkins job association.",
+        "ProjectAssociationAction.could_not_dissociate=Failed to find the Jenkins job association to be removed."
     })
     @Override public void actionPerformed(ActionEvent e) {
         if (alreadyAssociatedProject == null) {

diff --git a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/impl/SearchProviderImpl.java b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/impl/SearchProviderImpl.java
@@ -30,7 +30,7 @@
 import org.netbeans.spi.quicksearch.SearchResponse;
 import org.openide.util.NbBundle.Messages;
 
-@Messages("quicksearch=Hudson") // QuickSearch/Hudson#displayName
+@Messages("quicksearch=Jenkins") // QuickSearch/Jenkins#displayName
 public class SearchProviderImpl implements SearchProvider {
 
     @Override public void evaluate(SearchRequest request, SearchResponse response) {

diff --git a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/nodes/HudsonInstanceNode.java b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/nodes/HudsonInstanceNode.java
@@ -143,9 +143,9 @@ private String getProjectInfoString() {
 
     @Messages({
         "TXT_Instance_Prop_Name=Name",
-        "DESC_Instance_Prop_Name=Hudson's instance name",
+        "DESC_Instance_Prop_Name=Jenkins's instance name",
         "TXT_Instance_Prop_Url=URL",
-        "DESC_Instance_Prop_Url=Hudson's instance URL",
+        "DESC_Instance_Prop_Url=Jenkins's instance URL",
         "TXT_Instance_Prop_Sync=Autosynchronization time",
         "DESC_Instance_Prop_Sync=Autosynchronization time in minutes (if it's 0 the autosynchronization is off)"
     })

diff --git a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/nodes/HudsonJobNode.java b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/nodes/HudsonJobNode.java
@@ -132,9 +132,9 @@ protected Sheet createSheet() {
 
     @Messages({
         "TXT_Job_Prop_Name=Name",
-        "DESC_Job_Prop_Name=Hudson's job name",
+        "DESC_Job_Prop_Name=Jenkins's job name",
         "TXT_Job_Prop_Url=URL",
-        "DESC_Job_Prop_Url=Hudson's job URL",
+        "DESC_Job_Prop_Url=Jenkins's job URL",
         "HudsonJobImpl.watched=Watched",
         "HudsonJobImpl.watched_desc=Whether you wish to be notified of failures in this job."
     })

diff --git a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/nodes/HudsonRootNode.java b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/nodes/HudsonRootNode.java
@@ -37,12 +37,12 @@
 
 @ServicesTabNodeRegistration(name=HudsonRootNode.HUDSON_NODE_NAME, displayName="#LBL_HudsonNode", shortDescription="#TIP_HudsonNode", iconResource=HudsonRootNode.ICON_BASE, position=488)
 @Messages({
-    "LBL_HudsonNode=Hudson Builders",
-    "TIP_HudsonNode=Hudson continuous integration servers, including Jenkins."
+    "LBL_HudsonNode=Jenkins Builders",
+    "TIP_HudsonNode=Jenkins continuous integration servers, including Jenkins."
 })
 public class HudsonRootNode extends AbstractNode {
 
-    public static final String HUDSON_NODE_NAME = "hudson"; // NOI18N
+    public static final String HUDSON_NODE_NAME = "jenkins"; // NOI18N
     static final String ICON_BASE = "org/netbeans/modules/hudson/ui/resources/hudson.png"; // NOI18N
 
 

diff --git a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/notification/ProblemNotification.java b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/notification/ProblemNotification.java
@@ -113,7 +113,7 @@ public void run() {
     @Messages({
         "# {0} - job name",
         "# {1} - server name",
-        "ProblemNotification.ignore.question=Do you wish to cease to receive notifications of failures in {0}? If you change your mind, use Services > Hudson Builders > {1} > {0} > Properties > Watched.",
+        "ProblemNotification.ignore.question=Do you wish to cease to receive notifications of failures in {0}? If you change your mind, use Services > Jenkins Builders > {1} > {0} > Properties > Watched.",
         "# {0} - job name",
         "ProblemNotification.ignore.title=Ignore Failures in {0}"
     })

diff --git a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/resources/instance.png b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/resources/instance.png
diff --git a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/wizard/Bundle.properties b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/wizard/Bundle.properties
@@ -15,10 +15,10 @@
 # specific language governing permissions and limitations
 # under the License.
 
-LBL_InstanceWiz_Title=Add Hudson Instance
+LBL_InstanceWiz_Title=Add Jenkins Instance
 InstanceDialog.add=Add
-# {0} - minimum supported Hudson version number
-MSG_WrongVersion=Provide a valid Hudson root URL ({0} or newer).
+# {0} - minimum supported Jenkins version number
+MSG_WrongVersion=Provide a valid Jenkins root URL ({0} or newer).
 MSG_FailedToConnect=Connection to server failed or resulted in error.
 MSG_incorrect_redirects=Server fails to redirect query strings (http://seothegame.com/redirects-on-windows-servers-iis-61)
 
@@ -39,6 +39,6 @@ InstanceDialog.http_protocol=Must be an HTTP(S) URL.
 InstancePropertiesVisual.proxyButton.AccessibleContext.accessibleDescription=Configure your HTTP(S) proxy.
 InstancePropertiesVisual.autoSyncCheckBox.AccessibleContext.accessibleDescription=Automatically refresh the server periodically.
 InstancePropertiesVisual.nameTxt.AccessibleContext.accessibleDescription=Name by which this server will be displayed.
-InstancePropertiesVisual.urlTxt.AccessibleContext.accessibleDescription=Base location of the Hudson installation.
-InstancePropertiesVisual.AccessibleContext.accessibleDescription=Register a Hudson server in the IDE.
+InstancePropertiesVisual.urlTxt.AccessibleContext.accessibleDescription=Base location of the Jenkins installation.
+InstancePropertiesVisual.AccessibleContext.accessibleDescription=Register a Jenkins server in the IDE.
 InstancePropertiesVisual.autoSyncSpinner.AccessibleContext.accessibleDescription=Number of minutes between server refreshes.
diff --git a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/wizard/InstanceDialog.java b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/wizard/InstanceDialog.java
@@ -67,15 +67,15 @@ public void actionPerformed(ActionEvent e) {
     public HudsonInstance show() {
         dialog = DialogDisplayer.getDefault().createDialog(this);
         dialog.setVisible(true);
-        LOG.log(Level.FINE, "Added Hudson instance: {0}", created);
+        LOG.log(Level.FINE, "Added Jenkins instance: {0}", created);
         return created;
     }
 
     @NbBundle.Messages({
         "# UI logging of adding new server",
-        "UI_HUDSON_SERVER_REGISTERED=Hudson server registered",
+        "UI_HUDSON_SERVER_REGISTERED=Jenkins server registered",
         "# Usage Logging",
-        "USG_HUDSON_SERVER_REGISTERED=Hudson server registered"
+        "USG_HUDSON_SERVER_REGISTERED=Jenkins server registered"
     })
     private void tryToAdd() {
         addButton.setEnabled(false);

diff --git a/ide/hudson/src/org/netbeans/modules/hudson/Bundle.properties b/ide/hudson/src/org/netbeans/modules/hudson/Bundle.properties
@@ -17,7 +17,6 @@
 
 OpenIDE-Module-Display-Category=Base IDE
 OpenIDE-Module-Long-Description=\
-    Helps browse and manage installations of the Hudson continuous integration server (http://hudson-ci.org/). \
-    http://wiki.netbeans.org/HudsonInNetBeans has more information.
-OpenIDE-Module-Name=Hudson
-OpenIDE-Module-Short-Description=Support for the Hudson continuous integration server.
+    Helps browse and manage installations of the Jenkins continuous integration server (https://www.jenkins.io/ ). 
+OpenIDE-Module-Name=Jenkins
+OpenIDE-Module-Short-Description=Support for the Jenkins continuous integration server.
diff --git a/ide/hudson/src/org/netbeans/modules/hudson/api/HudsonFolder.java b/ide/hudson/src/org/netbeans/modules/hudson/api/HudsonFolder.java
@@ -29,7 +29,7 @@
  * This is not such a loss, since heavy users of folders are not likely to need lots of views anyway.
  * The standard connector also assumes that there is an exported {@link primaryView} field,
  * defined in the Jenkins version of the interface.
- * <p>In the Hudson/Jenkins model, this would really in an inheritance hierarchy with {@link HudsonJob} and {@link HudsonInstance},
+ * <p>In the Jenkins model, this would really in an inheritance hierarchy with {@link HudsonJob} and {@link HudsonInstance},
  * but due to the many methods in those interfaces which make no sense on folders, it seems better to separate them.
  * @since hudson/1.31
  */

diff --git a/ide/hudson/src/org/netbeans/modules/hudson/api/HudsonJob.java b/ide/hudson/src/org/netbeans/modules/hudson/api/HudsonJob.java
@@ -31,7 +31,7 @@
 public interface HudsonJob extends Comparable<HudsonJob> {
 
     /**
-     * Describes state of the Hudson Job.
+     * Describes state of the Jenkins Job.
      * See {@code hudson.model.BallColor}.
      */
     public enum Color {
@@ -100,14 +100,14 @@ public boolean isRunning() {
     public String getDisplayName();
 
     /**
-     * Name of the Hudson Job
+     * Name of the Jenkins Job
      *
      * @return job's name
      */
     public String getName();
 
     /**
-     * URL of the Hudson Job
+     * URL of the Jenkins Job
      *
      * @return job url
      */

diff --git a/ide/hudson/test/unit/src/org/netbeans/modules/hudson/impl/HudsonManagerImplTest.java b/ide/hudson/test/unit/src/org/netbeans/modules/hudson/impl/HudsonManagerImplTest.java
@@ -61,7 +61,7 @@ public void run() {
                         delay();
                         HudsonManagerImpl.getDefault().addInstance(
                                 HudsonInstanceImpl.createHudsonInstance(
-                                        "TestHudsonInstance" + i,
+                                        "TestJenkinsInstance" + i,
                                         "http://testHudsonInstance" + i + "/",
                                         "0"));
                     } catch (Throwable e) {
@@ -71,7 +71,7 @@ public void run() {
                     }
                 }
             }
-        }, "AddHudsonInstances");
+        }, "AddJenkinsInstances");
         addInstancesThread.start();
 
         for (int i = 0; i < 10; i++) {