Mercurial > hg > release > thermostat-0.7
changeset 723:173ea1f57b27
Start commons-beanutils as bundle.
In order to make this work I needed a commons-logging bundle. The spring repo
has a bundle-ified version of commons-logging, so I've used that. Both,
commons-logging and commons-collections as dependencies of commons-beanutils
are started as bundles as well in order to get rid of bundle wiring errors.
Reviewed-by: omajid
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2012-October/003849.html
author | Severin Gehwolf <sgehwolf@redhat.com> |
---|---|
date | Tue, 23 Oct 2012 16:40:35 +0200 |
parents | 9b0551909df0 |
children | 743c15d87009 |
files | common/core/pom.xml distribution/config/osgi-export.properties distribution/pom.xml main/src/main/resources/com/redhat/thermostat/main/impl/bootstrapbundles.properties pom.xml |
diffstat | 5 files changed, 40 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/common/core/pom.xml Tue Oct 23 15:24:07 2012 +0200 +++ b/common/core/pom.xml Tue Oct 23 16:40:35 2012 +0200 @@ -141,6 +141,14 @@ <artifactId>commons-beanutils</artifactId> </dependency> <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>com.springsource.org.apache.commons.logging</artifactId> + </dependency> + <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> </dependency>
--- a/distribution/config/osgi-export.properties Tue Oct 23 15:24:07 2012 +0200 +++ b/distribution/config/osgi-export.properties Tue Oct 23 16:40:35 2012 +0200 @@ -33,7 +33,6 @@ # to do so, delete this exception statement from your version. # OSGi public API -org.apache.commons.beanutils=1.8.3 org.jfree.chart org.jfree.chart.axis org.jfree.chart.event
--- a/distribution/pom.xml Tue Oct 23 15:24:07 2012 +0200 +++ b/distribution/pom.xml Tue Oct 23 16:40:35 2012 +0200 @@ -201,6 +201,12 @@ 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" /> + <symlink link="${project.build.directory}/libs/commons-beanutils.jar" + resource="${project.build.directory}/libs/commons-beanutils-1.8.3.jar" /> + <symlink link="${project.build.directory}/libs/commons-collections.jar" + resource="${project.build.directory}/libs/commons-collections-3.2.1.jar" /> + <symlink link="${project.build.directory}/libs/commons-logging.jar" + resource="${project.build.directory}/libs/com.springsource.org.apache.commons.logging-1.1.1.jar" /> </target> </configuration> <goals>
--- a/main/src/main/resources/com/redhat/thermostat/main/impl/bootstrapbundles.properties Tue Oct 23 15:24:07 2012 +0200 +++ b/main/src/main/resources/com/redhat/thermostat/main/impl/bootstrapbundles.properties Tue Oct 23 16:40:35 2012 +0200 @@ -6,4 +6,7 @@ thermostat-main-${project.version}.jar, \ jline2.jar, \ commons-cli.jar, \ + commons-beanutils.jar, \ + commons-collections.jar, \ + commons-logging.jar, \ mongo.jar
--- a/pom.xml Tue Oct 23 15:24:07 2012 +0200 +++ b/pom.xml Tue Oct 23 16:40:35 2012 +0200 @@ -72,6 +72,8 @@ <mongo-driver.version>2.7.3</mongo-driver.version> <commons-beanutils.version>1.8.3</commons-beanutils.version> <commons-cli.version>1.2</commons-cli.version> + <commons-collections.version>3.2.1</commons-collections.version> + <commons-logging.version>1.1.1</commons-logging.version> <jline.version>2.9</jline.version> <lucene.version>3.6.0</lucene.version> <!-- @@ -94,6 +96,16 @@ <enabled>false</enabled> </snapshots> </repository> + <repository> + <id>com.springsource.repository.bundles.release</id> + <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name> + <url>http://repository.springsource.com/maven/bundles/release</url> + </repository> + <repository> + <id>com.springsource.repository.bundles.external</id> + <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name> + <url>http://repository.springsource.com/maven/bundles/external</url> + </repository> </repositories> <modules> @@ -281,6 +293,17 @@ <version>${commons-beanutils.version}</version> </dependency> <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>${commons-collections.version}</version> + </dependency> + <dependency> + <!-- comes from spring repo --> + <groupId>org.apache.commons</groupId> + <artifactId>com.springsource.org.apache.commons.logging</artifactId> + <version>${commons-logging.version}</version> + </dependency> + <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> <version>${commons-cli.version}</version>