Menu
▾
▴
bigdata-commit
|
From: <ble...@us...> - 2010-09-12 19:58:03
|
Revision: 3533
http://bigdata.svn.sourceforge.net/bigdata/?rev=3533&view=rev
Author: blevine218
Date: 2010-09-12 19:57:56 +0000 (Sun, 12 Sep 2010)
Log Message:
-----------
removed duplicate dependency declaration on apache river tools
Modified Paths:
--------------
branches/maven_scaleout/bigdata-core/pom.xml
Modified: branches/maven_scaleout/bigdata-core/pom.xml
===================================================================
--- branches/maven_scaleout/bigdata-core/pom.xml 2010-09-11 22:53:40 UTC (rev 3532)
+++ branches/maven_scaleout/bigdata-core/pom.xml 2010-09-12 19:57:56 UTC (rev 3533)
@@ -281,11 +281,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-21 14:27:33
|
Revision: 3602
http://bigdata.svn.sourceforge.net/bigdata/?rev=3602&view=rev
Author: blevine218
Date: 2010-09-21 14:27:27 +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/bigdata-core/pom.xml
Modified: branches/maven_scaleout/bigdata-core/pom.xml
===================================================================
--- branches/maven_scaleout/bigdata-core/pom.xml 2010-09-20 23:46:12 UTC (rev 3601)
+++ branches/maven_scaleout/bigdata-core/pom.xml 2010-09-21 14:27:27 UTC (rev 3602)
@@ -1,5 +1,4 @@
-<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">
+<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>
<groupId>com.bigdata</groupId>
@@ -28,10 +27,8 @@
<configuration>
<compilerArguments>
<!--
- Apparently Javac may compile java source files inside jars put on the classpath. Weird.
- Zookeeper 3.2.1 jar contained classes and sources, and under some circumstances,
- the java files were getting recompiled and put into the bigdata jar. This setting
- forces javac to only look for source in the current maven source directory.
+ Apparently Javac may compile java source files inside jars put on the classpath. Weird. Zookeeper 3.2.1 jar contained classes and sources, and under some circumstances, the
+ java files were getting recompiled and put into the bigdata jar. This setting forces javac to only look for source in the current maven source directory.
-->
<sourcepath>${project.build.sourceDirectory}</sourcepath>
</compilerArguments>
@@ -89,12 +86,12 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <!-- TODO: BLECH! All the tests are excluded from the regular unit test phase.
- TODO: Need to split out the unit tests and the heavier integration tests, plus
- TODO: get all the unit tests passing so regressions can properly fail the build.
+ <!--
+ TODO: BLECH! All the tests are excluded from the regular unit test phase. TODO: Need to split out the unit tests and the heavier integration tests, plus TODO: get all the unit
+ tests passing so regressions can properly fail the build.
-->
<testFailureIgnore>true</testFailureIgnore>
- <includes/>
+ <includes />
<excludes>
<exclude>**/*</exclude>
</excludes>
@@ -102,8 +99,8 @@
</plugin>
<plugin>
- <!-- These are where the heavier tests can be run. Right now failsafe looks for tests starting or ending
- with IT, aka FooIT.java or ITFoo.java, which don't exist yet, so nothing runs.
+ <!--
+ These are where the heavier tests can be run. Right now failsafe looks for tests starting or ending with IT, aka FooIT.java or ITFoo.java, which don't exist yet, so nothing runs.
-->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
@@ -201,14 +198,14 @@
<dependencies>
-
+
<!-- ************************ 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>
@@ -230,7 +227,7 @@
<groupId>${thirdParty.groupId}</groupId> <!-- TODO: An older version (5.0.9) is available in central. -->
<artifactId>unimi-fastutil</artifactId>
<version>5.1.5</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>${thirdParty.groupId}</groupId>
<artifactId>lgpl-utils</artifactId>
@@ -246,22 +243,22 @@
<artifactId>dsi-utils</artifactId>
<version>1.0.6-020610</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>${thirdParty.groupId}</groupId>
<artifactId>high-scale-lib</artifactId>
<version>1.1.2</version>
</dependency>
<dependency>
- <groupId>${thirdParty.groupId}</groupId>
+ <groupId>${thirdParty.groupId}</groupId>
<artifactId>iris</artifactId>
<version>0.58</version>
</dependency>
<dependency>
- <groupId>${thirdParty.groupId}</groupId>
+ <groupId>${thirdParty.groupId}</groupId>
<artifactId>nxparser</artifactId>
<version>6-22-2010</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>zookeeper</artifactId>
@@ -312,7 +309,7 @@
<dependency>
<groupId>org.apache.river</groupId>
<artifactId>browser</artifactId>
- <version>2.1</version>
+ <version>2.1</version>
</dependency>
<!-- Note that these are dl jars, so they are provided and have a dl classifier. -->
@@ -397,10 +394,9 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.15</version>
- <!-- These exclusions are to address the fact that 1.2.15 added new features that depends on Sun specific
- jars, but these jars cannot be made available due to Sun's click-through requirement on them.
- We aren't using the new features anyway, so they are safe to exclude. log4j should have made these
- optional in their POM.
+ <!--
+ These exclusions are to address the fact that 1.2.15 added new features that depends on Sun specific jars, but these jars cannot be made available due to Sun's click-through
+ requirement on them. We aren't using the new features anyway, so they are safe to exclude. log4j should have made these optional in their POM.
-->
<exclusions>
<exclusion>
@@ -551,10 +547,37 @@
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.1</version>
- </dependency>
-
+ </dependency>
+
</dependencies>
+ <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>
+
<profiles>
<profile>
<id>bigdata-clover</id>
@@ -579,7 +602,7 @@
</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-10-02 16:10:14
|
Revision: 3719
http://bigdata.svn.sourceforge.net/bigdata/?rev=3719&view=rev
Author: blevine218
Date: 2010-10-02 16:10:07 +0000 (Sat, 02 Oct 2010)
Log Message:
-----------
part 1 of getting the unit tests to run in maven via the surefire plugin
- unit tests are run during the integration-test phase so that they can continue
to be based on resources included in the deployment tarball.
- surefire executes the top-level JUnit suite, com.bigdata.TestAll
- initial surefire infrastructure is in place, but unit test execution is disabled
by default pending additional testing of the tests.
- tests can be enabled by adding -DskipTests=false to the mvn command-line
- Execution of the unit tests via the tests.xml ANT script remains unchanged.
Modified Paths:
--------------
branches/maven_scaleout/bigdata-core/pom.xml
Modified: branches/maven_scaleout/bigdata-core/pom.xml
===================================================================
--- branches/maven_scaleout/bigdata-core/pom.xml 2010-10-02 01:00:49 UTC (rev 3718)
+++ branches/maven_scaleout/bigdata-core/pom.xml 2010-10-02 16:10:07 UTC (rev 3719)
@@ -15,21 +15,49 @@
<name>Bigdata Core</name>
<url>http://www.bigdata.com</url>
- <properties>
- <thirdParty.groupId>com.bigdata.thirdparty</thirdParty.groupId><!-- group ID for non-public bigdata dependencies. -->
+ <properties>
+ <!-- group ID for non-public bigdata dependencies. -->
+ <thirdParty.groupId>com.bigdata.thirdparty</thirdParty.groupId>
+
+ <!-- These properties are used to set system properties that are required by the unit
+ tests. See the surefire plugin configuration below. Any of these can be overridden on
+ the command-line by adding -D<property-name>=<propert-value>.
+ -->
+
+ <!-- Skip running unit tests by default until we get the kinks worked out. Can be overridden
+ by adding '-DskipTests=false' to the command-line -->
+ <skipTests>true</skipTests>
+
+ <!-- This directory is created when the deployment tarball is created
+ during the 'package' phase by the maven assembly plugin. If the naming
+ convention as defined in src/main/assembly/deploy.xml changes, this property
+ needs to change as well. -->
+ <deploy.root.dir>${project.build.directory}/${project.artifactId}-${project.version}-deploy</deploy.root.dir>
+
+ <deploy.dir>${deploy.root.dir}/${project.artifactId}-${project.version}</deploy.dir>
+ <app.home>${deploy.dir}</app.home>
+ <test.dir>${deploy.dir}/testing</test.dir>
+ <deploy.conf.dir>${test.dir}/conf</deploy.conf.dir>
+ <deploy.lib>${deploy.dir}/lib</deploy.lib>
+ <test.codebase.dir>${deploy.lib.dl}</test.codebase.dir>
+ <test.codebase.port>23333</test.codebase.port>
+ <java.security.policy>${deploy.conf.dir}/policy.all</java.security.policy>
+ <log4j.configuration>${deploy.dir}/var/config/logging/log4j.properties</log4j.configuration>
+ <java.net.preferIPv4Stack>true</java.net.preferIPv4Stack>
+ <default.nic>eth0</default.nic>
+
+ <!-- Set to empty string to indicate "unset." Application code will set a reasonable default -->
+ <federation.name></federation.name>
</properties>
-
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<compilerArguments>
- <!--
- Apparently Javac may compile java source files inside jars put on the classpath. Weird. Zookeeper 3.2.1 jar contained classes and sources, and under some circumstances, the
- java files were getting recompiled and put into the bigdata jar. This setting forces javac to only look for source in the current maven source directory.
- -->
+ <!-- Apparently Javac may compile java source files inside jars put on the classpath. Weird. Zookeeper 3.2.1 jar contained classes and sources, and under some circumstances, the
+ java files were getting recompiled and put into the bigdata jar. This setting forces javac to only look for source in the current maven source directory. -->
<sourcepath>${project.build.sourceDirectory}</sourcepath>
</compilerArguments>
</configuration>
@@ -82,48 +110,65 @@
</executions>
</plugin>
+ <!-- Configure the surefire plugin to run in the 'integration-test' phase rather than the 'test' phase.
+ This allows us to run the unit tests after packaging has been done, but before the build artifacts
+ are installed during the 'install' phase -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <!--
- TODO: BLECH! All the tests are excluded from the regular unit test phase. TODO: Need to split out the unit tests and the heavier integration tests, plus TODO: get all the unit
- tests passing so regressions can properly fail the build.
- -->
- <testFailureIgnore>true</testFailureIgnore>
- <includes />
- <excludes>
- <exclude>**/*</exclude>
- </excludes>
+ <skip>true</skip>
</configuration>
- </plugin>
-
- <plugin>
- <!--
- These are where the heavier tests can be run. Right now failsafe looks for tests starting or ending with IT, aka FooIT.java or ITFoo.java, which don't exist yet, so nothing runs.
- -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
<executions>
<execution>
- <id>integration-test</id>
+ <id>unit-tests</id>
+ <phase>integration-test</phase>
<goals>
- <goal>integration-test</goal>
+ <goal>test</goal>
</goals>
+ <configuration>
+ <skip>false</skip>
+ <!-- Run only the top-level suite which in turn runs the other suites and tests -->
+ <test>com.bigdata.TestAll</test>
+
+ <!-- These system properties are required by the unit tests. -->
+ <systemPropertyVariables>
+ <java.security.policy>${java.security.policy}</java.security.policy>
+ <java.net.preferIPv4Stack>{java.net.preferIPv4Stack}"</java.net.preferIPv4Stack>
+ <log4j.configuration>${log4j.configuration}</log4j.configuration>
+
+ <app.home>${app.home}</app.home> <!-- This is the deployment directory, easily accessed by the DataFinder class. -->
+ <log4j.path>${log4j.configuration}</log4j.path>
+ <default.nic>${default.nic}</default.nic>
+ <federation.name>${federation.name}</federation.name>
+
+ <classserver.jar>${deploy.lib}/classserver.jar</classserver.jar>
+ <colt.jar>${deploy.lib}/colt.jar</colt.jar>
+ <ctc_utils.jar>${deploy.lib}/ctc_utils.jar</ctc_utils.jar>
+ <cweb-commons.jar>${deploy.lib}/cweb-commons.jar</cweb-commons.jar>
+ <cweb-extser.jar>${deploy.lib}/cweb-extser.jar</cweb-extser.jar>
+ <highscalelib.jar>${deploy.lib}/highscalelib.jar</highscalelib.jar>
+ <dsiutils.jar>${deploy.lib}/dsiutils.jar</dsiutils.jar>
+ <lgplutils.jar>${deploy.lib}/lgplutils.jar</lgplutils.jar>
+ <fastutil.jar>${deploy.lib}/fastutil.jar</fastutil.jar>
+ <icu4j.jar>${deploy.lib}/icu4j.jar</icu4j.jar>
+ <jsk-lib.jar>${deploy.lib}/jsk-lib.jar</jsk-lib.jar>
+ <jsk-platform.jar>${deploy.lib}jsk-platform.jar</jsk-platform.jar>
+ <log4j.jar>${deploy.lib}/log4j.jar</log4j.jar>
+ <iris.jar>${deploy.lib}/iris.jar</iris.jar>
+ <jgrapht.jar>${deploy.lib}/jgrapht.jar</jgrapht.jar>
+ <openrdf-sesame.jar>${deploy.lib}/openrdf-sesame.jar</openrdf-sesame.jar>
+ <slf4j.jar>${deploy.lib}/slf4j.jar</slf4j.jar>
+ <nxparser.jar>${deploy.lib}/nxparser.jar</nxparser.jar>
+ <zookeeper.jar>${deploy.lib}/zookeeper.jar</zookeeper.jar>
+ </systemPropertyVariables>
+ </configuration>
</execution>
- <execution>
- <id>verify</id>
- <goals>
- <goal>verify</goal>
- </goals>
- </execution>
</executions>
</plugin>
<plugin>
- <!-- Workaround assembly issue for nicely organized libs in the deployment tarball. For more info
- see src/main/assemblies/deploy.xml
- -->
+ <!-- Workaround assembly issue for nicely organized libs in the deployment tarball. For more info see src/main/assemblies/deploy.xml -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
@@ -189,13 +234,9 @@
</execution>
</executions>
</plugin>
-
-
</plugins>
-
</build>
-
<dependencies>
@@ -204,7 +245,7 @@
<!-- ************************ 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. -->
+ <!-- TODO: look at maven-bundle-plugin from felix to provide osgi support. bndlib version 0.0.357 in central. -->
<dependency>
<groupId>${thirdParty.groupId}</groupId>
@@ -259,7 +300,7 @@
<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 -->
+ <!-- Apache River -->
<dependency>
<groupId>org.apache.river</groupId>
<artifactId>tools</artifactId>
@@ -388,10 +429,8 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.15</version>
- <!--
- These exclusions are to address the fact that 1.2.15 added new features that depends on Sun specific jars, but these jars cannot be made available due to Sun's click-through
- requirement on them. We aren't using the new features anyway, so they are safe to exclude. log4j should have made these optional in their POM.
- -->
+ <!-- These exclusions are to address the fact that 1.2.15 added new features that depends on Sun specific jars, but these jars cannot be made available due to Sun's click-through requirement
+ on them. We aren't using the new features anyway, so they are safe to exclude. log4j should have made these optional in their POM. -->
<exclusions>
<exclusion>
<groupId>javax.mail</groupId>
@@ -584,9 +623,7 @@
<groupId>com.atlassian.maven.plugins</groupId>
<artifactId>maven-clover2-plugin</artifactId>
<configuration>
- <!--
- Details on configuring clover are in the parent pom.
- -->
+ <!-- Details on configuring clover are in the parent pom. -->
<excludes><!-- These are stuffed into the lookup starter jar, which uses a stripped classpath without clover. -->
<exclude>**/LookupStarter*.java</exclude>
<exclude>**/LogUtil.java</exclude>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ble...@us...> - 2010-10-08 19:57:49
|
Revision: 3760
http://bigdata.svn.sourceforge.net/bigdata/?rev=3760&view=rev
Author: blevine218
Date: 2010-10-08 19:57:43 +0000 (Fri, 08 Oct 2010)
Log Message:
-----------
use <includes> instead of <test> to designate top-level suite to run. This allows the -Dtest=... override to work.
Modified Paths:
--------------
branches/maven_scaleout/bigdata-core/pom.xml
Modified: branches/maven_scaleout/bigdata-core/pom.xml
===================================================================
--- branches/maven_scaleout/bigdata-core/pom.xml 2010-10-08 17:23:07 UTC (rev 3759)
+++ branches/maven_scaleout/bigdata-core/pom.xml 2010-10-08 19:57:43 UTC (rev 3760)
@@ -132,7 +132,11 @@
<testFailureIgnore>true</testFailureIgnore>
<skip>false</skip>
<!-- Run only the top-level suite which in turn runs the other suites and tests -->
- <test>com.bigdata.TestAll</test>
+ <includes>
+ <include>com/bigdata/TestAll.java</include>
+ </includes>
+
+ <forkMode>pertest</forkMode>
<!-- These system properties are required by the unit tests. -->
<systemPropertyVariables>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ble...@us...> - 2010-10-09 01:36:38
|
Revision: 3762
http://bigdata.svn.sourceforge.net/bigdata/?rev=3762&view=rev
Author: blevine218
Date: 2010-10-09 01:36:31 +0000 (Sat, 09 Oct 2010)
Log Message:
-----------
fixed typo in setting java.net.preferIPv4Stack system property for unit tests
Modified Paths:
--------------
branches/maven_scaleout/bigdata-core/pom.xml
Modified: branches/maven_scaleout/bigdata-core/pom.xml
===================================================================
--- branches/maven_scaleout/bigdata-core/pom.xml 2010-10-08 22:21:56 UTC (rev 3761)
+++ branches/maven_scaleout/bigdata-core/pom.xml 2010-10-09 01:36:31 UTC (rev 3762)
@@ -143,7 +143,7 @@
<!-- These system properties are required by the unit tests. -->
<systemPropertyVariables>
<java.security.policy>${java.security.policy}</java.security.policy>
- <java.net.preferIPv4Stack>{java.net.preferIPv4Stack}</java.net.preferIPv4Stack>
+ <java.net.preferIPv4Stack>${java.net.preferIPv4Stack}</java.net.preferIPv4Stack>
<log4j.configuration>${log4j.configuration}</log4j.configuration>
<app.home>${app.home}</app.home> <!-- This is the deployment directory, easily accessed by the DataFinder class. -->
@@ -170,13 +170,9 @@
<slf4j.jar>${deploy.lib}/slf4j.jar</slf4j.jar>
<nxparser.jar>${deploy.lib}/nxparser.jar</nxparser.jar>
<zookeeper.jar>${deploy.lib}/zookeeper.jar</zookeeper.jar>
-
-
-
- <basedir>${deploy.dir}/testing</basedir>
-
-
-
+
+ <basedir>${deploy.dir}/testing</basedir>
+
</systemPropertyVariables>
</configuration>
</execution>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fko...@us...> - 2010-10-10 21:37:30
|
Revision: 3764
http://bigdata.svn.sourceforge.net/bigdata/?rev=3764&view=rev
Author: fkoliver
Date: 2010-10-10 21:37:24 +0000 (Sun, 10 Oct 2010)
Log Message:
-----------
Remove unintended change in pom (experiment which had no affect).
Modified Paths:
--------------
branches/maven_scaleout/bigdata-core/pom.xml
Modified: branches/maven_scaleout/bigdata-core/pom.xml
===================================================================
--- branches/maven_scaleout/bigdata-core/pom.xml 2010-10-09 09:11:41 UTC (rev 3763)
+++ branches/maven_scaleout/bigdata-core/pom.xml 2010-10-10 21:37:24 UTC (rev 3764)
@@ -170,9 +170,6 @@
<slf4j.jar>${deploy.lib}/slf4j.jar</slf4j.jar>
<nxparser.jar>${deploy.lib}/nxparser.jar</nxparser.jar>
<zookeeper.jar>${deploy.lib}/zookeeper.jar</zookeeper.jar>
-
- <basedir>${deploy.dir}/testing</basedir>
-
</systemPropertyVariables>
</configuration>
</execution>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X