Permalink
Browse files

ISPN-1845: move all dependency information to parent pom to simplify

maintenance and productization
  • Loading branch information...
1 parent 8cb51c2 commit 481b72ddaeca17c528b1b1c1e9bdd5dd967321b4 @tristantarrant tristantarrant committed with maniksurtani Feb 7, 2012
View
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
~ JBoss, Home of Professional Open Source
- ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
+ ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
~ contributors as indicated by the @author tags. All rights reserved.
~ See the copyright.txt in the distribution for a full listing of
~ individual contributors.
@@ -40,7 +40,6 @@
<dependency>
<groupId>com.sleepycat</groupId>
<artifactId>je</artifactId>
- <version>${version.bdbje}</version>
</dependency>
</dependencies>
@@ -49,7 +48,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${version.maven.bundle}</version>
<configuration>
<instructions>
<Export-Package>
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
~ JBoss, Home of Professional Open Source
- ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
+ ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
~ contributors as indicated by the @author tags. All rights reserved.
~ See the copyright.txt in the distribution for a full listing of
~ individual contributors.
@@ -21,78 +21,71 @@
~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-cachestore-parent</artifactId>
- <version>5.2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>infinispan-cachestore-cassandra</artifactId>
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.infinispan</groupId>
+ <artifactId>infinispan-cachestore-parent</artifactId>
+ <version>5.2.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>infinispan-cachestore-cassandra</artifactId>
<packaging>bundle</packaging>
- <name>Infinispan CassandraCacheStore</name>
- <description>Infinispan CassandraCacheStore module</description>
+ <name>Infinispan CassandraCacheStore</name>
+ <description>Infinispan CassandraCacheStore module</description>
- <properties>
- <test.src.dir>src/test/java</test.src.dir>
- </properties>
+ <properties>
+ <test.src.dir>src/test/java</test.src.dir>
+ </properties>
- <dependencies>
- <dependency>
- <groupId>net.dataforte.cassandra</groupId>
- <artifactId>cassandra-connection-pool</artifactId>
- <version>${version.cassandra.pool}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cassandra</groupId>
- <artifactId>cassandra-thrift</artifactId>
- <version>${version.cassandra}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cassandra</groupId>
- <artifactId>cassandra-all</artifactId>
- <version>${version.cassandra}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${version.slf4j}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>net.dataforte.cassandra</groupId>
+ <artifactId>cassandra-connection-pool</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cassandra</groupId>
+ <artifactId>cassandra-thrift</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cassandra</groupId>
+ <artifactId>cassandra-all</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
- <build>
- <testSourceDirectory>${test.src.dir}</testSourceDirectory>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- <configuration>
- <forkMode>pertest</forkMode>
- <parallel>false</parallel>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>${version.maven.bundle}</version>
- <configuration>
- <instructions>
- <Export-Package>
- ${project.groupId}.loaders.cassandra.*;version=${project.version};-split-package:=error
- </Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <testSourceDirectory>${test.src.dir}</testSourceDirectory>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ <parallel>false</parallel>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+ ${project.groupId}.loaders.cassandra.*;version=${project.version};-split-package:=error
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
View
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
~ JBoss, Home of Professional Open Source
- ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
+ ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
~ contributors as indicated by the @author tags. All rights reserved.
~ See the copyright.txt in the distribution for a full listing of
~ individual contributors.
@@ -42,38 +42,29 @@
<dependencies>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jclouds</groupId>
<artifactId>jclouds-blobstore</artifactId>
- <version>${version.jclouds}</version>
</dependency>
<dependency>
<groupId>org.jclouds.driver</groupId>
<artifactId>jclouds-enterprise</artifactId>
- <version>${version.jclouds}</version>
</dependency>
<dependency>
<groupId>org.jclouds.driver</groupId>
<artifactId>jclouds-log4j</artifactId>
- <version>${version.jclouds}</version>
</dependency>
-
<!-- =========================================================== -->
<!-- optional cloud provider plug-ins. You'd need at least one! -->
<dependency>
<groupId>org.jclouds</groupId>
<artifactId>jclouds-allblobstore</artifactId>
- <version>${version.jclouds}</version>
<optional>true</optional>
</dependency>
-
<!-- =========================================================== -->
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- <version>${version.commons.compress}</version>
- </dependency>
-
</dependencies>
<build>
@@ -82,7 +73,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
<configuration>
<forkMode>once</forkMode>
<parallel>false</parallel>
@@ -105,7 +95,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${version.maven.bundle}</version>
<configuration>
<instructions>
<Export-Package>
View
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
~ JBoss, Home of Professional Open Source
- ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
+ ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
~ contributors as indicated by the @author tags. All rights reserved.
~ See the copyright.txt in the distribution for a full listing of
~ individual contributors.
@@ -41,22 +41,19 @@
<dependency>
<groupId>c3p0</groupId>
<artifactId>c3p0</artifactId>
- <version>${version.c3p0}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <version>${version.h2.driver}</version>
<scope>test</scope>
</dependency>
<!-- for testing against MySQL -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>${version.mysql.driver}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -66,7 +63,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${version.maven.bundle}</version>
<configuration>
<instructions>
<Export-Package>
View
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
~ JBoss, Home of Professional Open Source
- ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
+ ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
~ contributors as indicated by the @author tags. All rights reserved.
~ See the copyright.txt in the distribution for a full listing of
~ individual contributors.
@@ -43,7 +43,6 @@
<!-- Contains fixes not officially released by JDBM group -->
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-jdbm</artifactId>
- <version>${version.apacheds.jdbm}</version>
<exclusions>
<exclusion>
<groupId>org.apache.directory.shared</groupId>
@@ -62,7 +61,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${version.maven.bundle}</version>
<configuration>
<instructions>
<Export-Package>
View
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
~ JBoss, Home of Professional Open Source
- ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
+ ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
~ contributors as indicated by the @author tags. All rights reserved.
~ See the copyright.txt in the distribution for a full listing of
~ individual contributors.
@@ -39,13 +39,11 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>infinispan-core</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>infinispan-core</artifactId>
- <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
View
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
~ JBoss, Home of Professional Open Source
- ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
+ ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
~ contributors as indicated by the @author tags. All rights reserved.
~ See the copyright.txt in the distribution for a full listing of
~ individual contributors.
@@ -40,32 +40,27 @@
<dependencies>
<dependency>
- <groupId>org.infinispan</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>infinispan-client-hotrod</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.infinispan</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>infinispan-client-hotrod</artifactId>
- <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>infinispan-core</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>infinispan-server-hotrod</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>infinispan-server-hotrod</artifactId>
- <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -76,7 +71,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${version.maven.bundle}</version>
<configuration>
<instructions>
<Export-Package>
View
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ JBoss, Home of Professional Open Source
- ~ Copyright 2011 Red Hat Inc. and/or its affiliates and other
+ ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
~ contributors as indicated by the @author tags. All rights reserved.
~ See the copyright.txt in the distribution for a full listing of
~ individual contributors.
Oops, something went wrong.

0 comments on commit 481b72d

Please sign in to comment.