Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

File formatting improvements #74

Merged
merged 4 commits into from
Jul 5, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ target/
*.ipr
*.iws
.idea/
work/
work/
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
buildPlugin()
buildPlugin()
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -163,4 +163,4 @@ task createWrapperZip(type: Zip) {
}
}

processTestResources.dependsOn(createWrapperZip)
processTestResources.dependsOn(createWrapperZip)
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ rootProject.name = 'gradle-plugin'

if (!JavaVersion.current().java8) {
throw new GradleException("Build requires Java 8")
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
</j:forEach>
</ul>
</t:summary>
</j:jelly>
</j:jelly>
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@
<f:checkbox default="false"/>
</f:entry>
</f:advanced>
</j:jelly>
</j:jelly>
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div>
If your gradle build script is not named build.gradle, specify the gradle build name script.
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
Jenkins job parameters can be passed to Gradle either as Java system properties (<tt>-D</tt>), or as Gradle
properties (<tt>-P</tt>). Using properties has the advantage that job parameters are directly accessible in the
Gradle DSL, e.g. <tt>project.hasProperty(...)</tt>.
</p>
</p>
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
If your workspace has the top-level build.gradle in somewhere other than the module root directory, specify the path
(relative to the module root) here,
such as ${workspace}/parent/ instead of just ${workspace}. If left empty, defaults to build.gradle
</div>
</div>
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div>
Specify a list of Gradle switches to be invoked, or leave it empty.
</div>
</div>
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div>
Specify a list of Gradle tasks to be invoked.
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
Gradle will write to <tt>$HOME/.gradle</tt> by default for <tt>GRADLE_USER_HOME</tt>.
For a multi-executor slave in Jenkins, setting the environment variable localized files to the workspace avoid
collisions accessing gradle cache.
</p>
</p>
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
If your workspace has the wrapper somewhere else, specify the path
to the directory (relative to workspace) containing the wrapper executable here,
such as parent instead of just ${workspace}/parent.
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ THE SOFTWARE.
<f:entry title="GRADLE_HOME" field="home" help="/plugin/gradle/help-GradleInstallation-home.html">
<f:textbox />
</f:entry>
</j:jelly>
</j:jelly>
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ THE SOFTWARE.
</tr>
<tr>
<td id='gradle-console-outline-body'>
<ul></ul>
<ul></ul>
</td>
</tr>
</table>
</l:ajax>
</j:jelly>
</j:jelly>
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#gradle-console-outline-body ul {
padding-left:5%;
word-wrap:break-word;
padding-left:5%;
word-wrap:break-word;
}

#gradle-console-outline-body ul li a {
word-break:break-all;
word-break:break-all;
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
installer.displayName=Gradle
step.displayName=Invoke Gradle script
wrapper.displayName=Inspect build log for published Gradle build scans
wrapper.displayName=Inspect build log for published Gradle build scans
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
installer.displayName=Gradle
step.displayName=Gradle ausf�hren
wrapper.displayName=Durchsuche Build-Log nach ver�ffentlichten Gradle Build Scans
wrapper.displayName=Durchsuche Build-Log nach ver�ffentlichten Gradle Build Scans
10 changes: 5 additions & 5 deletions src/main/resources/index.jelly
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?jelly escape-by-default='true'?>
<div>
This plugin allows Jenkins to invoke <a href="http://www.gradle.org/">Gradle</a>
build scripts directly.
</div>
<?jelly escape-by-default='true'?>
<div>
This plugin allows Jenkins to invoke <a href="http://www.gradle.org/">Gradle</a>
build scripts directly.
</div>
2 changes: 1 addition & 1 deletion src/main/webapp/help-GradleInstallation-home.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
The plugin assumes that the gradle executable resides under the 'bin'
subdirectory of this gradle home.
</p>
</div>
</div>
2 changes: 1 addition & 1 deletion src/main/webapp/help-GradleInstallation-name.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
When you configure a job 'Build' section and select 'Invoke Gradle' as the method to
run gradle, this name will appear in the 'Gradle Version' list.
</p>
</div>
</div>
2 changes: 1 addition & 1 deletion src/main/webapp/help.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div>
For projects that use Gradle as the build system. This causes Jenkins to invoke Gradle with the given switches and
tasks. Any non-zero exit code causes Jenkins to mark the build as a failure.
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class PropertyPassingIntegrationTest extends AbstractIntegrationTest {
def p = j.createFreeStyleProject()
createBuildScript(p, """
task printParam {
doLast {
doLast {
${criticalProperties.collect { k, v ->
"println('${k}=' + ${k})"
}.join('\n')}
Expand All @@ -86,7 +86,7 @@ class PropertyPassingIntegrationTest extends AbstractIntegrationTest {
def p = j.createFreeStyleProject()
createBuildScript(p, """
task printParam {
doLast {
doLast {
${criticalProperties.collect { k, v ->
"println('${k}=' + System.getProperty('${k}'))"
}.join('\n')}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
<gradleHome></gradleHome>
</hudson.plugins.gradle.GradleInstallation>
</installations>
</hudson.plugins.gradle.Gradle_-DescriptorImpl>
</hudson.plugins.gradle.Gradle_-DescriptorImpl>
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@
<workspace>/var/jenkins_home/workspace/old</workspace>
<hudsonVersion>1.318-SNAPSHOT</hudsonVersion>
<culprits class="com.google.common.collect.EmptyImmutableSortedSet"/>
</build>
</build>
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@
</builders>
<publishers/>
<buildWrappers/>
</project>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
<gradleHome></gradleHome>
</hudson.plugins.gradle.GradleInstallation>
</installations>
</hudson.plugins.gradle.Gradle_-DescriptorImpl>
</hudson.plugins.gradle.Gradle_-DescriptorImpl>
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@
</builders>
<publishers/>
<buildWrappers/>
</project>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
<gradleHome></gradleHome>
</hudson.plugins.gradle.GradleInstallation>
</installations>
</hudson.plugins.gradle.Gradle_-DescriptorImpl>
</hudson.plugins.gradle.Gradle_-DescriptorImpl>
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@
</builders>
<publishers/>
<buildWrappers/>
</project>
</project>