Skip to content

Commit 0a62c3b

Browse files
committed
OpenAPI: move Swagger-UI to package.json
1 parent c5e2f6d commit 0a62c3b

5 files changed

Lines changed: 37 additions & 19 deletions

File tree

modules/jooby-swagger-ui/build.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@
44
<target name="swagger-ui">
55
<property name="buildDir" value="${basedir}${file.separator}target${file.separator}classes" />
66
<property name="swaggerDir" value="${buildDir}${file.separator}swagger-ui" />
7-
<move file="${buildDir}${file.separator}META-INF${file.separator}resources${file.separator}webjars${file.separator}swagger-ui${file.separator}${swagger-ui.version}" tofile="${swaggerDir}"/>
7+
<move file="node_modules${file.separator}swagger-ui-dist" tofile="${swaggerDir}"/>
88
<replace file="${swaggerDir}/index.html" token="./" value="${swaggerPath}/" />
99
<replace file="${swaggerDir}/index.html" token="https://petstore.swagger.io/v2/swagger.json" value="${openAPIPath}" />
1010
<delete>
11+
<fileset dir="${swaggerDir}" includes="package.json"/>
12+
<fileset dir="${swaggerDir}" includes="absolute-path.js"/>
13+
<fileset dir="${swaggerDir}" includes="swagger-ui.js"/>
1114
<fileset dir="${swaggerDir}" includes="*.gz"/>
1215
<fileset dir="${swaggerDir}" includes="*.js.map"/>
1316
</delete>

modules/jooby-swagger-ui/package-lock.json

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"name": "jooby-swagger-ui",
3+
"version": "2.8.0",
4+
"private": true,
5+
"license": "ASF",
6+
"dependencies": {
7+
"swagger-ui-dist": "^3.25.2"
8+
}
9+
}

modules/jooby-swagger-ui/pom.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,25 +37,25 @@
3737
<build>
3838
<plugins>
3939
<plugin>
40-
<artifactId>maven-dependency-plugin</artifactId>
41-
<version>${maven-dependency-plugin.version}</version>
40+
<groupId>com.github.eirslett</groupId>
41+
<artifactId>frontend-maven-plugin</artifactId>
4242
<executions>
4343
<execution>
44+
<goals>
45+
<goal>install-node-and-npm</goal>
46+
</goals>
4447
<phase>generate-resources</phase>
48+
</execution>
49+
<execution>
50+
<id>npm install</id>
4551
<goals>
46-
<goal>unpack</goal>
52+
<goal>npm</goal>
4753
</goals>
54+
<phase>generate-resources</phase>
4855
</execution>
4956
</executions>
5057
<configuration>
51-
<artifactItems>
52-
<artifactItem>
53-
<groupId>org.webjars</groupId>
54-
<artifactId>swagger-ui</artifactId>
55-
<version>${swagger-ui.version}</version>
56-
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
57-
</artifactItem>
58-
</artifactItems>
58+
<nodeVersion>${node.version}</nodeVersion>
5959
</configuration>
6060
</plugin>
6161

pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@
7272
<!--OpenAPI-->
7373
<swagger.version>2.1.2</swagger.version>
7474
<swagger-parser.version>2.0.19</swagger-parser.version>
75-
<swagger-ui.version>3.25.0</swagger-ui.version>
7675
<redoc.version>2.0.0-rc.20</redoc.version>
7776

7877
<!-- javax -->
@@ -667,12 +666,6 @@
667666
<version>${swagger-parser.version}</version>
668667
</dependency>
669668

670-
<dependency>
671-
<groupId>org.webjars</groupId>
672-
<artifactId>swagger-ui</artifactId>
673-
<version>${swagger-ui.version}</version>
674-
</dependency>
675-
676669
<!-- https://mvnrepository.com/artifact/org.unbescape/unbescape -->
677670
<dependency>
678671
<groupId>org.unbescape</groupId>

0 commit comments

Comments
 (0)