Menu
▾
▴
[Bigdata-commit] SF.net SVN: bigdata:[6402] branches/BIGDATA_RELEASE_1_2_0
|
From: <tho...@us...> - 2012-08-03 14:07:18
|
Revision: 6402
http://bigdata.svn.sourceforge.net/bigdata/?rev=6402&view=rev
Author: thompsonbry
Date: 2012-08-03 14:07:07 +0000 (Fri, 03 Aug 2012)
Log Message:
-----------
I have changed the log4j version from 1.2.15 to 1.2.17 to work around a dependency inclusion problem in the earlier version of log4j.
I have renamed the ICU dependencies to have version numbers that are consistent with the version numbers used in maven repositories for ICU (4_8 => 4.8).
I have added a pom for the embedded bigdata mode based on one contributed by Gerjon of the Open Sahara project - many thanks to Gerjon for his input on this effort.
The dependency version information is now maintained in build.properties (for ant), pom.xml (for maven), and .classpath (for Eclipse).
The maven pom should work at this point, but only for people who want to build their own version of bigdata since there are no published releases of bigdata yet in our maven repository. We will publish 1.2.2 in this fashion.
Note that I have not taken on some of the challenges of the "maven-branch". There are still plenty of cycles in the project packages.
@see https://sourceforge.net/apps/trac/bigdata/ticket/168 (Mavenization of bigdata)
Modified Paths:
--------------
branches/BIGDATA_RELEASE_1_2_0/.classpath
branches/BIGDATA_RELEASE_1_2_0/build.properties
Added Paths:
-----------
branches/BIGDATA_RELEASE_1_2_0/bigdata/lib/apache/log4j-1.2.17.jar
branches/BIGDATA_RELEASE_1_2_0/bigdata/lib/icu/icu4j-4.8.jar
branches/BIGDATA_RELEASE_1_2_0/bigdata/lib/icu/icu4j-charset-4.8.jar
branches/BIGDATA_RELEASE_1_2_0/bigdata/lib/icu/icu4j-localespi-4.8.jar
branches/BIGDATA_RELEASE_1_2_0/pom.xml
Removed Paths:
-------------
branches/BIGDATA_RELEASE_1_2_0/bigdata/lib/apache/log4j-1.2.15.jar
branches/BIGDATA_RELEASE_1_2_0/bigdata/lib/icu/icu4j-4_8.jar
branches/BIGDATA_RELEASE_1_2_0/bigdata/lib/icu/icu4j-charset-4_8.jar
branches/BIGDATA_RELEASE_1_2_0/bigdata/lib/icu/icu4j-localespi-4_8.jar
Modified: branches/BIGDATA_RELEASE_1_2_0/.classpath
===================================================================
--- branches/BIGDATA_RELEASE_1_2_0/.classpath 2012-08-02 18:32:11 UTC (rev 6401)
+++ branches/BIGDATA_RELEASE_1_2_0/.classpath 2012-08-03 14:07:07 UTC (rev 6402)
@@ -44,8 +44,9 @@
<classpathentry exported="true" kind="lib" path="bigdata/lib/jetty/jetty-webapp-7.2.2.v20101205.jar"/>
<classpathentry exported="true" kind="lib" path="bigdata/lib/jetty/jetty-xml-7.2.2.v20101205.jar"/>
<classpathentry exported="true" kind="lib" path="bigdata/lib/unimi/colt-1.2.0.jar"/>
+ <classpathentry kind="lib" path="bigdata/lib/icu/icu4j-4.8.jar"/>
+ <classpathentry kind="lib" path="bigdata/lib/icu/icu4j-charset-4.8.jar"/>
<classpathentry exported="true" kind="lib" path="bigdata/lib/junit-3.8.1.jar" sourcepath="/root/.m2/repository/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="bigdata/lib/apache/log4j-1.2.15.jar"/>
<classpathentry exported="true" kind="lib" path="bigdata-jini/lib/jini/lib/browser.jar"/>
<classpathentry exported="true" kind="lib" path="bigdata-jini/lib/jini/lib/classserver.jar"/>
<classpathentry exported="true" kind="lib" path="bigdata-jini/lib/jini/lib/fiddler.jar"/>
@@ -68,8 +69,6 @@
<classpathentry kind="lib" path="bigdata-rdf/lib/sesame-rio-testsuite-2.6.3.jar" sourcepath="/org.openrdf.sesame-2.6.3"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry exported="true" kind="lib" path="bigdata/lib/high-scale-lib-v1.1.2.jar"/>
- <classpathentry exported="true" kind="lib" path="bigdata/lib/icu/icu4j-4_8.jar"/>
- <classpathentry exported="true" kind="lib" path="bigdata/lib/icu/icu4j-charset-4_8.jar"/>
<classpathentry exported="true" kind="lib" path="bigdata/lib/junit-ext-1.1-b3-dev.jar"/>
<classpathentry exported="true" kind="lib" path="bigdata-rdf/lib/slf4j-api-1.6.1.jar"/>
<classpathentry exported="true" kind="lib" path="bigdata-rdf/lib/slf4j-log4j12-1.6.1.jar"/>
@@ -84,5 +83,6 @@
<classpathentry kind="lib" path="bigdata-sails/lib/httpcomponents/httpmime-4.1.3.jar"/>
<classpathentry kind="lib" path="bigdata-sails/lib/httpcomponents/commons-fileupload-1.2.2.jar"/>
<classpathentry kind="lib" path="bigdata-sails/lib/httpcomponents/commons-io-2.1.jar"/>
+ <classpathentry kind="lib" path="bigdata/lib/apache/log4j-1.2.17.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Deleted: branches/BIGDATA_RELEASE_1_2_0/bigdata/lib/apache/log4j-1.2.15.jar
===================================================================
(Binary files differ)
Added: branches/BIGDATA_RELEASE_1_2_0/bigdata/lib/apache/log4j-1.2.17.jar
===================================================================
(Binary files differ)
Property changes on: branches/BIGDATA_RELEASE_1_2_0/bigdata/lib/apache/log4j-1.2.17.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Copied: branches/BIGDATA_RELEASE_1_2_0/bigdata/lib/icu/icu4j-4.8.jar (from rev 6391, branches/BIGDATA_RELEASE_1_2_0/bigdata/lib/icu/icu4j-4_8.jar)
===================================================================
(Binary files differ)
Deleted: branches/BIGDATA_RELEASE_1_2_0/bigdata/lib/icu/icu4j-4_8.jar
===================================================================
(Binary files differ)
Copied: branches/BIGDATA_RELEASE_1_2_0/bigdata/lib/icu/icu4j-charset-4.8.jar (from rev 6391, branches/BIGDATA_RELEASE_1_2_0/bigdata/lib/icu/icu4j-charset-4_8.jar)
===================================================================
(Binary files differ)
Deleted: branches/BIGDATA_RELEASE_1_2_0/bigdata/lib/icu/icu4j-charset-4_8.jar
===================================================================
(Binary files differ)
Copied: branches/BIGDATA_RELEASE_1_2_0/bigdata/lib/icu/icu4j-localespi-4.8.jar (from rev 6391, branches/BIGDATA_RELEASE_1_2_0/bigdata/lib/icu/icu4j-localespi-4_8.jar)
===================================================================
(Binary files differ)
Deleted: branches/BIGDATA_RELEASE_1_2_0/bigdata/lib/icu/icu4j-localespi-4_8.jar
===================================================================
(Binary files differ)
Modified: branches/BIGDATA_RELEASE_1_2_0/build.properties
===================================================================
--- branches/BIGDATA_RELEASE_1_2_0/build.properties 2012-08-02 18:32:11 UTC (rev 6401)
+++ branches/BIGDATA_RELEASE_1_2_0/build.properties 2012-08-03 14:07:07 UTC (rev 6402)
@@ -31,8 +31,21 @@
# javacc is required to compile the SPARQL grammar.
javacc.home=/usr/java/javacc-5.0
+##
# Versions to use of various dependencies.
-icu.version=4_8
+#
+# Note: You must also update pom.xml when versions are changed.
+#
+# Note: The ICU version number for the downloaded jar is 4_8, which is
+# how it is published by that project. However, the version number for
+# the corresponding maven dependency is 4.8. I have renamed the jar to
+# have consistent version numbers for ant and maven.
+#
+# Note: There is also a naming inconsistency for highscalelib. That
+# project publishes "high-scale-lib-vXXXX.jar", but the maven dependency
+# is named "high-scale-lib-XXXX.jar".
+#
+icu.version=4.8
zookeeper.version=3.3.3
sesame.version=2.6.3
slf4j.version=1.6.1
@@ -47,6 +60,12 @@
apache.httpcore.version=4.1.4
apache.httpmime.version=4.1.3
nxparser.version=1.2.2
+colt.version=1.2.0
+highscalelib.version=1.1.2
+log4j.version=1.2.17
+fastutil.version=5.1.5
+dsiutils.version=1.0.6-020610
+lgplutils.version=1.0.6-020610
# Set to false to NOT start services (zookeeper, lookup server, class server, etc).
# When false, tests which depend on those services will not run. (This can also be
Added: branches/BIGDATA_RELEASE_1_2_0/pom.xml
===================================================================
--- branches/BIGDATA_RELEASE_1_2_0/pom.xml (rev 0)
+++ branches/BIGDATA_RELEASE_1_2_0/pom.xml 2012-08-03 14:07:07 UTC (rev 6402)
@@ -0,0 +1,383 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (C) SYSTAP, LLC 2006-2010. All rights reserved.
+
+Contact:
+ SYSTAP, LLC
+ 4501 Tower Road
+ Greensboro, NC 27410
+ lic...@bi...
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; version 2 of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands)
+--><!--
+This POM is intended to support the use of bigdata(R) as an embedded
+database as part of your own maven project. It declares the
+dependencies for the embedded database, but does not include the
+dependencies for the NanoSparqlServer or the clustered database - use
+the ant build.xml file to generate and deploy those artifacts.
+
+To install the dependencies into your local maven repository, do:
+
+ mvn clean install
+
+-->
+<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>com.bigdata</groupId>
+ <artifactId>bigdata</artifactId>
+ <version>1.2.1</version>
+ <packaging>pom</packaging>
+ <name>bigdata(R)</name>
+ <description>Bigdata(R) Maven Build</description>
+ <url>http://www.systap.com/bigdata.htm</url>
+ <organization>
+ <name>SYSTAP, LLC</name>
+ <url>http://www.systap.com/</url>
+ </organization>
+ <inceptionYear>2006</inceptionYear>
+ <licenses>
+ <license>
+ <name>GNU General Public License Version 2 (GPLv2)</name>
+ <url>http://www.gnu.org/licenses/gpl-2.0.html</url>
+ </license>
+ </licenses>
+ <properties>
+ <!-- -->
+ <!-- Note: Dependency versions are declared in build.properties -->
+ <!-- This is a copy of that information. However, there are a -->
+ <!-- few subtle differences. See build.properties for details. -->
+ <!-- -->
+ <icu.version>4.8</icu.version>
+ <zookeeper.version>3.3.3</zookeeper.version>
+ <sesame.version>2.6.3</sesame.version>
+ <slf4j.version>1.6.1</slf4j.version>
+ <jetty.version>7.2.2.v20101205</jetty.version>
+ <lucene.version>3.0.0</lucene.version>
+ <apache.commons_codec.version>1.4</apache.commons_codec.version>
+ <apache.commons_fileupload.version>1.2.2</apache.commons_fileupload.version>
+ <apache.commons_io.version>2.1</apache.commons_io.version>
+ <apache.commons_logging.version>1.1.1</apache.commons_logging.version>
+ <apache.httpclient.version>4.1.3</apache.httpclient.version>
+ <apache.httpclient_cache.version>4.1.3</apache.httpclient_cache.version>
+ <apache.httpcore.version>4.1.4</apache.httpcore.version>
+ <apache.httpmime.version>4.1.3</apache.httpmime.version>
+ <nxparser.version>1.2.2</nxparser.version>
+ <colt.version>1.2.0</colt.version>
+ <highscalelib.version>1.1.2</highscalelib.version>
+ <log4j.version>1.2.17</log4j.version>
+ <fastutil.version>5.1.5</fastutil.version>
+ <dsiutils.version>1.0.6-020610</dsiutils.version>
+ <lgplutils.version>1.0.6-020610</lgplutils.version>
+ <bigdata.ganglia.version>1.0.1</bigdata.ganglia.version>
+ </properties>
+ <!-- TODO Can we declare the versions of the dependencies here as
+ properties and have them be substituted in for us? Can we pick
+ up those dependency versions from a properties file so we can
+ share the version declarations in build.properties? If we do
+ that, will the version numbers be filled in when this POM is
+ deployed to the systap repository?
+
+ TODO Add ant target to deploy the dependencies that we use that
+ are not widely (publicly) available to the systap repository.
+ -->
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.6</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>process-resources</phase>
+ <configuration>
+ <target>
+ <property name="build.ver" value="${project.version}"/>
+ <property name="build.ver.osgi" value="${project.version}"/>
+ <property name="snapshot" value="false"/>
+ <ant antfile="build.xml" target="clean"/>
+ <ant antfile="build.xml" target="jar"/>
+ </target>
+ </configuration>
+ </execution>
+ <execution>
+ <id>attach-artifact</id>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <attachartifact file="ant-build/bigdata-${project.version}.jar" type="jar"/>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <extensions>
+ <!-- Enabling the use of SSH. -->
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh-external</artifactId>
+ <version>1.0-beta-6</version>
+ </extension>
+ </extensions>
+ </build>
+
+ <distributionManagement>
+ <repository>
+ <id>bigdata.releases</id>
+ <name>bigdata(R) releases</name>
+ <url>scpexe://shell.speakeasy.net/home/t/thompsonbry/systap.com/maven/releases</url>
+ </repository>
+ </distributionManagement>
+
+ <repositories>
+ <repository>
+ <id>bigdata.releases</id>
+ <url>http://www.systap.com/maven/releases/</url>
+ </repository>
+ <repository>
+ <id>nxparser-repo</id>
+ <url>http://nxparser.googlecode.com/svn/repository</url>
+ </repository>
+ <repository>
+ <id>nxparser-snapshots</id>
+ <url>http://nxparser.googlecode.com/svn/snapshots</url>
+ </repository>
+ <repository>
+ <id>aduna-opensource.releases</id>
+ <url>http://repo.aduna-software.org/maven2/releases/</url>
+ </repository>
+ <!--
+ <repository>
+ <id>jetty.releases</id>
+ <url>https://oss.sonatype.org/content/groups/jetty/</url>
+ </repository>
+ -->
+ </repositories>
+
+ <!-- This declares the basic dependencies that you need to use -->
+ <!-- bigdata as an embedded database. Use ant (build.xml) for -->
+ <!-- NanoSparqlServer or cluster builds and deployments. -->
+
+ <dependencies>
+ <!-- -->
+ <!-- artifacts already present in public repositories -->
+ <!-- -->
+ <dependency>
+ <groupId>com.github.stephenc.high-scale-lib</groupId>
+ <artifactId>high-scale-lib</artifactId>
+ <version>${highscalelib.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.semanticweb.yars</groupId>
+ <artifactId>nxparser</artifactId>
+ <version>${nxparser.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>colt</groupId>
+ <artifactId>colt</artifactId>
+ <version>${colt.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>${lucene.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers</artifactId>
+ <version>${lucene.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.ibm.icu</groupId>
+ <artifactId>icu4j</artifactId>
+ <version>${icu.version}</version>
+ </dependency>
+ <dependency>
+ <!-- log4j is the primary logger for bigdata. -->
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ <!-- There is a bug with log4j 1.2.15 where it has a lot -->
+ <!-- of dependencies that we do not need in its POM. The -->
+ <!-- exclusions are only necessary with that version. -->
+ <!--
+ <exclusions>
+ <exclusion>
+ <groupId>javax.jms</groupId>
+ <artifactId>jms</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jdmk</groupId>
+ <artifactId>jmxtools</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jmx</groupId>
+ <artifactId>jmxri</artifactId>
+ </exclusion>
+ </exclusions>
+ -->
+ </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.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${apache.httpclient.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-cache</artifactId>
+ <version>${apache.httpclient_cache.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>${apache.httpcore.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ <version>${apache.httpmime.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${apache.commons_codec.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>${apache.commons_fileupload.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${apache.commons_io.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${apache.commons_logging.version}</version>
+ </dependency>
+ <!-- -->
+ <!-- artifacts that we publish (because they are not readily -->
+ <!-- available) but we do not maintain. -->
+ <!-- -->
+ <dependency>
+ <!-- fastutil.fastutil & it.unimi.dsi.fastutil from central have different versions -->
+ <!-- fastutil 6.1.0+ is on maven central. -->
+ <!--
+mvn deploy:deploy-file \
+ -DgroupId=it.unimi \
+ -DartifactId=fastutil \
+ -Dversion=5.1.5 \
+ -Dpackaging=jar \
+ -DrepositoryId=bigdata.releases \
+ -Durl=scpexe://shell.speakeasy.net/home/t/thompsonbry/systap.com/maven/releases/ \
+ -Dfile=bigdata/lib/unimi/fastutil-5.1.5.jar
+ -->
+ <groupId>it.unimi</groupId>
+ <artifactId>fastutil</artifactId>
+ <version>${fastutil.version}</version>
+ </dependency>
+ <dependency>
+ <!-- This ICU dependency is not widely available. -->
+ <!--
+mvn deploy:deploy-file \
+ -DgroupId=com.ibm.icu \
+ -DartifactId=icu4j-charset \
+ -Dversion=4.8 \
+ -Dpackaging=jar \
+ -DrepositoryId=bigdata.releases \
+ -Durl=scpexe://shell.speakeasy.net/home/t/thompsonbry/systap.com/maven/releases/ \
+ -Dfile=bigdata/lib/icu/icu4j-charset-4.8.jar
+ -->
+ <groupId>com.ibm.icu</groupId>
+ <artifactId>icu4j-charset</artifactId>
+ <version>${icu.version}</version>
+ </dependency>
+ <dependency>
+ <!-- sesame-runtime will pull in the various openrdf compoents. -->
+ <groupId>org.openrdf.sesame</groupId>
+ <artifactId>sesame-runtime</artifactId>
+ <version>${sesame.version}</version>
+ </dependency>
+ <!-- -->
+ <!-- artifacts maintained and published by the bigdata project -->
+ <dependency>
+ <!--
+mvn deploy:deploy-file \
+ -DgroupId=com.bigdata \
+ -DartifactId=bigdata-ganglia \
+ -Dversion=1.0.1 \
+ -Dpackaging=jar \
+ -DrepositoryId=bigdata.releases \
+ -Durl=scpexe://shell.speakeasy.net/home/t/thompsonbry/systap.com/maven/releases/ \
+ -Dfile=bigdata/lib/bigdata-ganglia-1.0.1.jar
+ -->
+ <groupId>com.bigdata</groupId>
+ <artifactId>bigdata-ganglia</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <!--
+mvn deploy:deploy-file \
+ -DgroupId=com.bigdata \
+ -DartifactId=dsi-utils \
+ -Dversion=1.0.6-020610 \
+ -Dpackaging=jar \
+ -DrepositoryId=bigdata.releases \
+ -Durl=scpexe://shell.speakeasy.net/home/t/thompsonbry/systap.com/maven/releases/ \
+ -Dfile=bigdata/lib/dsi-utils-1.0.6-020610.jar
+ -->
+ <dependency>
+ <groupId>com.bigdata</groupId>
+ <artifactId>dsi-utils</artifactId>
+ <version>${dsiutils.version}</version>
+ </dependency>
+ <dependency>
+ <!--
+mvn deploy:deploy-file \
+ -DgroupId=com.bigdata \
+ -DartifactId=lgpl-utils \
+ -Dversion=1.0.6-020610 \
+ -Dpackaging=jar \
+ -DrepositoryId=bigdata.releases \
+ -Durl=scpexe://shell.speakeasy.net/home/t/thompsonbry/systap.com/maven/releases/ \
+ -Dfile=bigdata/lib/lgpl-utils-1.0.6-020610.jar
+ -->
+ <groupId>com.bigdata</groupId>
+ <artifactId>lgpl-utils</artifactId>
+ <version>${lgplutils.version}</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
