Skip to content
Browse files

tidy-up poms to something less of a mess

  • Loading branch information...
1 parent c21ef24 commit 29e88d0b988d9e5c8dc3b529414a270805ce0d7c @stephenc stephenc committed Jan 6, 2011
Showing with 151 additions and 226 deletions.
  1. +34 −124 core/pom.xml
  2. +70 −65 object-mapper/pom.xml
  3. +47 −37 pom.xml
View
158 core/pom.xml
@@ -1,21 +1,22 @@
<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">
<modelVersion>4.0.0</modelVersion>
- <groupId>me.prettyprint</groupId>
- <artifactId>hector-core</artifactId>
- <packaging>bundle</packaging>
- <version>0.7.0-23</version>
- <name>hector-core</name>
+
<parent>
<groupId>me.prettyprint</groupId>
<artifactId>hector</artifactId>
- <version>1.0</version>
+ <version>0.7.0-rc4-1-SNAPSHOT</version>
</parent>
+ <artifactId>hector-core</artifactId>
+ <packaging>bundle</packaging>
+ <name>hector-core</name>
+
<properties>
<!-- OSGi bundle properties -->
<bundle.symbolicName>me.prettyprint.hector</bundle.symbolicName>
<bundle.namespace>me.prettyprint</bundle.namespace>
</properties>
+
<build>
<plugins>
<!--
@@ -94,69 +95,47 @@
</build>
<dependencies>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.4</version>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>1.5.3</version>
</dependency>
<dependency>
- <groupId>libthrift</groupId>
- <artifactId>libthrift</artifactId>
- <version>0.5</version>
+ <groupId>org.apache.cassandra</groupId>
+ <artifactId>cassandra-all</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.cassandra</groupId>
- <artifactId>apache-cassandra</artifactId>
- <version>0.7.0-rc2</version>
+ <groupId>org.apache.cassandra.deps</groupId>
+ <artifactId>libthrift</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
+ <groupId>com.github.stephenc.high-scale-lib</groupId>
+ <artifactId>high-scale-lib</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
+ <groupId>org.apache.cassandra</groupId>
+ <artifactId>cassandra-javautils</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <scope>runtime</scope>
- <optional>true</optional>
+ <groupId>com.github.stephenc.eaio-uuid</groupId>
+ <artifactId>uuid</artifactId>
+ <version>3.2.0</version>
</dependency>
<dependency>
<groupId>org.perf4j</groupId>
<artifactId>perf4j</artifactId>
<version>0.9.12</version>
</dependency>
- <dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- </dependency>
- <dependency>
- <groupId>org.safehaus.jug</groupId>
- <artifactId>jug-asl</artifactId>
- <version>2.0.0</version>
- </dependency>
+
<!-- OSGi deps -->
<dependency>
<groupId>org.osgi</groupId>
@@ -173,57 +152,35 @@
<optional>true</optional>
</dependency>
- <!-- Testing Dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
+ <!-- test dependencies -->
+
<dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- <version>1.1</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.reardencommerce</groupId>
- <artifactId>clhm-production</artifactId>
- <version>1.0</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.cliffc.high_scale_lib</groupId>
- <artifactId>high-scale-lib</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.8.2</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>properties-maven-plugin</artifactId>
- <version>1.0-alpha-2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cassandra</groupId>
- <artifactId>cassandra-javautils</artifactId>
- <version>0.7.0</version>
- </dependency>
- <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>${org.springframework.version}</version>
- <scope>provided</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -238,57 +195,10 @@
</exclusions>
</dependency>
<dependency>
- <groupId>com.eaio.uuid</groupId>
- <artifactId>uuid</artifactId>
- <version>3.2</version>
- </dependency>
- <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${org.springframework.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>r06</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>avro</artifactId>
- <version>1.4.0-rc4</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>1.4.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- <version>1.4.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>6.1.21</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>6.1.21</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>snakeyaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>1.6</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
View
135 object-mapper/pom.xml
@@ -1,107 +1,112 @@
-<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">
<modelVersion>4.0.0</modelVersion>
- <groupId>me.prettyprint</groupId>
- <artifactId>hector-object-mapper</artifactId>
- <packaging>jar</packaging>
- <version>0.7.0-23</version>
- <name>hector-object-mapper</name>
+
<parent>
- <groupId>me.prettyprint</groupId>
- <artifactId>hector</artifactId>
- <version>1.0</version>
+ <groupId>me.prettyprint</groupId>
+ <artifactId>hector</artifactId>
+ <version>0.7.0-rc4-1-SNAPSHOT</version>
</parent>
+ <artifactId>hector-object-mapper</artifactId>
+ <name>hector-object-mapper</name>
<dependencies>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>me.prettyprint</groupId>
+ <artifactId>hector-core</artifactId>
+ <version>0.7.0-rc4-1-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>1.6.1</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.1</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.16</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.6.0</version>
- </dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.6.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>1.6.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>me.prettyprint</groupId>
- <artifactId>hector-core</artifactId>
- <version>0.7.0-22</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.cassandra</groupId>
- <artifactId>apache-cassandra</artifactId>
- </exclusion>
</exclusions>
</dependency>
+
<dependency>
<groupId>org.apache.cassandra</groupId>
- <artifactId>apache-cassandra</artifactId>
- <version>0.7.0-rc2</version>
- </dependency>
- <dependency>
+ <artifactId>cassandra-javautils</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
<version>1.0</version>
</dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>3.0.5.RELEASE</version>
- </dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-orm</artifactId>
- <version>3.0.5.RELEASE</version>
- </dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>3.0.5.RELEASE</version>
+ </dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <version>3.0.5.RELEASE</version>
- <scope>test</scope>
- </dependency>
-<!--
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-orm</artifactId>
+ <version>3.0.5.RELEASE</version>
+ </dependency>
<dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>apache-openjpa</artifactId>
- <version>2.0.1</version>
- <type>pom</type>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>3.0.5.RELEASE</version>
+ <scope>test</scope>
</dependency>
--->
+ <!--
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>apache-openjpa</artifactId>
+ <version>2.0.1</version>
+ <type>pom</type>
+ </dependency>
+ -->
</dependencies>
</project>
View
84 pom.xml
@@ -4,19 +4,15 @@
<groupId>me.prettyprint</groupId>
<artifactId>hector</artifactId>
<packaging>pom</packaging>
- <!-- this version number is not important. The version is at ${hector.version} -->
- <version>1.0</version>
+ <version>0.7.0-rc4-1-SNAPSHOT</version>
<name>hector</name>
<description>Cassandra Java Client Library</description>
<url>http://github.com/rantav/hector</url>
<properties>
- <!-- The version follows Cassandra's major version changes, e.g. 0.5.1 goes with the 0.5.1 cassandra release-->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<org.springframework.version>3.0.0.RELEASE</org.springframework.version>
<slf4j.version>1.5.11</slf4j.version>
- <hector.version>0.7.0-23</hector.version>
- <username>${env.USER}</username>
</properties>
<issueManagement>
<system>github</system>
@@ -61,11 +57,55 @@
<module>object-mapper</module>
</modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cassandra</groupId>
+ <artifactId>cassandra-all</artifactId>
+ <version>0.7.0-rc4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cassandra</groupId>
+ <artifactId>cassandra-javautils</artifactId>
+ <version>0.7.0-rc4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cassandra.deps</groupId>
+ <artifactId>libthrift</artifactId>
+ <version>0.5.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.github.stephenc.high-scale-lib</groupId>
+ <artifactId>high-scale-lib</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<build>
<plugins>
<!-- Setup the build for JAVA 1.6 -->
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.6</source>
@@ -78,7 +118,6 @@
<!-- Configure the JUnit Env -->
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemProperties>
@@ -100,7 +139,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
@@ -116,23 +154,19 @@
<reporting>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<links>
@@ -154,31 +188,7 @@
<format>xml</format>
</formats>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</reporting>
- <profiles>
- <profile>
- <id>riptano</id>
- <distributionManagement>
- <repository>
- <id>riptano</id>
- <name>riptano</name>
- <url>http://mvn.riptano.com/content/repositories/public/</url>
- </repository>
- </distributionManagement>
- </profile>
- </profiles>
- <repositories>
- <repository>
- <id>riptano</id>
- <name>riptano</name>
- <url>http://mvn.riptano.com/content/repositories/public/</url>
- </repository>
- <repository>
- <id>codehaus</id>
- <name>codehaus</name>
- <url>http://repository.codehaus.org/</url>
- </repository>
- </repositories>
</project>

0 comments on commit 29e88d0

Please sign in to comment.
Something went wrong with that request. Please try again.