提交 d600a319 编写于 作者: O Olivier Lamy 提交者: Oleg Nenashev

[JENKINS-43713] Integrate Winstone 4 (Jetty 9.4.5) (#2850)

* use snapshot of winstone with new jetty 9.4.x version
Signed-off-by: Nolivier lamy <olamy@apache.org>

* add jetty snapshot repository until last jetty release deployed
Signed-off-by: Nolivier lamy <olamy@apache.org>

* surefire 2.20
Signed-off-by: Nolivier lamy <olamy@apache.org>

* winstone will be 4.0
Signed-off-by: Nolivier lamy <olamy@apache.org>

* remove jetty snapshot repo
Signed-off-by: Nolivier lamy <olamy@apache.org>

* touch to force pr rebuild as snapshot has been deployed
Signed-off-by: Nolivier lamy <olamy@apache.org>

* use winstone release
Signed-off-by: Nolivier lamy <olamy@apache.org>

* use maven-jenkins-dev-plugin 9.4.5.v20170502-jenkins-1
Signed-off-by: Nolivier lamy <olamy@apache.org>
上级 75ac24a3
......@@ -368,7 +368,7 @@ THE SOFTWARE.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version> <!-- ignoring ${maven-surefire-plugin.version} -->
<version>2.20</version> <!-- ignoring ${maven-surefire-plugin.version} -->
<configuration>
<argLine>-noverify</argLine> <!-- some versions of JDK7/8 causes VerifyError during mock tests: http://code.google.com/p/powermock/issues/detail?id=504 -->
<systemPropertyVariables>
......@@ -510,7 +510,7 @@ THE SOFTWARE.
<!-- this is really just a patched version of maven-jetty-plugin to workaround issue #932 -->
<groupId>org.jenkins-ci.tools</groupId>
<artifactId>maven-jenkins-dev-plugin</artifactId>
<version>9.2.15.v20160210-jenkins-1</version>
<version>9.4.5.v20170502-jenkins-1</version>
</plugin>
<plugin>
<groupId>org.jvnet.updatecenter2</groupId>
......
......@@ -93,7 +93,7 @@ THE SOFTWARE.
-->
<groupId>org.jenkins-ci</groupId>
<artifactId>winstone</artifactId>
<version>3.3</version>
<version>4.0</version>
<scope>test</scope>
</dependency>
<dependency>
......@@ -177,7 +177,6 @@ THE SOFTWARE.
</dependency>
<!-- offline profiler API when we need it -->
<!--dependency
<groupId>com.yourkit.api</groupId>
<artifactId>yjp</artifactId>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册