Skip to content

Commit 47ed5a2

Browse files
committed
Merge pull request lightbody#92 from chetankothari/fix/logging_appVersion
fixed app version logging error
2 parents 1feef1a + 8dc343f commit 47ed5a2

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,15 @@
9999
</profiles>
100100

101101
<build>
102+
<resources>
103+
<resource>
104+
<directory>src/main/resources</directory>
105+
<filtering>true</filtering>
106+
<includes>
107+
<include>**/*.prop</include>
108+
</includes>
109+
</resource>
110+
</resources>
102111
<defaultGoal>install</defaultGoal>
103112
<plugins>
104113
<plugin>

src/main/java/net/lightbody/bmp/proxy/Main.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ public static void main(String[] args) throws Exception {
2727
configureLogging();
2828

2929
String version = "UNKNOWN/DEVELOPMENT";
30-
InputStream is = Main.class.getResourceAsStream("/META-INF/maven/net.lightbody.bmp/browsermob-proxy/pom.properties");
30+
InputStream is = Main.class.getResourceAsStream("/version.prop");
31+
3132
if (is != null) {
3233
Properties props = new Properties();
3334
props.load(is);
@@ -41,7 +42,7 @@ protected void configureSitebricks() {
4142
}
4243
});
4344

44-
LOG.info("Starting BrowserMob Proxy version %s", version);
45+
LOG.info("Starting BrowserMob Proxy version {}", version);
4546

4647
Server server = injector.getInstance(Server.class);
4748
GuiceServletContextListener gscl = new GuiceServletContextListener() {

src/main/resources/version.prop

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
version=${project.version}

0 commit comments

Comments
 (0)