Skip to content

Commit

Permalink
Merge pull request #462 from jenkinsci/jslibs-bom
Browse files Browse the repository at this point in the history
Fix dependencies for BOM upgrade of JS libs
  • Loading branch information
uhafner committed Dec 15, 2022
2 parents 73032c3 + 06e0882 commit d06bd11
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 88 deletions.
10 changes: 10 additions & 0 deletions .github/check-md-links.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"httpHeaders": [
{
"urls": ["https://github.com/", "https://guides.github.com/", "https://help.github.com/", "https://docs.github.com/"],
"headers": {
"Accept-Encoding": "zstd, br, gzip, deflate"
}
}
]
}
84 changes: 0 additions & 84 deletions .github/workflows/autograding.yml

This file was deleted.

1 change: 1 addition & 0 deletions .github/workflows/check-md-links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ jobs:
- uses: gaurav-nelson/github-action-markdown-link-check@v1
with:
check-modified-files-only: 'no'
config-file: '.github/check-md-links.md'
15 changes: 14 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
<eclipse-collections.version>9.2.0</eclipse-collections.version>
<testcontainers.version>1.17.6</testcontainers.version>

<plugin-util-api.version>2.20.0</plugin-util-api.version>
</properties>

<licenses>
Expand All @@ -44,18 +45,29 @@
</developer>
</developers>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>commons-text-api</artifactId>
<version>1.10.0-27.vb_fa_3896786a_7</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>

<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>plugin-util-api</artifactId>
<version>${plugin-util-api.version}</version>
</dependency>

<!-- Jenkins Plugin Dependencies -->
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>font-awesome-api</artifactId>
<version>6.2.0-3</version>
<version>6.2.1-1</version>
</dependency>
<dependency>
<groupId>io.jenkins.plugins</groupId>
Expand Down Expand Up @@ -99,6 +111,7 @@
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>plugin-util-api</artifactId>
<version>${plugin-util-api.version}</version>
<scope>test</scope>
<classifier>tests</classifier>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/forensics/scm.jelly
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Provides a text box to select the SCM.
</st:documentation>

<f:entry title="${%title.scm}" field="scm" description="${%description.scm}">
<f:entry title="${%title.scm}" field="scm" >
<f:textbox/>
</f:entry>

Expand Down
1 change: 0 additions & 1 deletion src/main/resources/forensics/scm.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
title.scm=SCM Key
description.scm=Specify the key of your repository (substring is sufficient) if you are using multiple SCMs in your job.
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class PluginArchitectureTest {
static final ArchRule NO_FORBIDDEN_CLASSES_CALLED = ArchitectureRules.NO_FORBIDDEN_CLASSES_CALLED;

@ArchTest
static final ArchRule NO_PUBLIC_ARCHITECTURE_TESTS = ArchitectureRules.NO_PUBLIC_ARCHITECTURE_TESTS;
static final ArchRule ONLY_PACKAGE_PRIVATE_ARCHITECTURE_TESTS = ArchitectureRules.ONLY_PACKAGE_PRIVATE_ARCHITECTURE_TESTS;

@ArchTest
static final ArchRule NO_JENKINS_INSTANCE_CALL = PluginArchitectureRules.NO_JENKINS_INSTANCE_CALL;
Expand Down

0 comments on commit d06bd11

Please sign in to comment.