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.

Sign up for GitHub

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

[JENKINS-68022] Fix icon usage #124

Closed
wants to merge 2 commits into from
Closed

[JENKINS-68022] Fix icon usage #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
312a1da
Update project configuration
alecharp May 17, 2022
bb122b6
[JENKINS-68022] Fix icon usage
alecharp May 17, 2022
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
6 changes: 5 additions & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
#!/usr/bin/env groovy

/* `buildPlugin` step provided by: https://github.com/jenkins-infra/pipeline-library */
buildPlugin()
buildPlugin(configurations: [
[ platform: 'linux', jdk: '11' ],
[ platform: 'windows', jdk: '11' ],
[ platform: 'linux', jdk: '17' ],
])
95 changes: 40 additions & 55 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>1.619</version>
<version>4.40</version>
<relativePath/>
</parent>
<artifactId>build-pipeline-plugin</artifactId>
<version>1.5.9-SNAPSHOT</version>
Expand All @@ -29,8 +30,9 @@
<pmd.config.file>pmd_rules.xml</pmd.config.file>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<groovy.version>1.8.6</groovy.version>
<selenium.version>2.48.0</selenium.version>
<selenium.version>4.1.4</selenium.version>
<exclude.tests>**/functionaltest/*.java</exclude.tests>
<jenkins.version>2.337</jenkins.version>
</properties>
<developers>
<developer>
Expand All @@ -45,17 +47,26 @@
<email>alvizu@gmail.com</email>
</developer>
</developers>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.332.x</artifactId>
<version>1370.vfa_e23fe119c3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.9</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.9.0</version>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -73,7 +84,6 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>${groovy.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -93,20 +103,17 @@
<!-- enables mocking of classes without default constructor (together with CGLIB) -->
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
<version>1.2</version>
<scope>test</scope>
</dependency>
<dependency>
<!-- only necessary if Hamcrest matchers are used -->
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>1.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>dashboard-view</artifactId>
<version>2.2</version>
<optional>true</optional>
</dependency>
<dependency>
Expand All @@ -125,13 +132,31 @@
<artifactId>commons-io</artifactId>
<groupId>commons-io</groupId>
</exclusion>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
<exclusion>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-chrome-driver</artifactId>
<version>${selenium.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
Expand All @@ -144,62 +169,29 @@
<artifactId>selenium-support</artifactId>
<version>${selenium.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.8.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>18.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci</groupId>
<artifactId>test-annotations</artifactId>
<version>1.1</version>
<scope>test</scope>
</dependency>
</dependencies>


<build>
<plugins>
<!-- work-around for INFRA-588 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.6</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http</artifactId>
<version>2.10</version>
<type>jar</type>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.4</version>
<!--$NO-MVN-MAN-VER$ -->
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.3</version>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
Expand Down Expand Up @@ -307,13 +299,6 @@
<releaseProfiles>web-tests</releaseProfiles>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.0</version>
<!--$NO-MVN-MAN-VER$ -->
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down
38 changes: 19 additions & 19 deletions ...n/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,51 +61,51 @@
<div class="icon-container">
<j:if test="${from.isProjectParameterized()}">
<span class="pointer" onclick="buildPipeline.fillDialog('${app.rootUrl}${from.gridBuilder.firstJobLink}/build?delay=0sec', 'Starts the pipeline with parameters')">
<img src="${rootURL}/images/24x24/clock.png" alt="Trigger a Pipeline" class="icon-with-caption"/>
<span>Run</span>
<l:icon src="icon-clock icon-md" alt="Trigger a Pipeline" />
<span>Run</span>
</span>
</j:if>
<j:if test="${!from.isProjectParameterized()}">
<a id="trigger-pipeline-button" href='#' onclick="$('triggerPipelineForm').submit()">
<img src="${rootURL}/images/24x24/clock.png" alt="Trigger a Pipeline" class="icon-with-caption"/>
<span>Run</span>
<l:icon src="icon-clock icon-md" alt="Trigger a Pipeline" />
<span>Run</span>
</a>
</j:if>
</div>
</j:if>

<div class="icon-container">
<a href="builds">
<img src="${rootURL}/images/24x24/notepad.png" alt="Pipeline History" />
<l:icon src="icon-notepad icon-md" alt="Pipeline History"/>
<span>History</span>
</a>
</div>
</a>
</div>

<j:if test="${from.hasConfigurePermission()}">
<div class="icon-container">
<a href="configure">
<img src="${rootURL}/images/24x24/setting.png" alt="Configure" />
<l:icon src="icon-setting icon-md" alt="Configure" />
<span>Configure</span>
</a>
</div>
</a>
</div>
<div class="icon-container">
<a href="newJob">
<img src="${rootURL}/images/24x24/new-package.png" alt="Add Step" />
<l:icon src="icon-new-package icon-md" alt="Add Step" />
<span>Add Step</span>
</a>
</div>
</a>
</div>
<div class="icon-container">
<a href="delete">
<img src="${rootURL}/images/24x24/edit-delete.png" />
<l:icon src="icon-edit-delete icon-md" />
<span>Delete</span>
</a>
</div>
</a>
</div>
<div class="icon-container">
<a href="${rootURL}/manage">
<img src="${rootURL}/images/24x24/setting.png" />
<l:icon src="icon-setting icon-md" />
<span>Manage</span>
</a>
</div>
</a>
</div>
</j:if>
</div>

Expand Down