Skip to content
Permalink
Browse files

Merge pull request #15 from jenkinsci/JENKINS-43397

Jenkins-43397
  • Loading branch information...
aquarellian committed Apr 24, 2017
2 parents 8955b27 + 6b2b1ae commit ec3fdb1d0675920c30196050a0652c6a0072d49e
@@ -10,7 +10,7 @@
</parent> </parent>


<artifactId>sonar-gerrit</artifactId> <artifactId>sonar-gerrit</artifactId>
<version>1.0.8-SNAPSHOT</version> <version>1.0.9-SNAPSHOT</version>
<packaging>hpi</packaging> <packaging>hpi</packaging>


<properties> <properties>
@@ -138,6 +138,11 @@
</build> </build>


<dependencies> <dependencies>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>structs</artifactId>
<version>1.2</version>
</dependency>
<dependency> <dependency>
<groupId>com.sonyericsson.hudson.plugins.gerrit</groupId> <groupId>com.sonyericsson.hudson.plugins.gerrit</groupId>
<artifactId>gerrit-trigger</artifactId> <artifactId>gerrit-trigger</artifactId>
@@ -156,7 +161,7 @@
<dependency> <dependency>
<groupId>com.urswolfer.gerrit.client.rest</groupId> <groupId>com.urswolfer.gerrit.client.rest</groupId>
<artifactId>gerrit-rest-java-client</artifactId> <artifactId>gerrit-rest-java-client</artifactId>
<version>0.8.5</version> <version>0.8.11</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>

Large diffs are not rendered by default.

@@ -14,6 +14,8 @@ jenkins.plugin.default.review.title.issues=<total_count> SonarQube violations ha
jenkins.plugin.error.gerrit.server.empty=Cannot obtain Gerrit server name. Please check your Gerrit Trigger settings jenkins.plugin.error.gerrit.server.empty=Cannot obtain Gerrit server name. Please check your Gerrit Trigger settings
jenkins.plugin.error.gerrit.config.empty=Cannot obtain Gerrit configuration. Please check your Gerrit Trigger settings jenkins.plugin.error.gerrit.config.empty=Cannot obtain Gerrit configuration. Please check your Gerrit Trigger settings
jenkins.plugin.error.gerrit.user.empty=Gerrit authentication is not configured. Please check Gerrit Trigger settings jenkins.plugin.error.gerrit.user.empty=Gerrit authentication is not configured. Please check Gerrit Trigger settings
jenkins.plugin.error.gerrit.change.number.empty=Gerrit change number is empty
jenkins.plugin.error.gerrit.patchset.number.empty=Gerrit patchset number is empty
jenkins.plugin.error.sonar.report.not.exists=SonarQube report '%s' does not exist. Please check plugin settings jenkins.plugin.error.sonar.report.not.exists=SonarQube report '%s' does not exist. Please check plugin settings
jenkins.plugin.validation.path.no.project.config.available=No SonarQube report available. Please check your Project Settings jenkins.plugin.validation.path.no.project.config.available=No SonarQube report available. Please check your Project Settings
jenkins.plugin.validation.path.no.project.config=At least one Project Settings configuration required jenkins.plugin.validation.path.no.project.config=At least one Project Settings configuration required
@@ -77,30 +77,48 @@
</f:section> </f:section>


<f:section title="${%jenkins.plugin.settings.section.gerrit.name}"> <f:section title="${%jenkins.plugin.settings.section.gerrit.name}">
<f:entry title="${%jenkins.plugin.settings.gerrit.post.score}" field="postScore" <f:entry title="${%jenkins.plugin.settings.gerrit.override.credentials}" field="overrideCredentials">
description="${%jenkins.plugin.settings.gerrit.post.score.description}"> <table width="100%">
<f:checkbox default="true"/> <f:optionalBlock title="" inline="true" checked="${it.overrideCredentials}">
</f:entry> <f:entry title="${%jenkins.plugin.settings.gerrit.http.credentials.username}"

field="httpUsername">
<!--<f:entry title="${%jenkins.plugin.settings.gerrit.post.score}" field="postScore" help="help-postScore">--> <f:textbox/>
<!--&lt;!&ndash;description="${%jenkins.plugin.settings.gerrit.post.score.description}">&ndash;&gt;--> </f:entry>
<!--&lt;!&ndash;<f:checkbox default="true"/>&ndash;&gt;--> <f:entry title="${%jenkins.plugin.settings.gerrit.http.credentials.password}"
<!--<table width="100%">--> field="httpPassword">
<f:password/>
</f:entry>


