Browse files

Finish integration with Maven.

This closes #103.
  • Loading branch information...
1 parent 1e3b582 commit e65fc04db592b56519b772203d994421e4f7662a @tsuna tsuna committed Nov 19, 2012
View
24 Makefile.am
@@ -19,13 +19,14 @@ all-am: jar staticroot
package = net.opentsdb
spec_title = OpenTSDB
-spec_vendor = StumbleUpon, Inc.
+spec_vendor = The OpenTSDB Authors
jar := tsdb-$(PACKAGE_VERSION).jar
builddata_SRC := src/BuildData.java
BUILT_SOURCES = $(builddata_SRC)
nodist_bin_SCRIPTS = tsdb
dist_noinst_SCRIPTS = src/create_table.sh
dist_pkgdata_SCRIPTS = src/mygnuplot.sh
+dist_noinst_DATA = pom.xml.in
tsdb_SRC := \
src/core/Aggregator.java \
src/core/Aggregators.java \
@@ -92,13 +93,13 @@ tsdb_DEPS = \
pkgdata_DATA = $(tsdb_DEPS) $(jar)
test_SRC := \
- src/core/TestAggregators.java \
- src/core/TestCompactionQueue.java \
- src/core/TestTags.java \
- src/stats/TestHistogram.java \
- src/tsd/TestGraphHandler.java \
- src/uid/TestNoSuchUniqueId.java \
- src/uid/TestUniqueId.java
+ test/core/TestAggregators.java \
+ test/core/TestCompactionQueue.java \
+ test/core/TestTags.java \
+ test/stats/TestHistogram.java \
+ test/tsd/TestGraphHandler.java \
+ test/uid/TestNoSuchUniqueId.java \
+ test/uid/TestUniqueId.java
test_DEPS = \
$(tsdb_DEPS) \
@@ -132,7 +133,7 @@ GWTC_JVM_ARGS = # add jvmarg -Xss16M or similar if you see a StackOverflowError
GWTC_ARGS = -ea # Additional arguments like -style PRETTY or -logLevel DEBUG
package_dir := $(subst .,/,$(package))
-UNITTESTS := $(test_SRC:src/%.java=$(package_dir)/%.class)
+UNITTESTS := $(test_SRC:test/%.java=$(package_dir)/%.class)
AM_JAVACFLAGS = -Xlint -source 6
JVM_ARGS =
classes := $(tsdb_SRC:src/%.java=$(package_dir)/%.class) \
@@ -356,9 +357,12 @@ mostlyclean-local:
&& rmdir "$$dir"
clean-local:
- rm -f $(jar) tsdb
+ rm -f $(jar) tsdb $(srcdir)/pom.xml
rm -rf $(JAVADOC_DIR)
+distclean-local:
+ rm -rf $(srcdir)/target
+
pom.xml: pom.xml.in Makefile
{ \
echo '<!-- Generated by Makefile on '`date`' -->'; \
View
113 pom.xml.in
@@ -7,9 +7,16 @@
<artifactId>opentsdb</artifactId>
<version>@spec_version@</version>
<name>@spec_title@</name>
+ <organization>
+ <name>@spec_vendor@</name>
+ <url>http://opentsdb.net</url>
+ </organization>
<description>
OpenTSDB is a distributed, scalable Time Series Database (TSDB)
- written on top of HBase.
+ written on top of HBase. OpenTSDB was written to address a common need:
+ store, index and serve metrics collected from computer systems (network
+ gear, operating systems, applications) at a large scale, and make this
+ data easily accessible and graphable.
</description>
<url>http://opentsdb.net</url>
<licenses>
@@ -20,13 +27,44 @@
</license>
</licenses>
+ <scm>
+ <connection>scm:git:git@github.com:OpenTSDB/opentsdb.git</connection>
+ <url>https://github.com/OpenTSDB/opentsdb</url>
+ </scm>
+ <issueManagement>
+ <system>GitHub</system>
+ <url>https://github.com/OpenTSDB/opentsdb/issues</url>
+ </issueManagement>
+ <mailingLists>
+ <mailingList>
+ <name>User List</name>
+ <post>opentsdb@googlegroups.com</post>
+ <subscribe>opentsdb+subscribe@googlegroups.com</subscribe>
+ <unsubscribe>opentsdb+unsubscribe@googlegroups.com</unsubscribe>
+ <archive>https://groups.google.com/group/opentsdb</archive>
+ </mailingList>
+ </mailingLists>
+ <developers>
+ <developer>
+ <id>tsuna</id>
+ <name>Benoit "tsuna" Sigoure</name>
+ <email>tsunanet@gmail.com</email>
+ <roles>
+ <role>developer</role>
+ </roles>
+ <timezone>-8</timezone>
+ </developer>
+ </developers>
+ <inceptionYear>2010</inceptionYear>
+
<packaging>jar</packaging>
<build>
<sourceDirectory>src</sourceDirectory>
<testSourceDirectory>test</testSourceDirectory>
<plugins>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -44,6 +82,7 @@
</testIncludes>
</configuration>
</plugin>
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
@@ -66,6 +105,7 @@
</arguments>
</configuration>
</plugin>
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
@@ -85,6 +125,7 @@
</execution>
</executions>
</plugin>
+
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
@@ -108,6 +149,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.12.4</version>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
@@ -120,14 +162,16 @@
</excludes>
</configuration>
</plugin>
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>gwt-maven-plugin</artifactId>
<version>@GWT_VERSION@</version>
<executions>
<execution>
<configuration>
- <webappDirectory>${project.build.directory}/classes/</webappDirectory>
+ <enableAssertions>true</enableAssertions>
+ <module>tsd.QueryUi</module>
</configuration>
<phase>compile</phase>
<goals>
@@ -136,6 +180,61 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1.2</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8.1</version>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <quiet>true</quiet>
+ <validateLinks>true</validateLinks>
+ <bottom>
+ Copyright &#169; {inceptionYear}-{currentYear},
+ ${project.organization.name}
+ </bottom>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <keyname>tsunanet@gmail.com</keyname>
+ </configuration>
+ </plugin>
+
</plugins>
</build>
@@ -268,4 +367,14 @@
</dependencies>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <parent>
+ <groupId>org.sonatype.oss</groupId>
+ <artifactId>oss-parent</artifactId>
+ <version>7</version>
+ </parent>
+
</project>
View
0 src/core/TestAggregators.java → test/core/TestAggregators.java
File renamed without changes.
View
0 src/core/TestCompactionQueue.java → test/core/TestCompactionQueue.java
File renamed without changes.
View
0 src/core/TestTags.java → test/core/TestTags.java
File renamed without changes.
View
0 src/stats/TestHistogram.java → test/stats/TestHistogram.java
File renamed without changes.
View
0 src/tsd/TestGraphHandler.java → test/tsd/TestGraphHandler.java
File renamed without changes.
View
0 src/uid/TestNoSuchUniqueId.java → test/uid/TestNoSuchUniqueId.java
File renamed without changes.
View
0 src/uid/TestUniqueId.java → test/uid/TestUniqueId.java
File renamed without changes.

0 comments on commit e65fc04

Please sign in to comment.