Fixups to recent changes (#1873)

jenkinsci · Mar 20, 2023 · a70f0d4 · a70f0d4
1 parent aacf904
commit a70f0d4
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 21 deletions.
diff --git a/bom-2.375.x/pom.xml b/bom-2.375.x/pom.xml
@@ -81,16 +81,6 @@
                 <artifactId>jquery3-api</artifactId>
                 <version>3.6.1-2</version>
             </dependency>
-            <dependency>
-                <groupId>io.jenkins.plugins</groupId>
-                <artifactId>jquery3-api</artifactId>
-                <version>3.6.1-2</version>
-            </dependency>
-            <dependency>
-                <groupId>io.jenkins.plugins</groupId>
-                <artifactId>plugin-util-api</artifactId>
-                <version>${plugin-util-api.version}</version>
-            </dependency>
             <dependency>
                 <groupId>io.jenkins.plugins</groupId>
                 <artifactId>plugin-util-api</artifactId>

diff --git a/excludes.txt b/excludes.txt
@@ -12,6 +12,3 @@ org.jenkinsci.plugins.gitclient.FilePermissionsTest
 
 # TODO tends to run out of memory
 org.jenkinsci.plugins.pipeline.modeldefinition.TriggersTest
-
-# TODO remove when email-ext merges and releases https://github.com/jenkinsci/email-ext-plugin/pull/431
-hudson.plugins.emailext.ExtendedEmailPublisherDescriptorTest
diff --git a/sample-plugin/pom.xml b/sample-plugin/pom.xml
@@ -15,7 +15,6 @@
         <changelist>999999-SNAPSHOT</changelist>
         <bom>weekly</bom>
         <jenkins.version>2.395</jenkins.version>
-        <kotlin.version>1.8.10</kotlin.version>
     </properties>
     <dependencyManagement>
         <dependencies>
@@ -162,13 +161,6 @@
             <groupId>io.jenkins.plugins</groupId>
             <artifactId>okhttp-api</artifactId>
             <scope>test</scope>
-            <exclusions>
-                <!-- TODO conflict with configuration-as-code -->
-                <exclusion>
-                    <groupId>org.jetbrains</groupId>
-                    <artifactId>annotations</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.jenkins.plugins</groupId>