Skip to content

Commit 65a9c78

Browse files
committed
Merge pull request #1319 from cbornet/online_version
Add version to swagger.json from pom's version
2 parents 69911a1 + 25abc15 commit 65a9c78

File tree

3 files changed

+21
-1
lines changed

3 files changed

+21
-1
lines changed

modules/swagger-generator/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,13 @@
1515
<resources>
1616
<resource>
1717
<directory>src/main/resources</directory>
18+
<filtering>true</filtering>
1819
<excludes>
1920
<exclude>logback.xml</exclude>
2021
</excludes>
22+
<includes>
23+
<include>**/version.prop</include>
24+
</includes>
2125
</resource>
2226
</resources>
2327
<plugins>

modules/swagger-generator/src/main/java/io/swagger/generator/Bootstrap.java

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,16 @@
1616

1717
package io.swagger.generator;
1818

19+
import java.io.IOException;
20+
import java.io.InputStream;
21+
1922
import javax.servlet.ServletConfig;
2023
import javax.servlet.ServletContext;
2124
import javax.servlet.ServletException;
2225
import javax.servlet.http.HttpServlet;
2326

27+
import org.apache.commons.io.IOUtils;
28+
2429
public class Bootstrap extends HttpServlet {
2530
public void init(ServletConfig config) throws ServletException {
2631
ServletContext context = config.getServletContext();
@@ -33,7 +38,17 @@ public void init(ServletConfig config) throws ServletException {
3338
bc.setTermsOfServiceUrl("http://swagger.io/terms/");
3439
bc.setContact("[email protected]");
3540
bc.setLicense("Apache 2.0");
36-
bc.setVersion("1.0.0");
41+
InputStream stream = getClass().getResourceAsStream("/version.prop");
42+
if(stream == null) {
43+
bc.setVersion("0.0.0");
44+
} else {
45+
try {
46+
bc.setVersion(IOUtils.toString(stream, "UTF-8"));
47+
stream.close();
48+
} catch (IOException e) {
49+
bc.setVersion("0.0.0");
50+
}
51+
}
3752
bc.setHost("generator.swagger.io");
3853
bc.setLicenseUrl("http://www.apache.org/licenses/LICENSE-2.0.html");
3954
bc.setResourcePackage("io.swagger.generator.resource");
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
${project.version}

0 commit comments

Comments
 (0)