From: <sgo...@us...> - 2010-08-26 23:18:01
|
Revision: 3464 http://bigdata.svn.sourceforge.net/bigdata/?rev=3464&view=rev Author: sgossard Date: 2010-08-26 23:17:55 +0000 (Thu, 26 Aug 2010) Log Message: ----------- [maven_scaleout] : Changing zookeeper dependency to reflect 3.3 incompatibility. Modified Paths: -------------- branches/maven_scaleout/pom.xml Modified: branches/maven_scaleout/pom.xml =================================================================== --- branches/maven_scaleout/pom.xml 2010-08-26 22:13:34 UTC (rev 3463) +++ branches/maven_scaleout/pom.xml 2010-08-26 23:17:55 UTC (rev 3464) @@ -285,10 +285,11 @@ <artifactId>${nxparser.artifactId}</artifactId> <version>${nxparser.version}</version> </dependency> + <dependency> - <groupId>org.apache.hadoop</groupId> <!-- TODO: This artifact is old, a newer (incompatable) version in central. --> + <groupId>org.apache.hadoop</groupId> <artifactId>zookeeper</artifactId> - <version>3.2.1</version> + <version>[3.2.1,3.3)</version> <!-- TODO: This artifact is older, but the new 3.3.1 artifact in central is incompatible --> </dependency> <!-- Apache River --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sgo...@us...> - 2010-08-31 21:03:36
|
Revision: 3475 http://bigdata.svn.sourceforge.net/bigdata/?rev=3475&view=rev Author: sgossard Date: 2010-08-31 21:03:30 +0000 (Tue, 31 Aug 2010) Log Message: ----------- [maven_scaleout] : Cleanup dependency version numbers that were overly restrictive to downstream projects. Modified Paths: -------------- branches/maven_scaleout/pom.xml Modified: branches/maven_scaleout/pom.xml =================================================================== --- branches/maven_scaleout/pom.xml 2010-08-31 20:15:29 UTC (rev 3474) +++ branches/maven_scaleout/pom.xml 2010-08-31 21:03:30 UTC (rev 3475) @@ -12,30 +12,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - - <test.codebase.port>23333</test.codebase.port> - - <!-- Non-public bigdata dependencies. Used for install and deploy phases. --> - <thirdParty.groupId>com.bigdata.thirdparty</thirdParty.groupId> - <!-- TODO: look at maven-bundle-plugin from felix to provide osgi support. bndlib version 0.0.357 in central. --> - <cweb-extser.artifactId>cweb-extser</cweb-extser.artifactId> - <cweb-extser.version>0.1.0-b2-dev</cweb-extser.version> - <unimi-fastutil.artifactId>unimi-fastutil</unimi-fastutil.artifactId> - <unimi-fastutil.version>5.1.5</unimi-fastutil.version> - <lgpl-utils.artifactId>lgpl-utils</lgpl-utils.artifactId> - <lgpl-utils.version>1.0.6</lgpl-utils.version> - <ctc-utils.artifactId>ctc-utils</ctc-utils.artifactId> - <ctc-utils.version>5-4-2005</ctc-utils.version> - <dsi-utils.artifactId>dsi-utils</dsi-utils.artifactId> - <dsi-utils.version>1.0.6-020610</dsi-utils.version> - <colt.artifactId>colt</colt.artifactId> - <colt.version>1.2.0</colt.version> - <high-scale.artifactId>high-scale-lib</high-scale.artifactId> - <high-scale.version>1.1.2</high-scale.version> - <iris.artifactId>iris</iris.artifactId> - <iris.version>0.58</iris.version> - <nxparser.artifactId>nxparser</nxparser.artifactId> - <nxparser.version>6-22-2010</nxparser.version> + <thirdParty.groupId>com.bigdata.thirdparty</thirdParty.groupId><!-- group ID for non-public bigdata dependencies. --> </properties> @@ -232,10 +209,13 @@ <!-- ************************ Start of non-public dependencies ************************ --> <!-- ************************ Start of non-public dependencies ************************ --> <!-- ************************ Start of non-public dependencies ************************ --> + + <!-- TODO: look at maven-bundle-plugin from felix to provide osgi support. bndlib version 0.0.357 in central. --> + <dependency> <groupId>${thirdParty.groupId}</groupId> - <artifactId>${cweb-extser.artifactId}</artifactId> - <version>[${cweb-extser.version}]</version> + <artifactId>cweb-extser</artifactId> + <version>0.1.0-b2-dev</version> </dependency> <dependency> <groupId>${thirdParty.groupId}</groupId> @@ -251,38 +231,38 @@ <dependency> <groupId>${thirdParty.groupId}</groupId> <!-- TODO: An older version (5.0.9) is available in central. --> - <artifactId>${unimi-fastutil.artifactId}</artifactId> - <version>[${unimi-fastutil.version}]</version> - </dependency> + <artifactId>unimi-fastutil</artifactId> + <version>5.1.5</version> + </dependency> <dependency> <groupId>${thirdParty.groupId}</groupId> - <artifactId>${lgpl-utils.artifactId}</artifactId> - <version>[${lgpl-utils.version}]</version> + <artifactId>lgpl-utils</artifactId> + <version>1.0.6</version> </dependency> <dependency> <groupId>${thirdParty.groupId}</groupId> - <artifactId>${ctc-utils.artifactId}</artifactId> - <version>[${ctc-utils.version}]</version> + <artifactId>ctc-utils</artifactId> + <version>5-4-2005</version> </dependency> <dependency> <groupId>${thirdParty.groupId}</groupId> - <artifactId>${dsi-utils.artifactId}</artifactId> - <version>[${dsi-utils.version}]</version> + <artifactId>dsi-utils</artifactId> + <version>1.0.6-020610</version> </dependency> - <dependency> + <dependency> <groupId>${thirdParty.groupId}</groupId> - <artifactId>${high-scale.artifactId}</artifactId> - <version>[${high-scale.version}]</version> + <artifactId>high-scale-lib</artifactId> + <version>1.1.2</version> </dependency> <dependency> - <groupId>${thirdParty.groupId}</groupId> - <artifactId>${iris.artifactId}</artifactId> - <version>[${iris.version}]</version> + <groupId>${thirdParty.groupId}</groupId> + <artifactId>iris</artifactId> + <version>0.58</version> </dependency> <dependency> - <groupId>${thirdParty.groupId}</groupId> - <artifactId>${nxparser.artifactId}</artifactId> - <version>${nxparser.version}</version> + <groupId>${thirdParty.groupId}</groupId> + <artifactId>nxparser</artifactId> + <version>6-22-2010</version> </dependency> <dependency> @@ -295,28 +275,28 @@ <dependency> <groupId>org.apache.river</groupId> <artifactId>tools</artifactId> - <version>[2.1]</version> + <version>2.1</version> </dependency> <dependency> <groupId>org.apache.river</groupId> <artifactId>start</artifactId> - <version>[2.1]</version> + <version>2.1</version> </dependency> <dependency> <groupId>org.apache.river</groupId> <artifactId>tools</artifactId> - <version>[2.1]</version> + <version>2.1</version> </dependency> <dependency> <groupId>org.apache.river</groupId> <artifactId>jsk-lib</artifactId> - <version>[2.1]</version> + <version>2.1</version> </dependency> <dependency> <groupId>org.apache.river</groupId> <artifactId>jsk-platform</artifactId> - <version>[2.1]</version> + <version>2.1</version> </dependency> <dependency> @@ -581,13 +561,7 @@ <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> <version>3.1</version> - </dependency> - - <!--<!– JMX –>--> <!--<dependency> <!– Pretty sure this isn't needed JDK1.5 + –>--> - <!--<groupId>com.sun.jmx</groupId>--> - <!--<artifactId>jmxri</artifactId>--> - <!--<version>1.2.1</version>--> - <!--</dependency>--> + </dependency> </dependencies> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ble...@us...> - 2010-09-02 20:20:40
|
Revision: 3497 http://bigdata.svn.sourceforge.net/bigdata/?rev=3497&view=rev Author: blevine218 Date: 2010-09-02 20:20:34 +0000 (Thu, 02 Sep 2010) Log Message: ----------- Removed duplicate dependency on org.apache.river:tools. This was causing the latest m2eclipse plugin in Eclipse (Helios) to error out Modified Paths: -------------- branches/maven_scaleout/pom.xml Modified: branches/maven_scaleout/pom.xml =================================================================== --- branches/maven_scaleout/pom.xml 2010-09-02 19:46:45 UTC (rev 3496) +++ branches/maven_scaleout/pom.xml 2010-09-02 20:20:34 UTC (rev 3497) @@ -284,11 +284,6 @@ </dependency> <dependency> <groupId>org.apache.river</groupId> - <artifactId>tools</artifactId> - <version>2.1</version> - </dependency> - <dependency> - <groupId>org.apache.river</groupId> <artifactId>jsk-lib</artifactId> <version>2.1</version> </dependency> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ble...@us...> - 2010-09-08 20:11:55
|
Revision: 3523 http://bigdata.svn.sourceforge.net/bigdata/?rev=3523&view=rev Author: blevine218 Date: 2010-09-08 20:11:49 +0000 (Wed, 08 Sep 2010) Log Message: ----------- Added dependency on distribution tarball Added support for starting/stopping services needed for integration tests Modified Paths: -------------- branches/maven_scaleout/pom.xml Modified: branches/maven_scaleout/pom.xml =================================================================== --- branches/maven_scaleout/pom.xml 2010-09-08 20:10:34 UTC (rev 3522) +++ branches/maven_scaleout/pom.xml 2010-09-08 20:11:49 UTC (rev 3523) @@ -1,5 +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/xsd/maven-4.0.0.xsd"> + 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> <groupId>com.bigdata</groupId> @@ -28,7 +28,11 @@ <plugin> <artifactId>maven-compiler-plugin</artifactId> - <configuration><!-- Use Java 1.5 keywords, target running on a 1.5 JVM --> + <configuration> + <!-- + Use Java 1.5 keywords, target running on a + 1.5 JVM + --> <source>1.5</source> <target>1.5</target> <encoding>${project.build.sourceEncoding}</encoding> @@ -64,6 +68,13 @@ <version>2.2-beta-5</version> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.4</version> + </plugin> + + </plugins> </pluginManagement> @@ -72,32 +83,32 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> - <!-- slf4j --> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.6.1</version> - </dependency> + <!-- slf4j --> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.6.1</version> + </dependency> </dependencies> </dependencyManagement> <reporting> <plugins> - + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-report-plugin</artifactId> <version>2.5</version> </plugin> - + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> @@ -118,24 +129,27 @@ <repositories> - <!-- TODO: There may not be enough sub-modules that use Sesame/Aduna to warrant putting this here. --> + <!-- + TODO: There may not be enough sub-modules that use + Sesame/Aduna to warrant putting this here. + --> <repository> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - <id>aduna-opensource.releases</id> - <name>Aduna Open Source - Maven releases</name> - <url>http://repo.aduna-software.org/maven2/releases</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + <id>aduna-opensource.releases</id> + <name>Aduna Open Source - Maven releases</name> + <url>http://repo.aduna-software.org/maven2/releases</url> </repository> </repositories> <profiles> - + <profile> <id>bigdata-clover</id> <activation> @@ -146,29 +160,25 @@ <plugin> <groupId>com.atlassian.maven.plugins</groupId> <artifactId>maven-clover2-plugin</artifactId> - <version>3.0.1</version> + <version>3.0.1</version> <configuration> <jdk>1.5</jdk> <!-- - To use clover with bigdata, you should add the following to your maven settings file, .m2/settings.xml - - <profile> - <id>bigdata-clover</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <properties> - <maven.clover.licenseLocation>/your/path/to/clover.license</maven.clover.licenseLocation> - </properties> - </profile> - - --> + To use clover with bigdata, you should + add the following to your maven settings + file, .m2/settings.xml <profile> + <id>bigdata-clover</id> <activation> + <activeByDefault>true</activeByDefault> + </activation> <properties> + <maven.clover.licenseLocation>/your/path/to/clover.license</maven.clover.licenseLocation> + </properties> </profile> + --> </configuration> </plugin> </plugins> - </build> + </build> </profile> - + </profiles> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ble...@us...> - 2010-09-21 14:28:08
|
Revision: 3603 http://bigdata.svn.sourceforge.net/bigdata/?rev=3603&view=rev Author: blevine218 Date: 2010-09-21 14:28:02 +0000 (Tue, 21 Sep 2010) Log Message: ----------- move checkstyle and findbugs out of parent POM and into bigdata-core POM so that bigdata-integ project does not inherit these configs. Modified Paths: -------------- branches/maven_scaleout/pom.xml Modified: branches/maven_scaleout/pom.xml =================================================================== --- branches/maven_scaleout/pom.xml 2010-09-21 14:27:27 UTC (rev 3602) +++ branches/maven_scaleout/pom.xml 2010-09-21 14:28:02 UTC (rev 3603) @@ -102,28 +102,11 @@ <reporting> <plugins> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-report-plugin</artifactId> <version>2.5</version> </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.5</version> - <configuration> - <configLocation>${basedir}/src/main/config/checkstyle.xml</configLocation> - </configuration> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>2.3</version> - </plugin> - </plugins> </reporting> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ble...@us...> - 2010-09-24 17:18:47
|
Revision: 3625 http://bigdata.svn.sourceforge.net/bigdata/?rev=3625&view=rev Author: blevine218 Date: 2010-09-24 17:18:40 +0000 (Fri, 24 Sep 2010) Log Message: ----------- add bigdata-integ module Modified Paths: -------------- branches/maven_scaleout/pom.xml Modified: branches/maven_scaleout/pom.xml =================================================================== --- branches/maven_scaleout/pom.xml 2010-09-24 16:49:51 UTC (rev 3624) +++ branches/maven_scaleout/pom.xml 2010-09-24 17:18:40 UTC (rev 3625) @@ -20,6 +20,7 @@ <modules> <module>bigdata-core</module> + <module>bigdata-integ</module> </modules> <build> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |