Author: ivol37 at gmail.com
Date: Mon Jan 17 12:00:08 2011
New Revision: 663
Log:
[AMDATU-269] Replaced embedded libraries by proper maven dependencies from
Riptano site
Removed:
trunk/amdatu-buildsupport/src/main/resources/lib/apache-cassandra-0.7.0.jar
trunk/amdatu-buildsupport/src/main/resources/lib/libthrift-0.5.jar
trunk/amdatu-cassandra/cassandra-application/src/main/resources/cassandra/
trunk/amdatu-cassandra/cassandra-application/src/main/resources/lib/
Modified:
trunk/amdatu-buildsupport/pom.xml
trunk/amdatu-cassandra/cassandra-application/pom.xml
trunk/pom.xml
Modified: trunk/amdatu-buildsupport/pom.xml
==============================================================================
--- trunk/amdatu-buildsupport/pom.xml (original)
+++ trunk/amdatu-buildsupport/pom.xml Mon Jan 17 12:00:08 2011
@@ -76,34 +76,6 @@
<packaging>jar</packaging>
</configuration>
</execution>
- <execution>
- <id>install-apache-cassandra</id>
- <phase>initialize</phase>
- <goals>
- <goal>install-file</goal>
- </goals>
- <configuration>
- <file>src/main/resources/lib/apache-cassandra-0.7.0.jar</file>
- <groupId>org.apache.cassandra</groupId>
- <artifactId>cassandra</artifactId>
- <version>${cassandra.version}</version>
- <packaging>jar</packaging>
- </configuration>
- </execution>
- <execution>
- <id>install-libthrift</id>
- <phase>initialize</phase>
- <goals>
- <goal>install-file</goal>
- </goals>
- <configuration>
- <file>src/main/resources/lib/libthrift-0.5.jar</file>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- <version>0.5</version>
- <packaging>jar</packaging>
- </configuration>
- </execution>
</executions>
</plugin>
</plugins>
Modified: trunk/amdatu-cassandra/cassandra-application/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-application/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-application/pom.xml Mon Jan 17
12:00:08 2011
@@ -20,8 +20,15 @@
<dependencies>
<dependency>
<groupId>org.apache.cassandra</groupId>
- <artifactId>cassandra</artifactId>
+ <artifactId>apache-cassandra</artifactId>
<version>${cassandra.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>libthrift</groupId>
+ <artifactId>libthrift</artifactId>
+ <version>0.5</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -44,9 +51,16 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- <version>0.5</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.6</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>1.5.6</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.amdatu.core.config</groupId>
@@ -65,35 +79,8 @@
<instructions>
<Bundle-Activator>org.amdatu.cassandra.application.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.cassandra.application</Bundle-SymbolicName>
- <Include-Resource>
- {maven-resources},
- lib=src/main/resources/lib,
-
@src/main/resources/cassandra/apache-cassandra-${cassandra.version}.jar
- </Include-Resource>
- <Bundle-ClassPath>
- .,
- lib/antlr-3.1.3.jar,
- lib/avro-1.4.0-fixes.jar,
- lib/commons-cli-1.1.jar,
- lib/commons-codec-1.2.jar,
- lib/commons-collections-3.2.1.jar,
- lib/commons-lang-2.4.jar,
- lib/concurrentlinkedhashmap-lru-1.1.jar,
- lib/guava-r05.jar,
- lib/high-scale-lib.jar,
- lib/jackson-core-asl-1.4.0.jar,
- lib/jackson-mapper-asl-1.4.0.jar,
- lib/jetty-6.1.21.jar,
- lib/jetty-util-6.1.21.jar,
- lib/jline-0.9.94.jar,
- lib/json-simple-1.1.jar,
- lib/jug-2.0.0.jar,
- lib/libthrift-0.5.jar,
- lib/log4j-1.2.16.jar,
- lib/slf4j-api-1.6.1.jar,
- lib/slf4j-jdk14-1.6.1.jar,
- lib/snakeyaml-1.6.jar
- </Bundle-ClassPath>
+ <Embed-Dependency>*;scope=compile</Embed-Dependency>
+ <Embed-Transitive>true</Embed-Transitive>
<Import-Package>
!com.ibm.uvm.tools,
!com.sun.jdmk.comm,
@@ -106,12 +93,23 @@
!javax.swing.*,
!jline,
!joptsimple,
- !junit.*,
- !org.apache.hadoop.*,
!org.apache.tools.ant.*,
!org.apache.velocity.*,
!org.jboss.netty.*,
!org.joda.time,
+ !org.znerd.xmlenc,
+ !org.mortbay.*,
+ !org.apache.commons.cli,
+ !org.json.*,
+ !org.apache.commons.codec.*,
+ !org.kosmix.kosmosfs.access,
+ !org.apache.commons.httpclient.*,
+ !org.antlr.*,
+ !org.jets3t.*,
+ !org.apache.jasper.*,
+ !org.apache.commons.logging.*,
+ !org.apache.commons.net.ftp,
+ !javax.servlet.jsp,
*
</Import-Package>
<Export-Package>
Modified: trunk/pom.xml
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Mon Jan 17 12:00:08 2011
@@ -243,6 +243,11 @@
<repositories>
<repository>
+ <id>riptano</id>
+ <name>Riptano Repository</name>
+ <url>http://mvn.riptano.com/content/repositories/riptano</url>
+ </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>
@@ -287,7 +292,7 @@
<releases>
<enabled>true</enabled>
</releases>
- </repository>
+ </repository>
</repositories>
<!--
