Revert "Fix: Copy the API Viewer resources into the built plugin"

This reverts commit 6b3e9f1.
ymilki · Oct 27, 2021 · 285cbf6 · 285cbf6
1 parent a5d78b1
commit 285cbf6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -31,6 +31,3 @@ generated
 .bundle
 
 node_modules
-
-!job-dsl-plugin/src/main/webapp/api-viewer/config.json
-job-dsl-plugin/src/main/webapp/api-viewer
diff --git a/job-dsl-plugin/build.gradle b/job-dsl-plugin/build.gradle
@@ -12,6 +12,7 @@ buildscript {
 
 plugins {
     id 'org.jenkins-ci.jpi' version '0.43.0'
+    id 'war'
 }
 
 java {
@@ -90,22 +91,16 @@ test {
     systemProperty 'jenkins.test.noSpaceInTmpDirs', 'true'
 }
 
-task copyApiViewer {
-    copy {
-        from(project(':job-dsl-api-viewer').projectDir)
-        include 'index.html'
-        into 'src/main/webapp/api-viewer'
-    }
-    copy {
-        from(project(':job-dsl-api-viewer').buildDir)
-        include 'dist/**'
-        into 'src/main/webapp/api-viewer/build'
+war {
+    into('api-viewer') {
+        from(project(':job-dsl-api-viewer').projectDir) {
+            include 'index.html'
+            include 'build/dist/**'
+        }
     }
+    dependsOn tasks.getByPath(':job-dsl-api-viewer:build')
 }
 
-copyApiViewer.dependsOn ':job-dsl-api-viewer:build'
-jpi.dependsOn 'copyApiViewer'
-
 dependencies {
     annotationProcessor 'net.java.sezpoz:sezpoz:1.13'
     annotationProcessor 'org.jenkins-ci:annotation-indexer:1.12'