Skip to content
Permalink
Browse files

[JENKINS-34713] Upgrade to 2.7 parent pom. Fix tests.

  • Loading branch information...
armfergom committed May 10, 2016
1 parent e87edf2 commit 89e80ecb3a6ef95dded38db15bcf1a9af4a9c3e0
45 pom.xml
@@ -3,65 +3,38 @@
<parent> <parent>
<groupId>org.jenkins-ci.plugins</groupId> <groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId> <artifactId>plugin</artifactId>
<version>1.580</version> <version>2.7</version>
</parent> </parent>


<artifactId>translation</artifactId> <artifactId>translation</artifactId>
<version>1.15-SNAPSHOT</version> <version>1.15-SNAPSHOT</version>
<packaging>hpi</packaging> <packaging>hpi</packaging>
<name>Jenkins Translation Assistance plugin</name> <name>Jenkins Translation Assistance plugin</name>
<url>http://wiki.jenkins-ci.org/display/JENKINS/Translation+Assistance+Plugin</url> <url>https://wiki.jenkins-ci.org/display/JENKINS/Translation+Assistance+Plugin</url>


<scm> <scm>
<connection>scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git</connection> <connection>scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
<developerConnection>scm:git:git@github.com:jenkinsci/${project.artifactId}-plugin.git</developerConnection> <developerConnection>scm:git:git@github.com:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
<url>http://github.com/jenkinsci/${project.artifactId}-plugin</url> <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
<tag>HEAD</tag> <tag>HEAD</tag>
</scm> </scm>


<dependencies> <properties>
<dependency> <jenkins.version>1.580</jenkins.version>
<groupId>com.google.code.findbugs</groupId> <java.level>6</java.level>
<artifactId>annotations</artifactId> </properties>
<version>3.0.0</version>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.1</version>
<configuration>
<xmlOutput>true</xmlOutput>
<failOnError>true</failOnError>
</configuration>
<executions>
<execution>
<id>run-findbugs</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>


<repositories> <repositories>
<repository> <repository>
<id>repo.jenkins-ci.org</id> <id>repo.jenkins-ci.org</id>
<url>http://repo.jenkins-ci.org/public/</url> <url>https://repo.jenkins-ci.org/public/</url>
</repository> </repository>
</repositories> </repositories>


<pluginRepositories> <pluginRepositories>
<pluginRepository> <pluginRepository>
<id>repo.jenkins-ci.org</id> <id>repo.jenkins-ci.org</id>
<url>http://repo.jenkins-ci.org/public/</url> <url>https://repo.jenkins-ci.org/public/</url>
</pluginRepository> </pluginRepository>
</pluginRepositories> </pluginRepositories>
</project> </project>
@@ -25,6 +25,7 @@ THE SOFTWARE.
<!-- <!--
Called from the dialog.js to render the dialog content HTML Called from the dialog.js to render the dialog content HTML
--> -->
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:f="/lib/form"> <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:f="/lib/form">
<l:ajax> <l:ajax>
<style> <style>
@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
--> -->

<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"> <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout">
<l:hasPermission permission="${app.READ}"> <l:hasPermission permission="${app.READ}">
<!-- content of the dialog will be populated when the dialog is opened --> <!-- content of the dialog will be populated when the dialog is opened -->
@@ -21,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
--> -->
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"> <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout">
<j:set var="_" value="${it.startRecording(request)}"/> <j:set var="_" value="${it.startRecording(request)}"/>
<l:yui module="cookie" suffix='-beta' /> <l:yui module="cookie" suffix='-beta' />
@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
--> -->

<?jelly escape-by-default='true'?>
<!-- <!--
Render the main portion of the dialog that shows English text and localized texts Render the main portion of the dialog that shows English text and localized texts
--> -->

0 comments on commit 89e80ec

Please sign in to comment.
You can’t perform that action at this time.