Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
e1f5612b
J
jenkins
项目概览
LinuxSuRen
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
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,发现更多精彩内容 >>
提交
e1f5612b
编写于
11月 03, 2012
作者:
I
imod
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
rename package
上级
44f00659
变更
24
隐藏空白更改
内联
并排
Showing
24 changed file
with
37 addition
and
34 deletion
+37
-34
core/src/main/java/hudson/tasks/Maven.java
core/src/main/java/hudson/tasks/Maven.java
+6
-6
core/src/main/java/jenkins/mvn/DefaultGlobalSettingsProvider.java
.../main/java/jenkins/mvn/DefaultGlobalSettingsProvider.java
+1
-1
core/src/main/java/jenkins/mvn/DefaultSettingsProvider.java
core/src/main/java/jenkins/mvn/DefaultSettingsProvider.java
+1
-1
core/src/main/java/jenkins/mvn/FilePathGlobalSettingsProvider.java
...main/java/jenkins/mvn/FilePathGlobalSettingsProvider.java
+1
-2
core/src/main/java/jenkins/mvn/FilePathSettingsProvider.java
core/src/main/java/jenkins/mvn/FilePathSettingsProvider.java
+1
-1
core/src/main/java/jenkins/mvn/GlobalSettingsProvider.java
core/src/main/java/jenkins/mvn/GlobalSettingsProvider.java
+1
-1
core/src/main/java/jenkins/mvn/GlobalSettingsProviderDescriptor.java
...in/java/jenkins/mvn/GlobalSettingsProviderDescriptor.java
+3
-2
core/src/main/java/jenkins/mvn/SettingsProvider.java
core/src/main/java/jenkins/mvn/SettingsProvider.java
+1
-1
core/src/main/java/jenkins/mvn/SettingsProviderDescriptor.java
...src/main/java/jenkins/mvn/SettingsProviderDescriptor.java
+3
-2
core/src/main/resources/jenkins/mvn/DefaultGlobalSettingsProvider/config.jelly
...es/jenkins/mvn/DefaultGlobalSettingsProvider/config.jelly
+0
-0
core/src/main/resources/jenkins/mvn/DefaultGlobalSettingsProvider/help.html
...urces/jenkins/mvn/DefaultGlobalSettingsProvider/help.html
+0
-0
core/src/main/resources/jenkins/mvn/DefaultSettingsProvider/config.jelly
...esources/jenkins/mvn/DefaultSettingsProvider/config.jelly
+0
-0
core/src/main/resources/jenkins/mvn/DefaultSettingsProvider/help.html
...n/resources/jenkins/mvn/DefaultSettingsProvider/help.html
+0
-0
core/src/main/resources/jenkins/mvn/FilePathGlobalSettingsProvider/config.jelly
...s/jenkins/mvn/FilePathGlobalSettingsProvider/config.jelly
+0
-0
core/src/main/resources/jenkins/mvn/FilePathGlobalSettingsProvider/help-path.html
...jenkins/mvn/FilePathGlobalSettingsProvider/help-path.html
+0
-0
core/src/main/resources/jenkins/mvn/FilePathGlobalSettingsProvider/help.html
...rces/jenkins/mvn/FilePathGlobalSettingsProvider/help.html
+0
-0
core/src/main/resources/jenkins/mvn/FilePathSettingsProvider/config.jelly
...sources/jenkins/mvn/FilePathSettingsProvider/config.jelly
+0
-0
core/src/main/resources/jenkins/mvn/FilePathSettingsProvider/help-path.html
...urces/jenkins/mvn/FilePathSettingsProvider/help-path.html
+0
-0
core/src/main/resources/jenkins/mvn/FilePathSettingsProvider/help.html
.../resources/jenkins/mvn/FilePathSettingsProvider/help.html
+0
-0
maven-plugin/src/main/java/hudson/maven/MavenBuild.java
maven-plugin/src/main/java/hudson/maven/MavenBuild.java
+2
-1
maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
+12
-11
maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
...lugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
+2
-2
maven-plugin/src/main/java/hudson/maven/MavenUtil.java
maven-plugin/src/main/java/hudson/maven/MavenUtil.java
+1
-1
maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java
...-plugin/src/main/java/hudson/maven/RedeployPublisher.java
+2
-2
未找到文件。
core/src/main/java/hudson/tasks/Maven.java
浏览文件 @
e1f5612b
...
...
@@ -38,11 +38,11 @@ import hudson.model.Computer;
import
hudson.model.EnvironmentSpecific
;
import
hudson.model.Node
;
import
jenkins.model.Jenkins
;
import
jenkins.mvn.DefaultGlobalSettingsProvider
;
import
jenkins.mvn.DefaultSettingsProvider
;
import
jenkins.mvn.GlobalSettingsProvider
;
import
jenkins.mvn.SettingsProvider
;
import
hudson.model.TaskListener
;
import
hudson.mvn.DefaultGlobalSettingsProvider
;
import
hudson.mvn.DefaultSettingsProvider
;
import
hudson.mvn.GlobalSettingsProvider
;
import
hudson.mvn.SettingsProvider
;
import
hudson.remoting.Callable
;
import
hudson.remoting.VirtualChannel
;
import
hudson.slaves.NodeSpecific
;
...
...
@@ -127,13 +127,13 @@ public class Maven extends Builder {
/**
* Provides access to the settings.xml to be used for a build.
* @since 1.48
1
* @since 1.48
8
*/
private
SettingsProvider
settings
=
new
DefaultSettingsProvider
();
/**
* Provides access to the global settings.xml to be used for a build.
* @since 1.48
1
* @since 1.48
8
*/
private
GlobalSettingsProvider
globalSettings
=
new
DefaultGlobalSettingsProvider
();
...
...
core/src/main/java/
hudson
/mvn/DefaultGlobalSettingsProvider.java
→
core/src/main/java/
jenkins
/mvn/DefaultGlobalSettingsProvider.java
浏览文件 @
e1f5612b
package
hudson
.mvn
;
package
jenkins
.mvn
;
import
hudson.Extension
;
import
hudson.FilePath
;
...
...
core/src/main/java/
hudson
/mvn/DefaultSettingsProvider.java
→
core/src/main/java/
jenkins
/mvn/DefaultSettingsProvider.java
浏览文件 @
e1f5612b
package
hudson
.mvn
;
package
jenkins
.mvn
;
import
hudson.Extension
;
import
hudson.FilePath
;
...
...
core/src/main/java/
hudson
/mvn/FilePathGlobalSettingsProvider.java
→
core/src/main/java/
jenkins
/mvn/FilePathGlobalSettingsProvider.java
浏览文件 @
e1f5612b
package
hudson
.mvn
;
package
jenkins
.mvn
;
import
hudson.Extension
;
import
hudson.FilePath
;
...
...
@@ -7,7 +7,6 @@ import hudson.model.TaskListener;
import
hudson.util.IOUtils
;
import
java.io.File
;
import
java.io.IOException
;
import
org.apache.commons.lang.StringUtils
;
import
org.kohsuke.stapler.DataBoundConstructor
;
...
...
core/src/main/java/
hudson
/mvn/FilePathSettingsProvider.java
→
core/src/main/java/
jenkins
/mvn/FilePathSettingsProvider.java
浏览文件 @
e1f5612b
package
hudson
.mvn
;
package
jenkins
.mvn
;
import
hudson.Extension
;
import
hudson.FilePath
;
...
...
core/src/main/java/
hudson
/mvn/GlobalSettingsProvider.java
→
core/src/main/java/
jenkins
/mvn/GlobalSettingsProvider.java
浏览文件 @
e1f5612b
package
hudson
.mvn
;
package
jenkins
.mvn
;
import
hudson.ExtensionPoint
;
import
hudson.FilePath
;
...
...
core/src/main/java/
hudson
/mvn/GlobalSettingsProviderDescriptor.java
→
core/src/main/java/
jenkins
/mvn/GlobalSettingsProviderDescriptor.java
浏览文件 @
e1f5612b
package
hudson
.mvn
;
package
jenkins
.mvn
;
import
hudson.model.Descriptor
;
import
jenkins.model.Jenkins
;
import
java.util.List
;
import
jenkins.model.Jenkins
;
/**
* @author <a href="mailto:nicolas.deloof@gmail.com">Nicolas De Loof</a>
* @author Dominik Bartholdi (imod)
...
...
core/src/main/java/
hudson
/mvn/SettingsProvider.java
→
core/src/main/java/
jenkins
/mvn/SettingsProvider.java
浏览文件 @
e1f5612b
package
hudson
.mvn
;
package
jenkins
.mvn
;
import
hudson.ExtensionPoint
;
import
hudson.FilePath
;
...
...
core/src/main/java/
hudson
/mvn/SettingsProviderDescriptor.java
→
core/src/main/java/
jenkins
/mvn/SettingsProviderDescriptor.java
浏览文件 @
e1f5612b
package
hudson
.mvn
;
package
jenkins
.mvn
;
import
hudson.model.Descriptor
;
import
jenkins.model.Jenkins
;
import
java.util.List
;
import
jenkins.model.Jenkins
;
/**
* @author <a href="mailto:nicolas.deloof@gmail.com">Nicolas De Loof</a>
*/
...
...
core/src/main/resources/
hudson
/mvn/DefaultGlobalSettingsProvider/config.jelly
→
core/src/main/resources/
jenkins
/mvn/DefaultGlobalSettingsProvider/config.jelly
浏览文件 @
e1f5612b
文件已移动
core/src/main/resources/
hudson
/mvn/DefaultGlobalSettingsProvider/help.html
→
core/src/main/resources/
jenkins
/mvn/DefaultGlobalSettingsProvider/help.html
浏览文件 @
e1f5612b
文件已移动
core/src/main/resources/
hudson
/mvn/DefaultSettingsProvider/config.jelly
→
core/src/main/resources/
jenkins
/mvn/DefaultSettingsProvider/config.jelly
浏览文件 @
e1f5612b
文件已移动
core/src/main/resources/
hudson
/mvn/DefaultSettingsProvider/help.html
→
core/src/main/resources/
jenkins
/mvn/DefaultSettingsProvider/help.html
浏览文件 @
e1f5612b
文件已移动
core/src/main/resources/
hudson
/mvn/FilePathGlobalSettingsProvider/config.jelly
→
core/src/main/resources/
jenkins
/mvn/FilePathGlobalSettingsProvider/config.jelly
浏览文件 @
e1f5612b
文件已移动
core/src/main/resources/
hudson
/mvn/FilePathGlobalSettingsProvider/help-path.html
→
core/src/main/resources/
jenkins
/mvn/FilePathGlobalSettingsProvider/help-path.html
浏览文件 @
e1f5612b
文件已移动
core/src/main/resources/
hudson
/mvn/FilePathGlobalSettingsProvider/help.html
→
core/src/main/resources/
jenkins
/mvn/FilePathGlobalSettingsProvider/help.html
浏览文件 @
e1f5612b
文件已移动
core/src/main/resources/
hudson
/mvn/FilePathSettingsProvider/config.jelly
→
core/src/main/resources/
jenkins
/mvn/FilePathSettingsProvider/config.jelly
浏览文件 @
e1f5612b
文件已移动
core/src/main/resources/
hudson
/mvn/FilePathSettingsProvider/help-path.html
→
core/src/main/resources/
jenkins
/mvn/FilePathSettingsProvider/help-path.html
浏览文件 @
e1f5612b
文件已移动
core/src/main/resources/
hudson
/mvn/FilePathSettingsProvider/help.html
→
core/src/main/resources/
jenkins
/mvn/FilePathSettingsProvider/help.html
浏览文件 @
e1f5612b
文件已移动
maven-plugin/src/main/java/hudson/maven/MavenBuild.java
浏览文件 @
e1f5612b
...
...
@@ -40,7 +40,6 @@ import hudson.model.Node;
import
hudson.model.Result
;
import
hudson.model.Run
;
import
hudson.model.TaskListener
;
import
hudson.mvn.SettingsProvider
;
import
hudson.remoting.Channel
;
import
hudson.scm.ChangeLogSet
;
import
hudson.scm.ChangeLogSet.Entry
;
...
...
@@ -74,6 +73,8 @@ import java.util.List;
import
java.util.Map
;
import
java.util.logging.Logger
;
import
jenkins.mvn.SettingsProvider
;
/**
* {@link Run} for {@link MavenModule}.
*
...
...
maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
浏览文件 @
e1f5612b
...
...
@@ -34,6 +34,7 @@ import hudson.Functions;
import
hudson.Indenter
;
import
hudson.Plugin
;
import
hudson.Util
;
import
hudson.PluginManager.PluginUpdateMonitor
;
import
hudson.maven.local_repo.DefaultLocalRepositoryLocator
;
import
hudson.maven.local_repo.LocalRepositoryLocator
;
import
hudson.maven.local_repo.PerJobLocalRepositoryLocator
;
...
...
@@ -55,13 +56,6 @@ import hudson.model.SCMedItem;
import
hudson.model.Saveable
;
import
hudson.model.TaskListener
;
import
hudson.model.TopLevelItem
;
import
hudson.mvn.DefaultGlobalSettingsProvider
;
import
hudson.mvn.DefaultSettingsProvider
;
import
hudson.mvn.FilePathSettingsProvider
;
import
hudson.mvn.GlobalSettingsProvider
;
import
hudson.mvn.GlobalSettingsProviderDescriptor
;
import
hudson.mvn.SettingsProvider
;
import
hudson.mvn.SettingsProviderDescriptor
;
import
hudson.search.CollectionSearchIndex
;
import
hudson.search.SearchIndexBuilder
;
import
hudson.tasks.BuildStep
;
...
...
@@ -97,6 +91,13 @@ import java.util.Stack;
import
javax.servlet.ServletException
;
import
jenkins.model.Jenkins
;
import
jenkins.mvn.DefaultGlobalSettingsProvider
;
import
jenkins.mvn.DefaultSettingsProvider
;
import
jenkins.mvn.FilePathSettingsProvider
;
import
jenkins.mvn.GlobalSettingsProvider
;
import
jenkins.mvn.GlobalSettingsProviderDescriptor
;
import
jenkins.mvn.SettingsProvider
;
import
jenkins.mvn.SettingsProviderDescriptor
;
import
net.sf.json.JSONObject
;
import
org.apache.commons.beanutils.PropertyUtils
;
...
...
@@ -274,12 +275,12 @@ public class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,MavenMod
protected
transient
String
globalSettingConfigPath
;
/**
* @since 1.48
1
* @since 1.48
8
*/
private
SettingsProvider
settings
=
new
DefaultSettingsProvider
();
/**
* @since 1.48
1
* @since 1.48
8
*/
private
GlobalSettingsProvider
globalSettings
=
new
DefaultGlobalSettingsProvider
();
...
...
@@ -299,7 +300,7 @@ public class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,MavenMod
this
.
alternateSettings
=
null
;
}
else
if
(
plugin
!=
null
&&
StringUtils
.
isNotBlank
(
this
.
settingConfigId
))
{
try
{
Class
<?
extends
SettingsProvider
>
legacySettings
=
plugin
.
getWrapper
().
classLoader
.
loadClass
(
"org.jenkinsci.plugins.configfiles.maven.MvnSettingsProvider"
).
asSubclass
(
SettingsProvider
.
class
);
Class
<?
extends
SettingsProvider
>
legacySettings
=
plugin
.
getWrapper
().
classLoader
.
loadClass
(
"org.jenkinsci.plugins.configfiles.maven.
job.
MvnSettingsProvider"
).
asSubclass
(
SettingsProvider
.
class
);
SettingsProvider
newInstance
=
legacySettings
.
newInstance
();
PropertyUtils
.
setProperty
(
newInstance
,
"settingsConfigId"
,
this
.
settingConfigId
);
this
.
settings
=
newInstance
;
...
...
@@ -313,7 +314,7 @@ public class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,MavenMod
if
(
plugin
!=
null
&&
StringUtils
.
isNotBlank
(
this
.
globalSettingConfigId
))
{
try
{
Class
<?
extends
GlobalSettingsProvider
>
legacySettings
=
plugin
.
getWrapper
().
classLoader
.
loadClass
(
"org.jenkinsci.plugins.configfiles.maven.MvnGlobalSettingsProvider"
).
asSubclass
(
GlobalSettingsProvider
.
class
);
Class
<?
extends
GlobalSettingsProvider
>
legacySettings
=
plugin
.
getWrapper
().
classLoader
.
loadClass
(
"org.jenkinsci.plugins.configfiles.maven.
job.
MvnGlobalSettingsProvider"
).
asSubclass
(
GlobalSettingsProvider
.
class
);
GlobalSettingsProvider
newInstance
=
legacySettings
.
newInstance
();
PropertyUtils
.
setProperty
(
newInstance
,
"settingsConfigId"
,
this
.
globalSettingConfigId
);
this
.
globalSettings
=
newInstance
;
...
...
maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
浏览文件 @
e1f5612b
...
...
@@ -51,8 +51,6 @@ import hudson.model.Result;
import
hudson.model.Run
;
import
hudson.model.StringParameterDefinition
;
import
hudson.model.TaskListener
;
import
hudson.mvn.GlobalSettingsProvider
;
import
hudson.mvn.SettingsProvider
;
import
hudson.remoting.VirtualChannel
;
import
hudson.scm.ChangeLogSet
;
import
hudson.tasks.BuildStep
;
...
...
@@ -83,6 +81,8 @@ import java.util.logging.Level;
import
java.util.logging.Logger
;
import
jenkins.model.Jenkins
;
import
jenkins.mvn.GlobalSettingsProvider
;
import
jenkins.mvn.SettingsProvider
;
import
org.apache.commons.io.FilenameUtils
;
import
org.apache.commons.lang.StringUtils
;
...
...
maven-plugin/src/main/java/hudson/maven/MavenUtil.java
浏览文件 @
e1f5612b
...
...
@@ -30,8 +30,8 @@ import hudson.model.AbstractBuild;
import
hudson.model.AbstractProject
;
import
hudson.model.BuildListener
;
import
jenkins.model.Jenkins
;
import
jenkins.mvn.SettingsProvider
;
import
hudson.model.TaskListener
;
import
hudson.mvn.SettingsProvider
;
import
hudson.tasks.Maven.MavenInstallation
;
import
hudson.tasks.Maven.ProjectWithMaven
;
...
...
maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java
浏览文件 @
e1f5612b
...
...
@@ -35,8 +35,6 @@ import hudson.model.BuildListener;
import
hudson.model.Node
;
import
hudson.model.Result
;
import
hudson.model.TaskListener
;
import
hudson.mvn.GlobalSettingsProvider
;
import
hudson.mvn.SettingsProvider
;
import
hudson.remoting.Callable
;
import
hudson.tasks.BuildStepDescriptor
;
import
hudson.tasks.BuildStepMonitor
;
...
...
@@ -54,6 +52,8 @@ import java.util.Map.Entry;
import
java.util.Properties
;
import
jenkins.model.Jenkins
;
import
jenkins.mvn.GlobalSettingsProvider
;
import
jenkins.mvn.SettingsProvider
;
import
net.sf.json.JSONObject
;
import
org.apache.commons.io.FileUtils
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录