Skip to content

Commit

Permalink
osgi + commons-pool 1.5.6
Browse files Browse the repository at this point in the history
  • Loading branch information
@e-mzungu
e-mzungu committed Apr 5, 2011
1 parent 7a1fb4e commit a78c74c
Showing 1 changed file with 53 additions and 52 deletions.
105 changes: 53 additions & 52 deletions pom.xml
View file
@@ -1,4 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">


<parent> <parent>
<groupId>org.sonatype.oss</groupId> <groupId>org.sonatype.oss</groupId>
Expand All @@ -10,7 +11,7 @@
<packaging>bundle</packaging> <packaging>bundle</packaging>
<groupId>org.idevlab</groupId> <groupId>org.idevlab</groupId>
<artifactId>rjc</artifactId> <artifactId>rjc</artifactId>
<version>0.6.4-SNAPSHOT</version> <version>0.6.4-SNAPSHOT</version>
<name>RJC</name> <name>RJC</name>
<description>Redis Java client</description> <description>Redis Java client</description>
<url>http://e-mzungu.github.com/rjc</url> <url>http://e-mzungu.github.com/rjc</url>
Expand Down Expand Up @@ -42,30 +43,30 @@


<properties> <properties>
<!--redis hosts for testing purpose--> <!--redis hosts for testing purpose-->
<redis-hosts>redishost:6379,redishost:6380</redis-hosts> <redis-hosts>redishost:6379,redishost:6380</redis-hosts>


<!-- Dependencies Versions --> <!-- Dependencies Versions -->
<commons-pool.version>1.5.5</commons-pool.version> <commons-pool.version>1.5.6</commons-pool.version>
<slf4j.version>1.6.1</slf4j.version> <slf4j.version>1.6.1</slf4j.version>

<!-- Maven Plugin Versions --> <!-- Maven Plugin Versions -->
<maven-bundle-plugin.version>2.1.0</maven-bundle-plugin.version> <maven-bundle-plugin.version>2.1.0</maven-bundle-plugin.version>
<maven-compiler-plugin.version>2.0.2</maven-compiler-plugin.version> <maven-compiler-plugin.version>2.0.2</maven-compiler-plugin.version>
<maven-resources-plugin.version>2.4.3</maven-resources-plugin.version> <maven-resources-plugin.version>2.4.3</maven-resources-plugin.version>
<maven-surefire-plugin.version>2.7.1</maven-surefire-plugin.version> <maven-surefire-plugin.version>2.7.1</maven-surefire-plugin.version>
<maven-failsafe-plugin.version>2.7.1</maven-failsafe-plugin.version> <maven-failsafe-plugin.version>2.7.1</maven-failsafe-plugin.version>

<!-- Bundle Properties --> <!-- Bundle Properties -->
<osgi.import> <osgi.import>
!org.idevlab.rjc*;version=${project.version}, !org.idevlab.rjc*;version=${project.version},
org.apache.commons.pool*="[1.4,1.5]", org.apache.commons.pool*;version="[1.4,1.5]",
org.slf4j*;version="[1.4,1.6]", org.slf4j*;version="[1.4,1.6]",
* *
</osgi.import> </osgi.import>
<osgi.dynamic.import>javax.*,org.w3c.*,org.xml.*</osgi.dynamic.import> <osgi.dynamic.import>javax.*,org.w3c.*,org.xml.*</osgi.dynamic.import>
<osgi.export> <osgi.export>
org.idevlab.rjc*;version=${project.version} org.idevlab.rjc*;version=${project.version}
</osgi.export> </osgi.export>
</properties> </properties>




Expand Down Expand Up @@ -143,38 +144,38 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<version>${maven-bundle-plugin.version}</version> <version>${maven-bundle-plugin.version}</version>
<extensions>true</extensions> <extensions>true</extensions>
<inherited>true</inherited> <inherited>true</inherited>
<configuration> <configuration>
<instructions> <instructions>
<Bundle-Name>${project.name}</Bundle-Name> <Bundle-Name>${project.name}</Bundle-Name>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>${osgi.export}</Export-Package> <Export-Package>${osgi.export}</Export-Package>
<Import-Package>${osgi.import}</Import-Package> <Import-Package>${osgi.import}</Import-Package>
<DynamicImport-Package>${osgi.dynamic.import}</DynamicImport-Package> <DynamicImport-Package>${osgi.dynamic.import}</DynamicImport-Package>
<Private-Package>${osgi.private}</Private-Package> <!--<Private-Package>${osgi.private}</Private-Package>-->
<Require-Bundle>${osgi.bundles}</Require-Bundle> <!--<Require-Bundle>${osgi.bundles}</Require-Bundle>-->
</instructions> </instructions>
<supportedProjectTypes> <supportedProjectTypes>
<supportedProjectType>jar</supportedProjectType> <supportedProjectType>jar</supportedProjectType>
<supportedProjectType>bundle</supportedProjectType> <supportedProjectType>bundle</supportedProjectType>
</supportedProjectTypes> </supportedProjectTypes>
<unpackBundle>true</unpackBundle> <unpackBundle>true</unpackBundle>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<id>bundle-manifest</id> <id>bundle-manifest</id>
<phase>process-classes</phase> <phase>process-classes</phase>
<goals> <goals>
<goal>manifest</goal> <goal>manifest</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

0 comments on commit a78c74c

Please sign in to comment.