OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-10 02:26:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,889 Commits 55 Branches 1,940 Tags
8f978a960b3faf0a75a4bfa875dfb1a0d2a880ef
Commit Graph
62 Commits
Author SHA1 Message Date
James Nord 1f946961b9 s/javax.annotation.CheckForNull/edu.umd.cs.findbugs.annotations.CheckForNull/g 2020-03-26 16:12:35 +00:00
StefanSpieker 0e6bb91864 Return error when invalid string is passed as a Run status CLI argument (#4212) 
* removed redundnat null checks of nonnull values

* integrated suggestions

* removed local jenkins variable as suggested

* replaced null check with check for error object
 2020-01-03 23:39:22 +01:00
Tim JacombtimjaOleg NenashevAdrien Lecharpentier
 		f103b7819d JENKINS-56553 Make proxy config compatible with JCasC without workarounds on the plugin side (#3935) 
* JENKINS-56553 Make proxy config compatible with JCASC

* Use DataBoundSetters as other fields are optional

* Fix Jelly for ProxyConfiguration

* Use default field name now that field matches

* Fix validate proxy

* Change field type

* After review

* Update core/src/main/java/jenkins/model/Jenkins.java

Co-Authored-By: timja <t.jacomb@kainos.com>

* Update core/src/main/java/jenkins/model/Jenkins.java

Co-Authored-By: timja <t.jacomb@kainos.com>

* Update core/src/main/java/hudson/ProxyConfiguration.java

Co-Authored-By: timja <t.jacomb@kainos.com>

* Update core/src/main/java/jenkins/model/Jenkins.java

Co-Authored-By: timja <t.jacomb@kainos.com>

* Update core/src/main/java/jenkins/model/Jenkins.java

Co-Authored-By: timja <t.jacomb@kainos.com>

* Update core/src/main/java/hudson/ProxyConfiguration.java

Co-Authored-By: Oleg Nenashev <o.v.nenashev@gmail.com>

* Tweak javadoc

* Align fields

* Update core/src/main/java/hudson/ProxyConfiguration.java

Co-Authored-By: Adrien Lecharpentier <adrien.lecharpentier@gmail.com>
 2019-11-14 13:40:53 +01:00
Josh Soref 9769092ee0 [JENKINS-57383] add missing cast (#4104) 2019-07-11 16:49:00 +02:00
Gustavo de Souza Bezerra 0e62b68012 [JENKINS-57678] - Change getInstance() (deprecated) to get() (#4042) 
* Change getInstance() (deprecated) to get()

* Reverting modifications according review

* Changing for use the variable
 2019-06-27 17:24:45 +02:00
Josh Soref 3d8c3c417c Remove useless initialization 2019-02-20 23:35:12 -05:00
Josh Soref 0ad7d00099 Switch to using TimeUnit.UNIT.toUnit(...) 2019-02-26 12:13:41 -05:00
Josh Soref 47daeb4cc1 Java 5: skip (un)boxing 2019-02-20 21:46:06 -05:00
Oleg Nenashev aa43ab0fce Merge pull request #3786 from stephenc/jenkins-54903 
[FIXED JENKINS-54903] Ensure the authenticator is created on load path also
 2019-01-27 02:20:10 +01:00
Oleg Nenashev 60b36b7ab1 Microrefactoring in ProxyConfiguration to retrigger the build 2019-01-25 18:34:22 +01:00
Stephen Connolly be08867788 [FIXED JENKINS-54903] Ensure the authenticator is created on load path also 2018-12-04 13:32:12 +00:00
Daniel Beck 896356a038 Merge commit '8d429ff13b2013ff0b390d59f9c8a7674e6d24a1' into security-master 2018-11-23 00:19:45 +01:00
Daniel Beck 19698a8262 Merge branch 'security-stable-2.107' into security-stable-2.121 2018-11-21 15:33:15 +01:00
Daniel BeckandWadeck Follonier 47f38d714c [SECURITY-595] 
Co-Authored-By: Wadeck Follonier <wadeck.follonier@gmail.com>
 2018-11-21 15:09:49 +01:00
Stephen Connolly d4284565e7 Merge pull request #3283 from stephenc/jenkins-48775 
[JENKINS-48775] HACKY HACKY FIX
 2018-11-16 11:31:05 +00:00
Daniel Beck c82620dca9 Minimize readResolve visibility (#2567) 
* Minimize readResolve visibility

* Relax visibility from private to protected
 2018-03-31 19:06:21 +02:00
Stephen Connolly 027d7c682b [JENKINS-48775] HACKY HACKY FIX 
- Cheat and try a HTTP url if the proxy has never been accessed with a HTTP url before attempting a HTTPS url
 2018-02-06 15:23:52 +00:00
Jesse Glick 3173203b17 Merge branch 'security-stable-2.60' into security-stable-2.73 2018-01-30 12:21:02 -05:00
Jesse Glick 2d16b45920 [SECURITY-506] Require admin permission to validate proxy config. 2018-01-30 12:15:48 -05:00
bale836 593f707eaa [JENKINS-46288] - Fix ProxyConfiguration validation for NTLM authentication (#2984) 
/**
     * Constructor.
     * @param userName The user name.  This should not include the domain to authenticate with.
     * For example: "user" is correct whereas "DOMAIN\\user" is not.
     * @param password The password.
     * @param host The host the authentication request is originating from.  Essentially, the
     * computer name for this machine.
     * @param domain The domain to authenticate within.
     */

(cherry picked from commit ccb3e4cd50)
 2017-09-04 15:54:41 +02:00
bale836 ccb3e4cd50 [JENKINS-46288] - Fix ProxyConfiguration validation for NTLM authentication (#2984) 
/**
     * Constructor.
     * @param userName The user name.  This should not include the domain to authenticate with.
     * For example: "user" is correct whereas "DOMAIN\\user" is not.
     * @param password The password.
     * @param host The host the authentication request is originating from.  Essentially, the
     * computer name for this machine.
     * @param domain The domain to authenticate within.
     */
 2017-08-19 15:28:48 +02:00
Daniel Beck 5df63bc63b Merge branch 'security-stable-2.32' into security-stable-2.46 2017-04-15 15:06:55 +02:00
Daniel Beck 2f8d8f370a Merge branch 'security-stable-1.651' into security-stable-2.7 2017-04-15 14:57:32 +02:00
Daniel Beck 1f67232392 [SECURITY-420] RequirePOST for proxy validation 2017-04-15 14:37:58 +02:00
Josh Soref 496703d0fe Spelling fixes in changelogs, Javadoc, logs and UI (#2718) 
* spelling: abstract

* spelling: about

* spelling: absolute

* spelling: across

* spelling: activity

* spelling: actually

* spelling: addition

* spelling: allocating

* spelling: ambiguous

* spelling: analyzes

* spelling: analysis

* spelling: another

* spelling: appear

* spelling: arbitrary

* spelling: artifact

* spelling: assignment

* spelling: associated

* spelling: augment

* spelling: authentication

* spelling: automatically

* spelling: available

* spelling: availability

* spelling: because

* spelling: background

* spelling: beginning

* spelling: boolean

* spelling: browsers

* spelling: building

* spelling: calculation

* spelling: channel

* spelling: column

* spelling: concatenation

* spelling: connect

* spelling: contribute

* spelling: convert

* spelling: copied

* spelling: couldn't

* spelling: scrambled

* spelling: creates-a

* spelling: curr-entry

* spelling: customize

* spelling: diagnostic

* spelling: contain

* spelling: default

* spelling: delimiter

* spelling: descriptor

* spelling: disambiguates

* spelling: different

* spelling: diligently

* spelling: disabled

* spelling: discovered

* spelling: display

* spelling: doesn't

* spelling: dollar

* spelling: downstream

* spelling: dynamically

* spelling: preemptively

* spelling: encrypt

* spelling: erroneous

* spelling: examine

* spelling: existence

* spelling: value

* spelling: february

* spelling: handling

* spelling: hostname

* spelling: convenient

* spelling: identify

* spelling: implementation

* spelling: incorrect

* spelling: individual

* spelling: initialization

* spelling: initialized

* spelling: inputstream

* spelling: instantiated

* spelling: instantiation

* spelling: intended

* spelling: interpreted

* spelling: interrupted

* spelling: invocations

* spelling: kern

* spelling: localization

* spelling: logger

* spelling: malfunctioning

* spelling: methods

* spelling: monitor

* spelling: mutator

* spelling: multiple

* spelling: object

* spelling: configured

* spelling: optionally

* spelling: option

* spelling: overridden

* spelling: parameterized

* spelling: parent

* spelling: permissions

* spelling: plugin

* spelling: potentially

* spelling: preferable

* spelling: problems like

* spelling: programmatically

* spelling: property

* spelling: reallocate

* spelling: recommended

* spelling: redirected

* spelling: registered

* spelling: reliable

* spelling: remember

* spelling: recurrence

* spelling: repeatable

* spelling: repeated

* spelling: resource

* spelling: retrieve

* spelling: returned

* spelling: revision

* spelling: sandwich

* spelling: separator

* spelling: serialization

* spelling: settings

* spelling: shadow

* spelling: should

* spelling: someone

* spelling: source

* spelling: specified

* spelling: style

* spelling: subversion

* spelling: sufficient

* spelling: supplementary

* spelling: suppressing

* spelling: synchronization

* spelling: synchronized

* spelling: this

* spelling: transitioning

* spelling: termination

* spelling: trying

* spelling: truncatable

* spelling: unknown

* spelling: undeployed

* spelling: unnecessary

* spelling: unparseable

* spelling: update

* spelling: upper

* spelling: verify

* spelling: visible

* spelling: warning

* spelling: we're

* spelling: whitespace

* spelling: wide

* spelling: with

* spelling: workspace

* spelling: yielding

* spelling: to

* spelling: by

* spelling: the

* spelling: hours
 2017-02-12 13:38:30 +03:00
Emilio Escobar 95c3f27e26 [FIXED JENKINS-31915] Proxy settings in plugins page are ignored (#1955) 
[FIXED JENKINS-31915] Proxy settings in plugins page are ignored
(cherry picked from commit 81e00cc679)
 2016-06-19 22:18:32 +02:00
Emilio Escobar 81e00cc679 [FIXED JENKINS-31915] Proxy settings in plugins page are ignored (#1955) 
[FIXED JENKINS-31915] Proxy settings in plugins page are ignored
 2016-06-02 19:57:40 +02:00
Oleg Nenashev 1d2b15173c [JENKINS-34854] - Migrate missing settings to SystemProperties (#2362) 
* [JENKINS-34854] - Migrate missing Integer and Boolean properties to SystemProperties

* [JENKINS-34854] - API methods for Long variables

* [JENKINS-34854] - Migrate Long settings to SystemProperties

* [JENKINS-34854] - Leftover change (I should use Save All)

* [JENKINS-34854] - Some fixes in Long methods Javadoc and log messages
 2016-05-21 09:36:18 +04:00
Kohsuke Kawaguchi 6af569c4f0 Merge remote-tracking branch 'origin/master' into symbol 
Conflicts:
	core/src/main/java/hudson/model/FreeStyleProject.java
	core/src/main/java/jenkins/model/GlobalConfigurationCategory.java
 2016-04-26 16:07:09 -07:00
kzantow 6d5bcad475 Use standard property naming convention 2016-03-23 14:59:45 -04:00
kzantow a536e62766 Modify default ProxyConfiguration.open() to use 20 second connect 
timeout, this may be modified with the configuration property:
jenkins.proxy.default_connect_timeout_millis, a value of 0 will restore
the previous behavior
 2016-03-23 12:17:19 -04:00
Kohsuke Kawaguchi 90ff340210 Merge remote-tracking branch 'origin/2.0' into symbol 
Conflicts:
	core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol.java
	core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol2.java
 2016-03-22 10:47:20 -07:00
Kohsuke Kawaguchi e1c402889c More symbol names 2016-03-19 13:54:18 -07:00
Stephen Connolly 21f1c29c89 [JENKINS-33414] Cover one final theoretical race condition 2016-03-09 14:42:03 +00:00
Stephen Connolly f68f5fb24f [FIXED JENKINS-33414] Added an API to allow identification of the Jenkins JVM 
- Fix the ProxyConfiguration code to not require Jenkins class to be loaded in remote JVMs
 2016-03-08 23:05:00 +00:00
Stephen Connolly d1dfbd2baf Revert "Jenkins.getInstance() should be non-null" 
This reverts commit bb7c8fcedb.

Closes #2090, I'll redo this as a PR... though if that PR is subject to multiple rounds of review before being merged then I will take that of evidence of the exact problem that committing directly was supposed to resolve... namely exponentially multiplying the effort required to make actual improvements to the code base.
 2016-03-08 21:09:28 +00:00
Stephen Connolly bb7c8fcedb Jenkins.getInstance() should be non-null 
- It is never too late to do the right thing.
- The vast majority of usages of `Jenkins.getInstance()` in core currently assume that its return value is non-null
- This commit changes those that are written to correctly check for non-null values will call `Jenkins.getInstanceOrNull()`
- We deprecate the `Jenkins.getActiveInstance()` madness
- I checked with @kohsuke who said not to bother with a PR and just commit this strongly opinionated change direct to master as a PR will just degrade into a bikeshedding.
 2016-03-07 22:08:36 +00:00
Antonio Muñiz 320e6c0702 Slave to Agent renaming - Javadocs and logs 2016-01-29 17:40:26 +01:00
David Hoover 1709ed3a2e Add @Deprecated annotations to things documented as @deprecated. 2015-04-19 14:50:12 -07:00
ssogabe 553a3850ba Use Common HttpClient instead of URLConnection 2013-11-01 12:09:43 +09:00
ssogabe c853c4719d [FIXED JENKINS-20191] Add Test button to check proxy connection 2013-10-29 22:58:11 +09:00
Kohsuke Kawaguchi a8b609ef24 making this serializable 2012-07-23 14:10:15 -07:00
Hayato ITO dd75293fd5 fix no proxy host config behavior 2012-02-13 20:41:12 +09:00
Kohsuke Kawaguchi dec633208b Supported "no proxy host" setting and modernized the impl. 2011-12-02 23:34:16 -08:00
Seiji Sogabe 9207c21f37 [FIXED JENKINS-5271] Tools download does not appear to respect proxy settings. 2011-09-18 16:16:38 -07:00
Kohsuke Kawaguchi 07caea1865 added a new extension to manipulate the connection 2011-08-01 16:40:38 -07:00
Nigel Magnay 2adef6719a Merge remote branch 'origin/master' into momo 
* origin/master: (91 commits)
  Parsing can happen in the forked Maven process. Support remoting.
  Fixed the test failures.
  Strip whitespace on maven installation.
  updated ja.
  Use relative path to validate new view name (in order to allow ViewGroups like NestedView to override)
  Added i18n.
  moved to the model package to colocate with the Result class, since I don't think this class is tied by itself to the notification.
  doc improvements
  enum to describe a result trend - i.e. change from the previous to the current result
  Recording the previous change.
  Do not include trailing periods in console links.
  doc improvements
  Added a hook to customize the XML parser behaviour.
  - Renamed from 'linked' to 'base' - Fixed the bug where multi-level base setting wasn't working properly - Improved docs
  Updated style
  Added convenience method for getting configuration run
  Initial commit
  the trunk is toward 1.416-SNAPSHOT
  creating an RC branch
  updated changelog as a part of the release
  ...

Conflicts:
	core/src/main/java/hudson/slaves/NodeProvisioner.java
	maven-plugin/src/main/java/hudson/maven/MavenModule.java
	maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java
 2011-06-07 09:04:40 +01:00
Nicolas De loof 3f13f6da74 Merge pull request #130 from bap2000/master 
Proxy password is encrypted in xml config file, and in the UI
 2011-06-03 07:55:53 +02:00
Nigel Magnay 5679d019ec Move hudson.model.Jenkins to be jenkins.model.Jenkins - part II 
Just import changes, from hudson.model.Jenkins -> jenkins.model.Jenkins,
and Javadoc comments.

Signed-off-by: Nigel Magnay <nigel.magnay@gmail.com>
 2011-05-29 11:06:28 +01:00
Nigel Magnay 70c1065814 Stage 1 : Create hudson.model.Jenkins, make Hudson derive from Jenkins. 
Signed-off-by: Nigel Magnay <nigel.magnay@gmail.com>
 2011-05-29 11:00:58 +01:00