Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
244ff567
J
jenkins
项目概览
xxadev
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jenkins
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
244ff567
编写于
8月 29, 2011
作者:
K
Kohsuke Kawaguchi
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of github.com:jenkinsci/jenkins
上级
3df6408c
91fafb4e
变更
16
隐藏空白更改
内联
并排
Showing
16 changed file
with
115 addition
and
63 deletion
+115
-63
changelog.html
changelog.html
+10
-2
core/pom.xml
core/pom.xml
+0
-15
core/src/main/java/hudson/model/AbstractBuild.java
core/src/main/java/hudson/model/AbstractBuild.java
+11
-0
core/src/main/java/hudson/model/AbstractProject.java
core/src/main/java/hudson/model/AbstractProject.java
+3
-0
core/src/main/java/hudson/model/ExternalRun.java
core/src/main/java/hudson/model/ExternalRun.java
+14
-5
core/src/main/java/hudson/model/WorkspaceListener.java
core/src/main/java/hudson/model/WorkspaceListener.java
+23
-0
debian/debian/changelog
debian/debian/changelog
+6
-0
debian/debian/jenkins.postinst
debian/debian/jenkins.postinst
+3
-1
maven-plugin/pom.xml
maven-plugin/pom.xml
+7
-0
maven-plugin/src/main/java/hudson/maven/AbstractMavenProcessFactory.java
...c/main/java/hudson/maven/AbstractMavenProcessFactory.java
+5
-0
maven-plugin/src/main/java/hudson/maven/ExecutedMojo.java
maven-plugin/src/main/java/hudson/maven/ExecutedMojo.java
+2
-1
maven-plugin/src/main/java/hudson/maven/MavenBuild.java
maven-plugin/src/main/java/hudson/maven/MavenBuild.java
+4
-25
maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
...lugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
+0
-5
maven-plugin/src/main/java/hudson/maven/MavenUtil.java
maven-plugin/src/main/java/hudson/maven/MavenUtil.java
+4
-1
maven-plugin/src/main/java/hudson/maven/ModuleDependency.java
...n-plugin/src/main/java/hudson/maven/ModuleDependency.java
+1
-1
pom.xml
pom.xml
+22
-7
未找到文件。
changelog.html
浏览文件 @
244ff567
...
...
@@ -55,6 +55,9 @@ Upcoming changes</a>
<!-- Record your changes in the trunk here. -->
<div
id=
"trunk"
style=
"display:none"
>
<!--=TRUNK-BEGIN=-->
<ul
class=
image
>
<li
class=
bug
>
maven submodule build fails doing mkdir on master.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-10831"
>
issue 10831
</a>
)
<li
class=
bug
>
CLI clients should be able to see plugin classes
<a
href=
"http://jenkins.361315.n4.nabble.com/channel-example-and-plugin-classes-gives-ClassNotFoundException-tp3756092p3756092.html"
>
report
</a>
...
...
@@ -76,12 +79,18 @@ Upcoming changes</a>
<li
class=
bug
>
Project names in fingerprint records weren't updated when a project is renamed.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-10330"
>
issue 10330
</a>
)
<li
class=
rfe
>
External job submision now supports
&ly;
displayName> and
<
description> elements
(
<a
href=
"https://github.com/jenkinsci/jenkins/pull/215"
>
pull 215
</a>
)
</ul>
</div>
<!--=TRUNK-END=-->
<!-- these changes are controlled by the release process. DO NOT MODIFY -->
<div
id=
"rc"
style=
"display:none;"
>
<!--=BEGIN=-->
<h3><a
name=
v1.428
>
What's new in 1.428
</a>
<!--=DATE=-->
</h3>
<h3><a
name=
v1.429
>
What's new in 1.429
</a>
<!--=DATE=-->
</h3>
<!--=RC-CHANGES=-->
</div>
<!--=END=-->
<h3><a
name=
v1.428
>
What's new in 1.428
</a>
(2011/08/29)
</h3>
<ul
class=
image
>
<li
class=
bug
>
CLI jar download was making the browser prefer a wrong file name.
...
...
@@ -101,7 +110,6 @@ Upcoming changes</a>
(
<a
href=
"https://groups.google.com/forum/#!searchin/jenkinsci-users/timp/jenkinsci-users/YThhsdGBVwM/7_7GMYIYiRIJ"
>
report
</a>
)
</ul>
</div>
<!--=END=-->
<h3><a
name=
v1.427
>
What's new in 1.427
</a>
(2011/08/19)
</h3>
<ul
class=
image
>
<li
class=
'major bug'
>
...
...
core/pom.xml
浏览文件 @
244ff567
...
...
@@ -669,21 +669,6 @@ THE SOFTWARE.
</archive>
</configuration>
</plugin>
<plugin>
<groupId>
org.kohsuke.gmaven
</groupId>
<artifactId>
gmaven-plugin
</artifactId>
<!-- version specified in grandparent pom -->
<executions>
<execution>
<goals>
<goal>
generateStubs
</goal>
<goal>
compile
</goal>
<goal>
generateTestStubs
</goal>
<goal>
testCompile
</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
...
...
core/src/main/java/hudson/model/AbstractBuild.java
浏览文件 @
244ff567
...
...
@@ -185,6 +185,17 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
return
builtOn
;
}
/**
* Allows subtypes to set the value of {@link #builtOn}.
* This is used for those implementations where an {@link AbstractBuild} is made 'built' without
* actually running its {@link #run()} method.
*
* @since 1.429
*/
protected
void
setBuiltOnStr
(
String
builtOn
)
{
this
.
builtOn
=
builtOn
;
}
/**
* Gets the nearest ancestor {@link AbstractBuild} that belongs to
* {@linkplain AbstractProject#getRootProject() the root project of getProject()} that
...
...
core/src/main/java/hudson/model/AbstractProject.java
浏览文件 @
244ff567
...
...
@@ -1761,6 +1761,9 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
FilePath
ws
=
b
!=
null
?
b
.
getWorkspace
()
:
null
;
if
(
ws
!=
null
&&
getScm
().
processWorkspaceBeforeDeletion
(
this
,
ws
,
b
.
getBuiltOn
()))
{
ws
.
deleteRecursive
();
for
(
WorkspaceListener
wl
:
WorkspaceListener
.
all
())
{
wl
.
afterDelete
(
this
);
}
return
new
HttpRedirect
(
"."
);
}
else
{
// If we get here, that means the SCM blocked the workspace deletion.
...
...
core/src/main/java/hudson/model/ExternalRun.java
浏览文件 @
244ff567
...
...
@@ -130,11 +130,20 @@ public class ExternalRun extends Run<ExternalJob,ExternalRun> {
Result
r
=
Integer
.
parseInt
(
elementText
(
p
))==
0
?
Result
.
SUCCESS
:
Result
.
FAILURE
;
p
.
nextTag
();
// get to <duration> (optional)
if
(
p
.
getEventType
()==
START_ELEMENT
&&
p
.
getLocalName
().
equals
(
"duration"
))
{
duration
[
0
]
=
Long
.
parseLong
(
elementText
(
p
));
}
do
{
p
.
nextTag
();
if
(
p
.
getEventType
()==
START_ELEMENT
){
if
(
p
.
getLocalName
().
equals
(
"duration"
))
{
duration
[
0
]
=
Long
.
parseLong
(
elementText
(
p
));
}
else
if
(
p
.
getLocalName
().
equals
(
"displayName"
))
{
setDisplayName
(
p
.
getElementText
());
}
else
if
(
p
.
getLocalName
().
equals
(
"description"
))
{
setDescription
(
p
.
getElementText
());
}
}
}
while
(!(
p
.
getEventType
()
==
END_ELEMENT
&&
p
.
getLocalName
().
equals
(
"run"
)));
return
r
;
}
...
...
core/src/main/java/hudson/model/WorkspaceListener.java
0 → 100644
浏览文件 @
244ff567
package
hudson.model
;
import
hudson.ExtensionList
;
import
hudson.ExtensionPoint
;
public
abstract
class
WorkspaceListener
implements
ExtensionPoint
{
/**
* Called after a workspace is deleted successfully.
* @param project
*/
public
void
afterDelete
(
AbstractProject
project
)
{
}
/**
* All registered {@link WorkspaceListener}s.
*/
public
static
ExtensionList
<
WorkspaceListener
>
all
()
{
return
Hudson
.
getInstance
().
getExtensionList
(
WorkspaceListener
.
class
);
}
}
debian/debian/changelog
浏览文件 @
244ff567
jenkins (1.428) unstable; urgency=low
* See http://jenkins-ci.org/changelog for more details.
-- Kohsuke Kawaguchi <kk@kohsuke.org> Mon, 29 Aug 2011 10:22:33 -0700
jenkins (1.427) unstable; urgency=low
* See http://jenkins-ci.org/changelog for more details.
...
...
debian/debian/jenkins.postinst
浏览文件 @
244ff567
...
...
@@ -42,8 +42,10 @@ case "$1" in
fi
# directories needed for jenkins
# we don't do -R because it can take a long time on big installation
chown
jenkins:adm /var/lib/jenkins /var/log/jenkins
chmod
750 /var/lib/jenkins /var/log/jenkins
# we don't do "chmod 750" so that the user can choose the pemission for g and o on their own
chmod
u+rwx /var/lib/jenkins /var/log/jenkins
# make sure jenkins can delete everything in /var/run/jenkins to re-explode war
chown
-R
jenkins:adm /var/run/jenkins
...
...
maven-plugin/pom.xml
浏览文件 @
244ff567
...
...
@@ -322,6 +322,13 @@ THE SOFTWARE.
<version>
1.1
</version>
<optional>
true
</optional>
</dependency>
<dependency>
<groupId>
findbugs
</groupId>
<artifactId>
annotations
</artifactId>
<version>
1.0.0
</version>
<scope>
provided
</scope>
</dependency>
<dependency>
<groupId>
junit
</groupId>
...
...
maven-plugin/src/main/java/hudson/maven/AbstractMavenProcessFactory.java
浏览文件 @
244ff567
...
...
@@ -150,6 +150,7 @@ public abstract class AbstractMavenProcessFactory
private
static
final
long
serialVersionUID
=
1L
;
static
final
class
AcceptorImpl
implements
Acceptor
,
Serializable
{
private
static
final
long
serialVersionUID
=
-
2226788819948521018L
;
private
transient
final
ServerSocket
serverSocket
;
private
transient
Socket
socket
;
...
...
@@ -184,6 +185,8 @@ public abstract class AbstractMavenProcessFactory
}
private
static
final
class
GetCharset
implements
Callable
<
String
,
IOException
>
{
private
static
final
long
serialVersionUID
=
3459269768733083577L
;
public
String
call
()
throws
IOException
{
return
System
.
getProperty
(
"file.encoding"
);
}
...
...
@@ -309,6 +312,8 @@ public abstract class AbstractMavenProcessFactory
protected
static
final
class
GetRemotingJar
implements
Callable
<
String
,
IOException
>
{
private
static
final
long
serialVersionUID
=
6022357183425911351L
;
public
String
call
()
throws
IOException
{
return
Which
.
jarFile
(
hudson
.
remoting
.
Launcher
.
class
).
getPath
();
}
...
...
maven-plugin/src/main/java/hudson/maven/ExecutedMojo.java
浏览文件 @
244ff567
...
...
@@ -53,6 +53,7 @@ import org.kohsuke.stapler.Stapler;
* @author Kohsuke Kawaguchi
*/
public
final
class
ExecutedMojo
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
3048316415397586490L
;
/**
* Plugin group ID.
*/
...
...
@@ -149,7 +150,7 @@ public final class ExecutedMojo implements Serializable {
*
* TODO: better if XStream has a declarative way of marking fields as "target for intern".
*/
ExecutedMojo
readResolve
()
{
protected
Object
readResolve
()
{
return
new
ExecutedMojo
(
intern
(
groupId
),
intern
(
artifactId
),
intern
(
version
),
intern
(
goal
),
intern
(
executionId
),
duration
,
intern
(
digest
));
}
...
...
maven-plugin/src/main/java/hudson/maven/MavenBuild.java
浏览文件 @
244ff567
...
...
@@ -95,13 +95,6 @@ public class MavenBuild extends AbstractMavenBuild<MavenModule,MavenBuild> {
* @since 1.98.
*/
private
List
<
ExecutedMojo
>
executedMojos
;
/**
* Name of the slave this project was built on.
* Null or "" if built by the master. (null happens when we read old record that didn't have this information.)
* @since 1.394
*/
private
String
builtOn
;
public
MavenBuild
(
MavenModule
job
)
throws
IOException
{
super
(
job
);
...
...
@@ -293,26 +286,12 @@ public class MavenBuild extends AbstractMavenBuild<MavenModule,MavenBuild> {
return
super
.
getParent
();
}
/**
* @see hudson.model.AbstractBuild#getBuiltOn()
* @since 1.394
*/
public
Node
getBuiltOn
()
{
if
(
builtOn
==
null
||
builtOn
.
equals
(
""
))
return
Jenkins
.
getInstance
();
else
return
Jenkins
.
getInstance
().
getNode
(
builtOn
);
// allow MavenModuleSetBuild to set this.
@Override
protected
void
setBuiltOnStr
(
String
builtOn
)
{
super
.
setBuiltOnStr
(
builtOn
);
}
/**
* @param builtOn
* @since 1.394
*/
public
void
setBuiltOnStr
(
String
builtOn
)
{
this
.
builtOn
=
builtOn
;
}
/**
* Runs Maven and builds the project.
*/
...
...
maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
浏览文件 @
244ff567
...
...
@@ -27,7 +27,6 @@ package hudson.maven;
import
static
hudson
.
model
.
Result
.
FAILURE
;
import
hudson.AbortException
;
import
hudson.EnvVars
;
import
hudson.ExtensionList
;
import
hudson.FilePath
;
import
hudson.FilePath.FileCallable
;
import
hudson.Launcher
;
...
...
@@ -39,7 +38,6 @@ import hudson.maven.reporters.MavenMailer;
import
hudson.maven.settings.GlobalMavenSettingsProvider
;
import
hudson.maven.settings.MavenSettingsProvider
;
import
hudson.maven.settings.SettingsProviderUtils
;
import
hudson.model.AbstractBuild
;
import
hudson.model.AbstractProject
;
import
hudson.model.Action
;
import
hudson.model.Build
;
...
...
@@ -68,7 +66,6 @@ import hudson.util.IOUtils;
import
hudson.util.MaskingClassLoader
;
import
hudson.util.StreamTaskListener
;
import
java.io.ByteArrayInputStream
;
import
java.io.File
;
import
java.io.IOException
;
import
java.io.InterruptedIOException
;
...
...
@@ -88,7 +85,6 @@ import java.util.Set;
import
java.util.logging.Level
;
import
java.util.logging.Logger
;
import
org.apache.commons.io.FileUtils
;
import
org.apache.commons.io.FilenameUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.maven.BuildFailureException
;
...
...
@@ -101,7 +97,6 @@ import org.apache.maven.monitor.event.EventDispatcher;
import
org.apache.maven.project.MavenProject
;
import
org.apache.maven.project.ProjectBuildingException
;
import
org.codehaus.plexus.util.PathTool
;
import
org.jenkinsci.lib.configprovider.ConfigProvider
;
import
org.jenkinsci.lib.configprovider.model.Config
;
import
org.kohsuke.stapler.StaplerRequest
;
import
org.kohsuke.stapler.StaplerResponse
;
...
...
maven-plugin/src/main/java/hudson/maven/MavenUtil.java
浏览文件 @
244ff567
...
...
@@ -52,6 +52,8 @@ import org.apache.maven.artifact.versioning.ComparableVersion;
import
org.apache.maven.project.MavenProject
;
import
org.apache.maven.project.ProjectBuildingException
;
import
edu.umd.cs.findbugs.annotations.SuppressWarnings
;
/**
* @author Kohsuke Kawaguchi
*/
...
...
@@ -90,7 +92,7 @@ public class MavenUtil {
Properties
systemProperties
=
null
;
String
privateRepository
=
null
;
AbstractProject
project
=
build
.
getProject
();
AbstractProject
<?,?>
project
=
build
.
getProject
();
if
(
project
instanceof
ProjectWithMaven
)
{
m
=
((
ProjectWithMaven
)
project
).
inferMavenInstallation
().
forNode
(
Jenkins
.
getInstance
(),
listener
);
...
...
@@ -136,6 +138,7 @@ public class MavenUtil {
* Creates a fresh {@link MavenEmbedder} instance.
*
*/
@SuppressWarnings
(
"RV_RETURN_VALUE_IGNORED_BAD_PRACTICE"
)
public
static
MavenEmbedder
createEmbedder
(
MavenEmbedderRequest
mavenEmbedderRequest
)
throws
MavenEmbedderException
,
IOException
{
...
...
maven-plugin/src/main/java/hudson/maven/ModuleDependency.java
浏览文件 @
244ff567
...
...
@@ -138,7 +138,7 @@ public final class ModuleDependency implements Serializable {
/**
* Upon reading from the disk, intern strings.
*/
p
ublic
ModuleDependency
readResolve
()
{
p
rotected
Object
readResolve
()
{
return
new
ModuleDependency
(
groupId
,
artifactId
,
version
,
plugin
);
}
...
...
pom.xml
浏览文件 @
244ff567
...
...
@@ -105,24 +105,24 @@ THE SOFTWARE.
<dependencyManagement>
<dependencies>
<dependency>
<groupId>
org.apache.ant
</groupId>
<artifactId>
ant
</artifactId>
<version>
1.8.0
</version>
</dependency>
</dependency>
<dependency>
<groupId>
commons-io
</groupId>
<artifactId>
commons-io
</artifactId>
<version>
1.4
</version>
</dependency>
<dependency>
<groupId>
junit
</groupId>
<artifactId>
junit
</artifactId>
<version>
4.8.1
</version>
</dependency>
</dependency>
<dependency>
<groupId>
commons-httpclient
</groupId>
...
...
@@ -234,7 +234,7 @@ THE SOFTWARE.
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-install-plugin
</artifactId>
<version>
2.3.1
</version>
</plugin>
</plugin>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-javadoc-plugin
</artifactId>
...
...
@@ -407,7 +407,7 @@ THE SOFTWARE.
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>
org.codehaus.mojo
</groupId>
...
...
@@ -508,6 +508,21 @@ THE SOFTWARE.
</execution>
</executions>
</plugin>-->
<plugin>
<groupId>
org.codehaus.groovy.maven
</groupId>
<artifactId>
gmaven-plugin
</artifactId>
<version>
1.0
</version>
<executions>
<execution>
<goals>
<goal>
generateStubs
</goal>
<goal>
compile
</goal>
<goal>
generateTestStubs
</goal>
<goal>
testCompile
</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录