Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
e004d2ec
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,发现更多精彩内容 >>
提交
e004d2ec
编写于
5月 31, 2011
作者:
O
Olivier Lamy
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of github.com:jenkinsci/jenkins
上级
ed51d4d6
a3657279
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
66 addition
and
13 deletion
+66
-13
changelog.html
changelog.html
+3
-0
maven-plugin/src/main/java/hudson/maven/AbstractMavenProcessFactory.java
...c/main/java/hudson/maven/AbstractMavenProcessFactory.java
+15
-4
maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
+15
-0
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries.jelly
...urces/hudson/maven/MavenModuleSet/configure-entries.jelly
+3
-1
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_fr.properties
...dson/maven/MavenModuleSet/configure-entries_fr.properties
+14
-8
maven-plugin/src/main/webapp/run-headless.html
maven-plugin/src/main/webapp/run-headless.html
+7
-0
maven-plugin/src/main/webapp/run-headless_fr.html
maven-plugin/src/main/webapp/run-headless_fr.html
+9
-0
未找到文件。
changelog.html
浏览文件 @
e004d2ec
...
@@ -68,6 +68,9 @@ Upcoming changes</a>
...
@@ -68,6 +68,9 @@ Upcoming changes</a>
<li
class=
rfe
>
<li
class=
rfe
>
Post-build deploy task for Maven jobs : Repositories definitions can now be read from the POMs.
Post-build deploy task for Maven jobs : Repositories definitions can now be read from the POMs.
(
<a
href=
"http://issues.jenkins-ci.org/browse/JENKINS-9786"
>
issue 9786
</a>
)
(
<a
href=
"http://issues.jenkins-ci.org/browse/JENKINS-9786"
>
issue 9786
</a>
)
<li
class=
rfe
>
Run maven jobs as headless process. on OSX this avoid jumping Dock icon to take focus.
(
<a
href=
"http://issues.jenkins-ci.org/browse/JENKINS-9785"
>
issue 9785
</a>
)
</ul>
</ul>
</div>
<!--=TRUNK-END=-->
</div>
<!--=TRUNK-END=-->
...
...
maven-plugin/src/main/java/hudson/maven/AbstractMavenProcessFactory.java
浏览文件 @
e004d2ec
package
hudson.maven
;
package
hudson.maven
;
import
static
hudson
.
Util
.
fixNull
;
import
static
hudson
.
Util
.
fixNull
;
import
hudson.AbortException
;
import
hudson.AbortException
;
import
hudson.EnvVars
;
import
hudson.EnvVars
;
import
hudson.FilePath
;
import
hudson.FilePath
;
import
hudson.Launcher
;
import
hudson.Launcher
;
import
hudson.Platform
;
import
hudson.Proc
;
import
hudson.Proc
;
import
hudson.maven.ProcessCache.NewProcess
;
import
hudson.maven.ProcessCache.NewProcess
;
import
hudson.model.BuildListener
;
import
hudson.model.BuildListener
;
...
@@ -24,7 +26,6 @@ import hudson.slaves.Channels;
...
@@ -24,7 +26,6 @@ import hudson.slaves.Channels;
import
hudson.tasks.Maven.MavenInstallation
;
import
hudson.tasks.Maven.MavenInstallation
;
import
hudson.tasks._maven.MavenConsoleAnnotator
;
import
hudson.tasks._maven.MavenConsoleAnnotator
;
import
hudson.util.ArgumentListBuilder
;
import
hudson.util.ArgumentListBuilder
;
import
java.io.BufferedInputStream
;
import
java.io.BufferedInputStream
;
import
java.io.BufferedOutputStream
;
import
java.io.BufferedOutputStream
;
import
java.io.IOException
;
import
java.io.IOException
;
...
@@ -37,8 +38,6 @@ import java.net.SocketTimeoutException;
...
@@ -37,8 +38,6 @@ import java.net.SocketTimeoutException;
import
java.nio.charset.Charset
;
import
java.nio.charset.Charset
;
import
java.nio.charset.UnsupportedCharsetException
;
import
java.nio.charset.UnsupportedCharsetException
;
import
java.util.Arrays
;
import
java.util.Arrays
;
import
org.jenkinsci.plugins.tokenmacro.TokenMacro
;
import
org.kohsuke.stapler.framework.io.IOException2
;
import
org.kohsuke.stapler.framework.io.IOException2
;
/*
/*
...
@@ -274,7 +273,19 @@ public abstract class AbstractMavenProcessFactory
...
@@ -274,7 +273,19 @@ public abstract class AbstractMavenProcessFactory
}
}
}
}
if
(
mms
.
runHeadless
())
{
// Configure headless process
mavenOpts
+=
" -Djava.awt.headless=true"
;
}
else
{
if
(
Platform
.
isDarwin
())
{
// Would be cool to replace the generic Java icon with jenkins logo, but requires
// the file absolute path to be available on slave *before* the process run on it :-/
// Maybe we could enforce this from the DMG installer on OSX
// TODO mavenOpts += " -Xdock:name=Jenkins -Xdock:icon=jenkins.png";
}
}
return
envVars
.
expand
(
mavenOpts
);
return
envVars
.
expand
(
mavenOpts
);
}
}
...
...
maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
浏览文件 @
e004d2ec
...
@@ -204,6 +204,12 @@ public final class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,Ma
...
@@ -204,6 +204,12 @@ public final class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,Ma
*/
*/
private
int
mavenValidationLevel
=
-
1
;
private
int
mavenValidationLevel
=
-
1
;
/**
* Inform jenkins this build don't use UI code and can run without access to graphical environment. Could be used
* later to select a headless-slave from a pool, but first introduced for JENKINS-9785
*/
private
boolean
runHeadless
=
false
;
/**
/**
* Reporters configured at {@link MavenModuleSet} level. Applies to all {@link MavenModule} builds.
* Reporters configured at {@link MavenModuleSet} level. Applies to all {@link MavenModule} builds.
*/
*/
...
@@ -357,6 +363,10 @@ public final class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,Ma
...
@@ -357,6 +363,10 @@ public final class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,Ma
return
ignoreUpstremChanges
;
return
ignoreUpstremChanges
;
}
}
public
boolean
runHeadless
()
{
return
runHeadless
;
}
public
boolean
isArchivingDisabled
()
{
public
boolean
isArchivingDisabled
()
{
return
archivingDisabled
;
return
archivingDisabled
;
}
}
...
@@ -377,6 +387,10 @@ public final class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,Ma
...
@@ -377,6 +387,10 @@ public final class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,Ma
this
.
ignoreUpstremChanges
=
ignoreUpstremChanges
;
this
.
ignoreUpstremChanges
=
ignoreUpstremChanges
;
}
}
public
void
setRunHeadless
(
boolean
runHeadless
)
{
this
.
runHeadless
=
runHeadless
;
}
public
void
setIsArchivingDisabled
(
boolean
archivingDisabled
)
{
public
void
setIsArchivingDisabled
(
boolean
archivingDisabled
)
{
this
.
archivingDisabled
=
archivingDisabled
;
this
.
archivingDisabled
=
archivingDisabled
;
}
}
...
@@ -811,6 +825,7 @@ public final class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,Ma
...
@@ -811,6 +825,7 @@ public final class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,Ma
aggregatorStyleBuild
=
!
req
.
hasParameter
(
"maven.perModuleBuild"
);
aggregatorStyleBuild
=
!
req
.
hasParameter
(
"maven.perModuleBuild"
);
usePrivateRepository
=
req
.
hasParameter
(
"maven.usePrivateRepository"
);
usePrivateRepository
=
req
.
hasParameter
(
"maven.usePrivateRepository"
);
ignoreUpstremChanges
=
!
json
.
has
(
"triggerByDependency"
);
ignoreUpstremChanges
=
!
json
.
has
(
"triggerByDependency"
);
runHeadless
=
req
.
hasParameter
(
"maven.runHeadless"
);
incrementalBuild
=
req
.
hasParameter
(
"maven.incrementalBuild"
);
incrementalBuild
=
req
.
hasParameter
(
"maven.incrementalBuild"
);
archivingDisabled
=
req
.
hasParameter
(
"maven.archivingDisabled"
);
archivingDisabled
=
req
.
hasParameter
(
"maven.archivingDisabled"
);
resolveDependencies
=
req
.
hasParameter
(
"maven.resolveDependencies"
);
resolveDependencies
=
req
.
hasParameter
(
"maven.resolveDependencies"
);
...
...
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries.jelly
浏览文件 @
e004d2ec
...
@@ -91,7 +91,9 @@ THE SOFTWARE.
...
@@ -91,7 +91,9 @@ THE SOFTWARE.
checked="${it.usesPrivateRepository()}" />
checked="${it.usesPrivateRepository()}" />
<f:optionalBlock name="maven.resolveDependencies" title="${%Resolve Dependencies during Pom parsing}"
<f:optionalBlock name="maven.resolveDependencies" title="${%Resolve Dependencies during Pom parsing}"
checked="${it.isResolveDependencies()}" />
checked="${it.isResolveDependencies()}" />
<f:optionalBlock name="maven.processPlugins" title="${%Process Plugins during Pom parsing}"
<f:optionalBlock name="maven.runHeadless" title="${%Run Headless}" help="/plugin/maven-plugin/run-headless.html"
checked="${it.runHeadless()}" />
<f:optionalBlock name="maven.processPlugins" title="${%Process Plugins during Pom parsing}"
checked="${it.isProcessPlugins()}" />
checked="${it.isProcessPlugins()}" />
<p:config-customWorkspace />
<p:config-customWorkspace />
...
...
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_fr.properties
浏览文件 @
e004d2ec
...
@@ -21,16 +21,22 @@
...
@@ -21,16 +21,22 @@
# THE SOFTWARE.
# THE SOFTWARE.
Alternate\
settings\
file
=
Fichier settings alternatif
Alternate\
settings\
file
=
Fichier settings alternatif
Block\
build\
when\
dependency\
building
=
Bloquer le build pendant la construction des d
\u
00
E
9pendances
Block\
build\
when\
dependency\
building
=
Bloquer le build pendant la construction des d
\u
00
e
9pendances
Build
=
Build
Build
=
Build
Incremental\
build\
-\
only\
build\
changed\
modules
=
Construction incr
\u
00
E9mentale - ne faire la construction (build) que pour les modules chang
\u
00E
9s
Incremental\
build\
-\
only\
build\
changed\
modules
=
Construction incr
\u
00
e9mentale - ne faire la construction (build) que pour les modules chang
\u
00e
9s
Maven\
Version
=
Version de Maven
Maven\
Version
=
Version de Maven
Root\
POM
=
POM Racine
Root\
POM
=
POM Racine
Build\
modules\
in\
parallel
=
Construire les modules en parall
è
le
Build\
modules\
in\
parallel
=
Construire les modules en parall
\u
00ea
le
Build\
Settings
=
Configuration du build
Build\
Settings
=
Configuration du build
Use\
private\
Maven\
repository
=
Utilise un repository Maven priv
\u
00
E
9
Use\
private\
Maven\
repository
=
Utilise un repository Maven priv
\u
00
e
9
Use\
private\
maven\
repository
=
Utiliser un repository Maven priv
é
Use\
private\
maven\
repository
=
Utiliser un repository Maven priv
\u
00e9
Goals\
and\
options
=
Goals et options
Goals\
and\
options
=
Goals et options
Maven\
Version.error.1
=
Jenkins a besoin de savoir où Maven2/3 est installé.
Maven\
Version.error.1
=
Jenkins a besoin de savoir o
\u
00f9 Maven2/3 est install
\u
00c8.
Maven\
Version.error.2
=
Veuillez le faire dans <a href="{0}/configure" target="_new">la configuration système</a>.
Maven\
Version.error.2
=
Veuillez le faire dans <a href="{0}/configure" target="_new">la configuration syst
\u
00cbme</a>.
Build\
whenever\
a\
SNAPSHOT\
dependency\
is\
built
=
Lance un build à chaque fois qu''une dépendance SNAPSHOT est construite
Build\
whenever\
a\
SNAPSHOT\
dependency\
is\
built
=
Lance un build
\u
00e0 chaque fois qu''une d
\u
00e9pendance SNAPSHOT est construite
Run\
Headless
=
Ex
\u
00e9cuter sans environnement graphique
Disable\
automatic\
artifact\
archiving
=
D
\u
00e9sactive l'achivage automatique des artefacts
Resolve\
Dependencies\
during\
Pom\
parsing
=
Effectue la r
\u
00e9solution de d
\u
00e9pendances pendant la lecture du POM
Process\
Plugins\
during\
Pom\
parsing
=
Analyse les plugins pendant la lecture du POM
Maven\
Validation\
Level
=
Niveau de validation du POM Maven
Goals
=
Goals
maven-plugin/src/main/webapp/run-headless.html
0 → 100644
浏览文件 @
e004d2ec
<div>
<p>
If build doesn't requires access to desktop (only using command line tools and tests) this option can be checked.
<p>
This option allow Jenkins to configure the build process in headless mode. Usefull on OSX to avoid boring Dock icon
to take focus, this option may also in future release be used to select slave adequate instance.
</div>
\ No newline at end of file
maven-plugin/src/main/webapp/run-headless_fr.html
0 → 100644
浏览文件 @
e004d2ec
<div>
<p>
Si le build ne n
&
eacute,cessite pas un acc
è
à
l'environnement graphique (s'il n'utilise que des outils
en ligne de commande) cette option peut
ê
tre activŽe.
<p>
Cette option permet
à
Jenkins de lancer le processus de build en mode
<em>
'headless'
</em>
. Ceci est
particuli
è
rement int
é
ressant sur OSX pour
é
viter qu'une ic
ô
ne Java prenne le focus en sautillant
dans le Dock. Cette option pourrait
à
l'avenir servir
à
s
é
lectionner un esclave adapt
é
.
</div>
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录