Mercurial > hg > release > thermostat-0.6
changeset 722:9b0551909df0
Start commons-cli as bundle.
Similar thing as with earlier start-as-bundle patches. It's already a bundle,
so start it as such.
Reviewed-by: omajid
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2012-October/003848.html
| author | Severin Gehwolf <sgehwolf@redhat.com> |
|---|---|
| date | Tue, 23 Oct 2012 15:24:07 +0200 |
| parents | 193ca2485ba0 |
| children | 173ea1f57b27 |
| files | distribution/config/osgi-export.properties distribution/pom.xml main/src/main/resources/com/redhat/thermostat/main/impl/bootstrapbundles.properties |
| diffstat | 3 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/distribution/config/osgi-export.properties Tue Oct 23 11:23:58 2012 -0400 +++ b/distribution/config/osgi-export.properties Tue Oct 23 15:24:07 2012 +0200 @@ -33,7 +33,6 @@ # to do so, delete this exception statement from your version. # OSGi public API -org.apache.commons.cli=1.2.0 org.apache.commons.beanutils=1.8.3 org.jfree.chart org.jfree.chart.axis
--- a/distribution/pom.xml Tue Oct 23 11:23:58 2012 -0400 +++ b/distribution/pom.xml Tue Oct 23 15:24:07 2012 +0200 @@ -199,6 +199,8 @@ resource="${project.build.directory}/libs/jline-2.9.jar" /> <symlink link="${project.build.directory}/libs/mongo.jar" resource="${project.build.directory}/libs/mongo-java-driver-2.7.3.jar" /> + <symlink link="${project.build.directory}/libs/commons-cli.jar" + resource="${project.build.directory}/libs/commons-cli-1.2.jar" /> </target> </configuration> <goals>
--- a/main/src/main/resources/com/redhat/thermostat/main/impl/bootstrapbundles.properties Tue Oct 23 11:23:58 2012 -0400 +++ b/main/src/main/resources/com/redhat/thermostat/main/impl/bootstrapbundles.properties Tue Oct 23 15:24:07 2012 +0200 @@ -5,4 +5,5 @@ thermostat-launcher-${project.version}.jar, \ thermostat-main-${project.version}.jar, \ jline2.jar, \ + commons-cli.jar, \ mongo.jar