Commit Graph
1189 Commits
Author SHA1 Message Date
Kohsuke Kawaguchi 37986c0331 the trunk is toward 1.595-SNAPSHOT 2014-12-07 22:04:03 -08:00
Jesse Glick 815e24665c gmaven-plugin 1.5-jenkins-3 update.
Cf.: https://github.com/jenkinsci/jenkins/commit/d29a90150c839855d4ff0c084c3cd838b48fab5c#commitcomment-8845400 (pending #806).
2014-12-05 13:44:56 -05:00
Kohsuke Kawaguchi 0f0132481d the trunk is toward 1.594-SNAPSHOT 2014-11-30 17:21:27 -08:00
Kohsuke Kawaguchi 35c0c7000a the trunk is toward 1.593-SNAPSHOT 2014-11-25 19:50:29 -08:00
Jesse Glick 6080c0124a gmaven-plugin 1.5-jenkins-2 2014-11-24 14:50:58 -05:00
Kohsuke Kawaguchi 7f990004ec the trunk is toward 1.592-SNAPSHOT 2014-11-16 19:34:12 -08:00
Kohsuke Kawaguchi 9edf0e3f79 the trunk is toward 1.591-SNAPSHOT 2014-11-10 06:12:33 -08:00
Kohsuke Kawaguchi 41c788e2f1 Integrated a new version of remoting 2014-11-04 19:46:49 -08:00
Kohsuke Kawaguchi b93a79ceeb the trunk is toward 1.590-SNAPSHOT 2014-11-02 20:56:21 -08:00
Kohsuke Kawaguchi 388148e257 the trunk is toward 1.589-SNAPSHOT 2014-10-29 20:47:31 -07:00
Kohsuke Kawaguchi bf736a7407 [maven-release-plugin] prepare for next development iteration 2014-10-29 18:10:06 -07:00
Kohsuke Kawaguchi b3660bf84e [maven-release-plugin] prepare release jenkins-1.587 2014-10-29 18:10:06 -07:00
Kohsuke Kawaguchi 2d46bd5b95 Bundling the version that has SECURITY-144 related changes. 2014-10-29 17:06:47 -07:00
Kohsuke Kawaguchi c7bb90881d Depend on a released version 2014-10-29 17:05:15 -07:00
Jesse Glick 8c10c75d85 Merge branch 'security-rc' into SECURITY-144-rc 2014-10-28 11:20:25 -04:00
Jesse Glick 48beb9135f Merge branch 'SECURITY-144' into SECURITY-144-rc
Conflicts:
	pom.xml
2014-10-26 15:27:59 -07:00
Jesse Glick f0658e233d Merge branch 'security-rc' into SECURITY-144-rc
Conflicts:
	core/src/main/java/hudson/FilePath.java
2014-10-26 13:55:39 -07:00
Jesse Glick cbf972f575 Since callable.conf already whitelists AsyncInvoker, it is not necessary to force an update of the bundled maven-plugin. 2014-10-26 13:36:06 -07:00
Kohsuke Kawaguchi 0fa32eac4e the trunk is toward 1.587-SNAPSHOT 2014-10-19 21:51:18 -07:00
Jesse Glick ef2a90c387 maven-plugin SECURITY-144 is now 2.7.1-SNAPSHOT. 2014-10-16 19:41:43 -04:00
Jesse Glick ccbe96227f Merge branch 'security-rc' into SECURITY-144-rc
Conflicts:
	core/src/main/java/hudson/FilePath.java
	pom.xml