<!--<f:optionalBlock title="" name="postScore"--> <j:set var="servers" value="${descriptor.getGerritServerNames()}" />
<!--checked="${it.postScore}" default="true">--> <f:entry title="${%jenkins.plugin.settings.gerrit.http.credentials.gerritserver}" >
<f:entry title="${%jenkins.plugin.settings.gerrit.category}" field="category"> <select name="gerritServerName">
<f:textbox default="Code-Review"/> <j:forEach var="inst" items="${servers}">
</f:entry> <f:option>${inst}</f:option>
<f:entry title="${%jenkins.plugin.settings.gerrit.score.no.issues}" field="noIssuesScore"> </j:forEach>
<f:textbox default="+1"/> </select>
</f:entry>
<f:validateButton
title="${%Test Connection}" progress="${%Testing...}"
method="testConnection" with="httpUsername,httpPassword,gerritServerName"/>
</f:optionalBlock>
</table>
</f:entry> </f:entry>
<f:entry title="${%jenkins.plugin.settings.gerrit.score.issues}" field="issuesScore">
<f:textbox default="-1"/> <f:entry title="${%jenkins.plugin.settings.gerrit.post.score}" field="postScore" help="help-postScore">
<table width="100%">
<f:optionalBlock title="" inline="true" checked="${it.postScore}" default="true">
<f:entry title="${%jenkins.plugin.settings.gerrit.category}" field="category">
<f:textbox default="Code-Review"/>
</f:entry>
<f:entry title="${%jenkins.plugin.settings.gerrit.score.no.issues}" field="noIssuesScore">
<f:textbox default="+1"/>
</f:entry>
<f:entry title="${%jenkins.plugin.settings.gerrit.score.issues}" field="issuesScore">
<f:textbox default="-1"/>
</f:entry>
</f:optionalBlock>
</table>
</f:entry> </f:entry>
<!--</f:optionalBlock>-->
<!--</table>-->
<!--</f:entry>-->
</f:section> </f:section>


<f:section title="${%jenkins.plugin.settings.section.notification.settings.name}"> <f:section title="${%jenkins.plugin.settings.section.notification.settings.name}">
@@ -25,6 +25,13 @@ jenkins.plugin.default.review.title.no.issues=SonarQube violations have not been
jenkins.plugin.default.review.title.issues=<total_count> SonarQube violations have been found. jenkins.plugin.default.review.title.issues=<total_count> SonarQube violations have been found.


jenkins.plugin.settings.section.gerrit.name=Gerrit Settings jenkins.plugin.settings.section.gerrit.name=Gerrit Settings
jenkins.plugin.settings.gerrit.override.credentials=Override default HTTP credentials?
jenkins.plugin.settings.gerrit.http.credentials.username=HTTP Username
jenkins.plugin.settings.gerrit.http.credentials.password=HTTP Password
jenkins.plugin.settings.gerrit.http.credentials.gerritserver=Gerrit Server to check connection
jenkins.plugin.error.gerrit.restapi.off=RestAPI is turned off in the Gerrit server settings
jenkins.plugin.error.gerrit.config.empty=Unknown Gerrit server
jenkins.plugin.error.gerrit.server.null=Gerrit Trigger is not configured
jenkins.plugin.settings.gerrit.post.score=Post score? jenkins.plugin.settings.gerrit.post.score=Post score?
jenkins.plugin.settings.gerrit.post.score.description=This setting describes whether it is necessary to post score to Gerrit or not jenkins.plugin.settings.gerrit.post.score.description=This setting describes whether it is necessary to post score to Gerrit or not
jenkins.plugin.settings.gerrit.category=Category jenkins.plugin.settings.gerrit.category=Category
@@ -0,0 +1,4 @@
<div>
Select Gerrit server configuration to test overridden Gerrit credentials.
This field used for this purpose only.
</div>
@@ -0,0 +1,3 @@
<div>
This field will <b>override</b> the HTTP password from Gerrit Trigger settings and will be used for plugin purposes only.
</div>
@@ -0,0 +1,3 @@
<div>
This field will <b>override</b> the HTTP username from Gerrit Trigger settings and will be used for plugin purposes only.
</div>

0 comments on commit ec3fdb1

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