Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
918cf8df
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,发现更多精彩内容 >>
提交
918cf8df
编写于
10月 17, 2012
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FIXED JENKINS-15426] Run animal-sniffer:check by default (-DskipTests suppresses).
上级
8bb7e572
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
14 addition
and
7 deletion
+14
-7
core/src/main/java/jenkins/PluginSubtypeMarker.java
core/src/main/java/jenkins/PluginSubtypeMarker.java
+0
-1
plugins/pom.xml
plugins/pom.xml
+2
-2
pom.xml
pom.xml
+11
-3
test/src/main/java/org/jvnet/hudson/test/ThreadPoolImpl.java
test/src/main/java/org/jvnet/hudson/test/ThreadPoolImpl.java
+1
-1
未找到文件。
core/src/main/java/jenkins/PluginSubtypeMarker.java
浏览文件 @
918cf8df
...
...
@@ -58,7 +58,6 @@ import java.util.Set;
@SupportedSourceVersion
(
SourceVersion
.
RELEASE_6
)
@SupportedAnnotationTypes
(
"*"
)
@MetaInfServices
(
Processor
.
class
)
// TODO: needs to pick up animal-sniffer 1.9 for this to take effect at a class (JENKINS-15426)
@IgnoreJRERequirement
@SuppressWarnings
({
"Since15"
})
public
class
PluginSubtypeMarker
extends
AbstractProcessor
{
...
...
plugins/pom.xml
浏览文件 @
918cf8df
...
...
@@ -90,7 +90,7 @@
<!-- for JRE requirement check annotation -->
<groupId>
org.codehaus.mojo
</groupId>
<artifactId>
animal-sniffer-annotations
</artifactId>
<version>
1.
7
</version>
<version>
1.
9
</version>
<scope>
provided
</scope>
<optional>
true
</optional>
<!-- no need to have this at runtime -->
</dependency>
...
...
@@ -297,7 +297,7 @@
<!-- make sure our code doesn't have 1.6 dependencies except where we know it -->
<groupId>
org.codehaus.mojo
</groupId>
<artifactId>
animal-sniffer-maven-plugin
</artifactId>
<version>
1.
7
</version>
<version>
1.
9
</version>
<executions>
<execution>
<goals>
...
...
pom.xml
浏览文件 @
918cf8df
...
...
@@ -97,6 +97,7 @@ THE SOFTWARE.
<slf4jVersion>
1.6.2
</slf4jVersion>
<!-- < 1.6.x version didn't specify the license (MIT) -->
<netbeans.compile.on.save>
none
</netbeans.compile.on.save>
<!-- we rely on Maven source generation -->
<animal.sniffer.skip>
${skipTests}
</animal.sniffer.skip>
</properties>
...
...
@@ -241,7 +242,7 @@ THE SOFTWARE.
<!-- for JRE requirement check annotation -->
<groupId>
org.codehaus.mojo
</groupId>
<artifactId>
animal-sniffer-annotations
</artifactId>
<version>
1.
8
</version>
<version>
1.
9
</version>
<scope>
provided
</scope>
<optional>
true
</optional>
<!-- no need to have this at runtime -->
</dependency>
...
...
@@ -556,7 +557,7 @@ THE SOFTWARE.
<plugin>
<groupId>
org.codehaus.mojo
</groupId>
<artifactId>
animal-sniffer-maven-plugin
</artifactId>
<version>
1.
8
</version>
<version>
1.
9
</version>
</plugin>
</plugins>
</pluginManagement>
...
...
@@ -573,7 +574,7 @@ THE SOFTWARE.
<prepareVerifyArgs>
-P release,sign
</prepareVerifyArgs>
<!-- work around for a bug in javadoc plugin that causes the release to fail. see MRELEASE-271 -->
<preparationGoals>
clean install
</preparationGoals>
<goals>
-DskipTests
javadoc:javadoc animal-sniffer:check
deploy javadoc:aggregate
</goals>
<goals>
-DskipTests
-Danimal.sniffer.skip=false javadoc:javadoc
deploy javadoc:aggregate
</goals>
<pushChanges>
false
</pushChanges>
<localCheckout>
true
</localCheckout>
<tagNameFormat>
jenkins-@{project.version}
</tagNameFormat>
...
...
@@ -598,6 +599,13 @@ THE SOFTWARE.
<!-- make sure our code doesn't have 1.6 dependencies except where we know it -->
<groupId>
org.codehaus.mojo
</groupId>
<artifactId>
animal-sniffer-maven-plugin
</artifactId>
<executions>
<execution>
<goals>
<goal>
check
</goal>
</goals>
</execution>
</executions>
<configuration>
<signature>
<groupId>
org.codehaus.mojo.signature
</groupId>
...
...
test/src/main/java/org/jvnet/hudson/test/ThreadPoolImpl.java
浏览文件 @
918cf8df
...
...
@@ -25,7 +25,7 @@ public class ThreadPoolImpl extends AbstractLifeCycle implements ThreadPool {
}
public
void
join
()
throws
InterruptedException
{
while
(!
es
.
awaitTermination
(
999
,
TimeUnit
.
DAY
S
))
while
(!
es
.
awaitTermination
(
999
*
60
*
60
*
24
,
TimeUnit
.
SECOND
S
))
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录