2014-10-16 13:18:08 -04:00
Kohsuke Kawaguchi 0bd2ea1808 the trunk is toward 1.586-SNAPSHOT 2014-10-12 20:00:16 -07:00
Jesse Glick 686a65edad 2.46 was released, so SECURITY-144 branch is now 2.47-SNAPSHOT. 2014-10-09 10:33:28 -04:00
Kohsuke Kawaguchi fec8786781 Upgraded Apache Ant
Turns out there was a security advisory posted on Ant 1.8.3
(http://ant.apache.org/security.html) though the affected code is not
used in Jenkins.

Reference: http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-2098
2014-10-08 13:47:22 -07:00
Kohsuke Kawaguchi 02302d4857 the trunk is toward 1.585-SNAPSHOT 2014-10-06 07:56:32 -07:00
Kohsuke Kawaguchi 357af23467 [maven-release-plugin] prepare for next development iteration 2014-10-01 10:39:00 -07:00
Kohsuke Kawaguchi 4ea483f233 [maven-release-plugin] prepare release jenkins-1.583 2014-10-01 10:39:00 -07:00
Kohsuke Kawaguchi a0fe61a098 Merge remote-tracking branch 'security/security' into rc
Conflicts:
	.idea/encodings.xml
	core/pom.xml
	pom.xml
	test/src/test/java/hudson/tasks/junit/CaseResultTest.java
2014-10-01 10:09:42 -07:00
Kohsuke Kawaguchi be195b0e19 [FIXED SECURITY-150]
Integrated the change
2014-10-01 08:21:06 -07:00
Kohsuke Kawaguchi 4a8f12b3f2 [maven-release-plugin] prepare for next development iteration 2014-09-28 14:01:28 -07:00
Kohsuke Kawaguchi 3c99828edf [maven-release-plugin] prepare release jenkins-1.582 2014-09-28 14:01:28 -07:00
Jesse Glick 89cbfc4639 Merge branch 'SECURITY-144' into SECURITY-144-rc
Conflicts:
	core/src/main/java/hudson/EnvVars.java
	core/src/main/java/hudson/FilePath.java
	core/src/main/java/hudson/cli/ClientAuthenticationCache.java
	core/src/main/java/hudson/markup/MyspacePolicy.java
	core/src/main/java/hudson/model/Computer.java
	core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescriptor.java
	core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java
	core/src/main/java/hudson/node_monitors/TemporarySpaceMonitor.java
	core/src/main/java/hudson/security/AbstractPasswordBasedSecurityRealm.java
	core/src/main/java/hudson/slaves/Channels.java
	core/src/main/java/hudson/slaves/SlaveComputer.java
	core/src/main/java/hudson/tasks/Fingerprinter.java
	core/src/main/java/hudson/tasks/Shell.java
	core/src/main/java/hudson/tasks/junit/JUnitParser.java
	core/src/main/java/hudson/tasks/test/DefaultTestResultParserImpl.java
	core/src/main/java/hudson/util/ProcessTree.java
	core/src/main/java/hudson/util/RemotingDiagnostics.java
	core/src/main/java/jenkins/model/Jenkins.java
	core/src/test/java/hudson/LauncherTest.java
	pom.xml
	test/src/test/java/hudson/tasks/junit/CaseResultTest.java
2014-09-26 15:56:48 -04:00
Jesse Glick 801b82578e Bundling patched Maven plugin. 2014-09-25 09:52:48 -04:00
Kohsuke Kawaguchi ae83957091 Completing the migration to Java6
(cherry picked from commit 5e7b844b65)

Conflicts:
	changelog.html
2014-09-19 15:26:07 -04:00
Kohsuke Kawaguchi 0908362899 Completing the migration to Java6
(cherry picked from commit 5e7b844b65)

Conflicts:
	changelog.html
2014-09-19 15:24:48 -04:00
Jesse Glick 7211c0d42a Merge branch 'security' into SECURITY-144
Conflicts:
	maven-plugin/src/main/java/hudson/maven/AbstractMavenBuilder.java
	maven-plugin/src/main/java/hudson/maven/AbstractMavenProcessFactory.java
	maven-plugin/src/main/java/hudson/maven/Maven31ProcessFactory.java
	maven-plugin/src/main/java/hudson/maven/Maven3Builder.java
	maven-plugin/src/main/java/hudson/maven/Maven3ProcessFactory.java
	maven-plugin/src/main/java/hudson/maven/MavenBuildProxy.java
	maven-plugin/src/main/java/hudson/maven/MavenBuilder.java
	maven-plugin/src/main/java/hudson/maven/MavenProcessFactory.java
	maven-plugin/src/main/java/hudson/maven/MavenVersionCallable.java
	maven-plugin/src/main/java/hudson/maven/ProcessCache.java
	maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java
	maven-plugin/src/main/java/hudson/maven/SplittableBuildListener.java
2014-09-19 14:06:56 -04:00
Jesse Glick e1d2322e69 Updated to maven-plugin 2.0 general release.
(cherry picked from commit 9b53643c7a)

Conflicts:
	pom.xml
2014-09-19 14:04:30 -04:00
Kohsuke Kawaguchi 048d759792 maven plugin is moved off to a separate repository.
See https://github.com/jenkinsci/maven-plugin

(cherry picked from commit f98070d3e6)

Conflicts:
	maven-plugin/pom.xml
	maven-plugin/src/main/java/hudson/maven/AbstractMavenProcessFactory.java
	maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
	maven-plugin/src/main/java/hudson/maven/MavenProcessFactory.java
	maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries.jelly
	plugins/pom.xml
	pom.xml
2014-09-19 14:03:30 -04:00
Kohsuke Kawaguchi 8fc609fe09 [JENKINS-23471 JENKINS-24050]
Integrated the fix in remoting to Jenkins 1.580.
2014-09-15 11:15:29 -07:00
Kohsuke Kawaguchi fb547c127e the trunk is toward 1.582-SNAPSHOT 2014-09-14 17:56:14 -07:00
Kohsuke Kawaguchi 9009cccffb Updating to reflect changes made in remoting 2014-09-08 12:44:32 +01:00
Kohsuke Kawaguchi 1fc3edbd58 Use SECURITY-144 branch of remoting as the starting point 2014-09-08 12:36:50 +01:00
Kohsuke Kawaguchi 2e39af250a the trunk is toward 1.581-SNAPSHOT 2014-09-06 09:04:49 -07:00
Kohsuke Kawaguchi 1a4aef1172 the trunk is toward 1.580-SNAPSHOT 2014-09-01 08:21:17 -07:00
Kohsuke Kawaguchi 862cb04ca1 the trunk is toward 1.579-SNAPSHOT 2014-08-25 06:19:24 -07:00
Jesse Glick 243a1ba389 Let netbeans.compile.on.save revert to its default.
Seems to work in 8.0 at least for some functional tests.
Developers can always disable it privately if they run into issues.
(cherry picked from commit 7b42017522)

Conflicts:
	pom.xml
2014-08-20 18:38:31 -04:00
Kohsuke Kawaguchi 8a5d5d752b the trunk is toward 1.578-SNAPSHOT 2014-08-18 22:17:46 -07:00
Kohsuke Kawaguchi bf54d18ec4 [maven-release-plugin] prepare for next development iteration 2014-08-18 21:27:07 -07:00
Kohsuke Kawaguchi 39b7ec2b87 [maven-release-plugin] prepare release jenkins-1.576 2014-08-18 21:27:07 -07:00
tfennelly b55f5ebbd5 Moved icon-set and icon-shim out to a plugin repo. 2014-08-07 14:44:06 +01:00