Merge pull request #63 from jenkinsci/remove_token_macro

Removes unused token-macro dependency
jenkinsci · Nov 2, 2024 · bc6b8d0 · bc6b8d0
2 parents e8c6118 + e5909c1
commit bc6b8d0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -32,11 +32,6 @@
       <optional>true</optional>
     </dependency>
 
-    <dependency>
-      <groupId>org.jenkins-ci.plugins</groupId>
-      <artifactId>token-macro</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>promoted-builds</artifactId>

diff --git a/src/test/java/org/jenkinsci/plugins/pluginusage/PluginUsageIT.java b/src/test/java/org/jenkinsci/plugins/pluginusage/PluginUsageIT.java
@@ -40,7 +40,8 @@ public class PluginUsageIT {
     public Timeout timeout = Timeout.builder().withTimeout(5, TimeUnit.MINUTES).build();
 
     @Rule
-    public GenericContainer<?> jenkins = new GenericContainer(DockerImageName.parse(IMAGE))
+    public GenericContainer<?> jenkins = new GenericContainer<>(DockerImageName.parse(IMAGE))
+            .withLogConsumer(frame -> System.out.println(frame.getUtf8StringWithoutLineEnding()))
             .withExposedPorts(8080)
             .waitingFor(Wait.forHttp("/"))
             .withCopyFileToContainer(MountableFile.forClasspathResource("update-center.2.440.3.json"), "/tmp/update-center.json")
@@ -738,8 +739,6 @@ public void pipeline() {
                         new Plugin("workflow-scm-step", "2.13"), Lists.newArrayList()),
                 new PluginProjects(
                         new Plugin("pipeline-stage-step", "2.5"), Lists.newArrayList()),
-                new PluginProjects(
-                        new Plugin("token-macro", "293.v283932a_0a_b_49"), Lists.newArrayList()),
                 new PluginProjects(
                         new Plugin("pipeline-groovy-lib", "593.va_a_fc25d520e9"), Lists.newArrayList())
         ));
@@ -793,8 +792,6 @@ public void pipeline2() {
                         new Plugin("workflow-scm-step", "2.13"), Lists.newArrayList()),
                 new PluginProjects(
                         new Plugin("pipeline-stage-step", "2.5"), Lists.newArrayList()),
-                new PluginProjects(
-                        new Plugin("token-macro", "293.v283932a_0a_b_49"), Lists.newArrayList()),
                 new PluginProjects(
                         new Plugin("pipeline-groovy-lib", "593.va_a_fc25d520e9"), Lists.newArrayList()),
                 new PluginProjects(
@@ -861,8 +858,6 @@ public void scriptedPipeline() {
                         new Plugin("workflow-scm-step", "2.13"), Lists.newArrayList()),
                 new PluginProjects(
                         new Plugin("pipeline-stage-step", "2.5"), Lists.newArrayList(new Project("scripted-pipeline"))),
-                new PluginProjects(
-                        new Plugin("token-macro", "293.v283932a_0a_b_49"), Lists.newArrayList()),
                 new PluginProjects(
                         new Plugin("pipeline-groovy-lib", "593.va_a_fc25d520e9"), Lists.newArrayList()),
                 new PluginProjects(
@@ -957,8 +952,6 @@ public void computedFolder() {
                         new Plugin("workflow-scm-step", "2.13"), Lists.newArrayList()),
                 new PluginProjects(
                         new Plugin("pipeline-stage-step", "2.5"), Lists.newArrayList()),
-                new PluginProjects(
-                        new Plugin("token-macro", "293.v283932a_0a_b_49"), Lists.newArrayList()),
                 new PluginProjects(
                         new Plugin("pipeline-groovy-lib", "593.va_a_fc25d520e9"), Lists.newArrayList())
         ));