back out deploy to HBO maven server back out deploy to HBO maven server
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/fabd682a Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fabd682a Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/fabd682a Branch: refs/heads/master Commit: fabd682a2880cc77ff025cb7c09ad19834d47539 Parents: d49d014 Author: Rick Kilgore <[email protected]> Authored: Wed Oct 1 14:16:26 2014 -0700 Committer: Rick Kilgore <[email protected]> Committed: Wed Oct 1 14:16:26 2014 -0700 ---------------------------------------------------------------------- README.markdown | 2 - examples/storm-starter/pom.xml | 6 +- external/storm-hdfs/pom.xml | 4 +- external/storm-kafka/pom.xml | 19 +- pom.xml | 23 +- .../maven-shade-clojure-transformer/pom.xml | 4 +- storm-core/dependency-reduced-pom.xml | 417 +++++++++++++++++++ storm-core/pom.xml | 6 +- storm-dist/binary/pom.xml | 6 +- storm-dist/source/pom.xml | 6 +- 10 files changed, 438 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/fabd682a/README.markdown ---------------------------------------------------------------------- diff --git a/README.markdown b/README.markdown index 8064862..e45f63a 100644 --- a/README.markdown +++ b/README.markdown @@ -1,5 +1,3 @@ -This is a forked version of incubator-storm maintained by [HBOCodeLabs](https://github.com/HBOCodeLabs). The main apache project is [here](https://github.com/apache/incubator-storm). In order to make changes take effect within HBO Hurley, you need to run "mvn deploy" in the root project folder from the branch that you want to be exported. - Storm is a distributed realtime computation system. Similar to how Hadoop provides a set of general primitives for doing batch processing, Storm provides a set of general primitives for doing realtime computation. Storm is simple, can be used with any programming language, [is used by many companies](http://storm-project.net/documentation/Powered-By.html), and is a lot of fun to use! The [Rationale page](http://storm-project.net/documentation/Rationale.html) explains what Storm is and why it was built. [This presentation](http://vimeo.com/40972420) is also a good introduction to the project. http://git-wip-us.apache.org/repos/asf/storm/blob/fabd682a/examples/storm-starter/pom.xml ---------------------------------------------------------------------- diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml index ccd2770..903c6e7 100644 --- a/examples/storm-starter/pom.xml +++ b/examples/storm-starter/pom.xml @@ -19,12 +19,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <artifactId>storm</artifactId> - <groupId>com.hbo.hurley</groupId> + <groupId>org.apache.storm</groupId> <version>0.9.3-incubating-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <groupId>com.hbo.hurley</groupId> + <groupId>org.apache.storm</groupId> <artifactId>storm-starter</artifactId> <packaging>jar</packaging> @@ -66,7 +66,7 @@ <version>3.0.3</version> </dependency> <dependency> - <groupId>com.hbo.hurley</groupId> + <groupId>org.apache.storm</groupId> <artifactId>storm-core</artifactId> <version>${project.version}</version> <!-- keep storm out of the jar-with-dependencies --> http://git-wip-us.apache.org/repos/asf/storm/blob/fabd682a/external/storm-hdfs/pom.xml ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/pom.xml b/external/storm-hdfs/pom.xml index 2fc6f54..0d08cae 100644 --- a/external/storm-hdfs/pom.xml +++ b/external/storm-hdfs/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>storm</artifactId> - <groupId>com.hbo.hurley</groupId> + <groupId>org.apache.storm</groupId> <version>0.9.3-incubating-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -37,7 +37,7 @@ <dependencies> <dependency> - <groupId>com.hbo.hurley</groupId> + <groupId>org.apache.storm</groupId> <artifactId>storm-core</artifactId> <version>${project.version}</version> <scope>provided</scope> http://git-wip-us.apache.org/repos/asf/storm/blob/fabd682a/external/storm-kafka/pom.xml ---------------------------------------------------------------------- diff --git a/external/storm-kafka/pom.xml b/external/storm-kafka/pom.xml index 21a79f1..e94ea12 100644 --- a/external/storm-kafka/pom.xml +++ b/external/storm-kafka/pom.xml @@ -20,14 +20,14 @@ <parent> <artifactId>storm</artifactId> - <groupId>com.hbo.hurley</groupId> + <groupId>org.apache.storm</groupId> <version>0.9.3-incubating-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <packaging>jar</packaging> <artifactId>storm-kafka</artifactId> - <name>storm-kafka-hurley</name> + <name>storm-kafka</name> <description>Storm Spouts for Apache Kafka</description> <build> <plugins> @@ -35,19 +35,6 @@ <sourceDirectory>src/jvm</sourceDirectory> <testSourceDirectory>src/test</testSourceDirectory> </build> - - <distributionManagement> - <repository> - <id>archiva.internal</id> - <name>Hurley Maven Repository</name> - <url>http://maven.hurley.hbo.com:8000/repository/internal/</url> - </repository> - <snapshotRepository> - <id>archiva.snapshots</id> - <name>Hurley Maven Snapshot Repository</name> - <url>http://maven.hurley.hbo.com:8000/repository/snapshots/</url> - </snapshotRepository> - </distributionManagement> <dependencies> <dependency> <groupId>org.mockito</groupId> @@ -122,7 +109,7 @@ </exclusions> </dependency> <dependency> - <groupId>com.hbo.hurley</groupId> + <groupId>org.apache.storm</groupId> <artifactId>storm-core</artifactId> <version>${project.version}</version> <scope>provided</scope> http://git-wip-us.apache.org/repos/asf/storm/blob/fabd682a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 9b54055..111672c 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ </parent> - <groupId>com.hbo.hurley</groupId> + <groupId>org.apache.storm</groupId> <artifactId>storm</artifactId> <version>0.9.3-incubating-SNAPSHOT</version> <packaging>pom</packaging> @@ -287,16 +287,6 @@ <name>Storm Website</name> <url>file:///tmp/site</url> </site> - <repository> - <id>archiva.internal</id> - <name>Hurley Maven Repository</name> - <url>http://maven.hurley.hbo.com:8000/repository/internal/</url> - </repository> - <snapshotRepository> - <id>archiva.snapshots</id> - <name>Hurley Maven Snapshot Repository</name> - <url>http://maven.hurley.hbo.com:8000/repository/snapshots/</url> - </snapshotRepository> </distributionManagement> <dependencyManagement> @@ -526,16 +516,6 @@ <enabled>true</enabled> </releases> <snapshots> - <enabled>true</enabled> - </snapshots> - <id>hurley</id> - <url>http://maven.hurley.hbo.com:8000/repository/snapshots/</url> - </repository> - <repository> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> <enabled>false</enabled> </snapshots> <id>central</id> @@ -554,6 +534,7 @@ </repositories> <build> + <pluginManagement> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/storm/blob/fabd682a/storm-buildtools/maven-shade-clojure-transformer/pom.xml ---------------------------------------------------------------------- diff --git a/storm-buildtools/maven-shade-clojure-transformer/pom.xml b/storm-buildtools/maven-shade-clojure-transformer/pom.xml index e540355..efd4659 100644 --- a/storm-buildtools/maven-shade-clojure-transformer/pom.xml +++ b/storm-buildtools/maven-shade-clojure-transformer/pom.xml @@ -20,12 +20,12 @@ <parent> <artifactId>storm</artifactId> - <groupId>com.hbo.hurley</groupId> + <groupId>org.apache.storm</groupId> <version>0.9.3-incubating-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <groupId>com.hbo.hurley</groupId> + <groupId>org.apache.storm</groupId> <artifactId>maven-shade-clojure-transformer</artifactId> <dependencies> http://git-wip-us.apache.org/repos/asf/storm/blob/fabd682a/storm-core/dependency-reduced-pom.xml ---------------------------------------------------------------------- diff --git a/storm-core/dependency-reduced-pom.xml b/storm-core/dependency-reduced-pom.xml new file mode 100644 index 0000000..ec123dd --- /dev/null +++ b/storm-core/dependency-reduced-pom.xml @@ -0,0 +1,417 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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";> + <parent> + <artifactId>storm</artifactId> + <groupId>com.hbo.hurley</groupId> + <version>0.9.3-incubating-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>com.hbo.hurley</groupId> + <artifactId>storm-core</artifactId> + <name>Storm Core</name> + <description>Storm Core Java API and Clojure implementation.</description> + <build> + <sourceDirectory>src/jvm</sourceDirectory> + <testSourceDirectory>test/jvm</testSourceDirectory> + <resources> + <resource> + <directory>../conf</directory> + </resource> + <resource> + <targetPath>META-INF</targetPath> + <directory>../</directory> + <includes> + <include>NOTICE</include> + </includes> + </resource> + </resources> + <testResources> + <testResource> + <directory>src/dev</directory> + </testResource> + <testResource> + <directory>test/resources</directory> + </testResource> + </testResources> + <plugins> + <plugin> + <groupId>com.theoryinpractise</groupId> + <artifactId>clojure-maven-plugin</artifactId> + <extensions>true</extensions> + <executions> + <execution> + <id>compile-clojure</id> + <phase>compile</phase> + <goals> + <goal>compile</goal> + </goals> + </execution> + <execution> + <id>test-clojure</id> + <phase>test</phase> + <goals> + <goal>test-with-junit</goal> + </goals> + <configuration> + <vmargs>${test.extra.args}</vmargs> + </configuration> + </execution> + </executions> + <configuration> + <sourceDirectories> + <sourceDirectory>src/clj</sourceDirectory> + </sourceDirectories> + <testSourceDirectories> + <testSourceDirectory>test/clj</testSourceDirectory> + </testSourceDirectories> + <warnOnReflection>false</warnOnReflection> + <copyDeclaredNamespaceOnly>true</copyDeclaredNamespaceOnly> + <copiedNamespaces> + <copiedNamespace>none</copiedNamespace> + </copiedNamespaces> + </configuration> + </plugin> + <plugin> + <artifactId>maven-surefire-report-plugin</artifactId> + <configuration> + <reportsDirectories> + <file>${project.build.directory}/test-reports</file> + </reportsDirectories> + </configuration> + </plugin> + <plugin> + <artifactId>maven-shade-plugin</artifactId> + <version>2.2</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>com.hbo.hurley</groupId> + <artifactId>maven-shade-clojure-transformer</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + <configuration> + <keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope> + <promoteTransitiveDependencies>false</promoteTransitiveDependencies> + <createDependencyReducedPom>true</createDependencyReducedPom> + <minimizeJar>false</minimizeJar> + <artifactSet> + <includes> + <include>org.apache.thrift:*</include> + <include>io.netty:netty</include> + <include>com.google.guava:guava</include> + <include>org.apache.httpcomponents:http*</include> + <include>org.apache.zookeeper:zookeeper</include> + <include>org.apache.curator:*</include> + </includes> + </artifactSet> + <relocations> + <relocation> + <pattern>org.apache.thrift</pattern> + <shadedPattern>org.apache.thrift7</shadedPattern> + </relocation> + <relocation> + <pattern>org.jboss.netty</pattern> + <shadedPattern>org.apache.storm.netty</shadedPattern> + </relocation> + <relocation> + <pattern>com.google.common</pattern> + <shadedPattern>org.apache.storm.guava</shadedPattern> + </relocation> + <relocation> + <pattern>org.apache.http</pattern> + <shadedPattern>org.apache.storm.http</shadedPattern> + </relocation> + <relocation> + <pattern>org.apache.zookeeper</pattern> + <shadedPattern>org.apache.storm.zookeeper</shadedPattern> + </relocation> + <relocation> + <pattern>org.apache.curator</pattern> + <shadedPattern>org.apache.storm.curator</shadedPattern> + </relocation> + </relocations> + <transformers> + <transformer /> + </transformers> + <filters> + <filter> + <artifact>org.apache.thrift:*</artifact> + <excludes> + <exclude>META-INF/LICENSE.txt</exclude> + <exclude>META-INF/NOTICE.txt</exclude> + </excludes> + </filter> + <filter> + <artifact>io.netty:netty</artifact> + <excludes> + <exclude>META-INF/LICENSE.txt</exclude> + <exclude>META-INF/NOTICE.txt</exclude> + </excludes> + </filter> + <filter> + <artifact>commons-httpclient:commons-httpclient</artifact> + <excludes> + <exclude>META-INF/LICENSE.txt</exclude> + <exclude>META-INF/NOTICE.txt</exclude> + <exclude>META-INF/README.txt</exclude> + </excludes> + </filter> + <filter> + <artifact>org.apache.zookeeper:zookeeper</artifact> + <excludes> + <exclude>LICENSE.txt</exclude> + </excludes> + </filter> + </filters> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.clojure</groupId> + <artifactId>clojure</artifactId> + <version>1.5.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>clj-time</groupId> + <artifactId>clj-time</artifactId> + <version>0.4.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>compojure</groupId> + <artifactId>compojure</artifactId> + <version>1.1.3</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>hiccup</groupId> + <artifactId>hiccup</artifactId> + <version>0.3.6</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>ring</groupId> + <artifactId>ring-devel</artifactId> + <version>0.3.11</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>ring</groupId> + <artifactId>ring-jetty-adapter</artifactId> + <version>0.3.11</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <artifactId>servlet-api</artifactId> + <groupId>org.mortbay.jetty</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.clojure</groupId> + <artifactId>tools.logging</artifactId> + <version>0.2.3</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.clojure</groupId> + <artifactId>math.numeric-tower</artifactId> + <version>0.0.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.clojure</groupId> + <artifactId>tools.cli</artifactId> + <version>0.2.4</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.clojure</groupId> + <artifactId>tools.nrepl</artifactId> + <version>0.2.3</version> + <scope>test</scope> + <exclusions> + <exclusion> + <artifactId>clojure</artifactId> + <groupId>org.clojure</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>clojure-complete</groupId> + <artifactId>clojure-complete</artifactId> + <version>0.2.3</version> + <scope>test</scope> + <exclusions> + <exclusion> + <artifactId>clojure</artifactId> + <groupId>org.clojure</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.4</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-exec</artifactId> + <version>1.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.5</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> + <version>0.7.0</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <artifactId>slf4j-api</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <artifactId>servlet-api</artifactId> + <groupId>javax.servlet</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.curator</groupId> + <artifactId>curator-framework</artifactId> + <version>2.5.0</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <artifactId>log4j</artifactId> + <groupId>log4j</groupId> + </exclusion> + <exclusion> + <artifactId>slf4j-log4j12</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.googlecode.json-simple</groupId> + <artifactId>json-simple</artifactId> + <version>1.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>com.twitter</groupId> + <artifactId>carbonite</artifactId> + <version>1.4.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.yaml</groupId> + <artifactId>snakeyaml</artifactId> + <version>1.11</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.3.3</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.lmax</groupId> + <artifactId>disruptor</artifactId> + <version>3.2.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.jgrapht</groupId> + <artifactId>jgrapht-core</artifactId> + <version>0.9.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>16.0.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + <version>1.0.13</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>log4j-over-slf4j</artifactId> + <version>1.6.6</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty</artifactId> + <version>3.9.0.Final</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <version>1.9.5</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.clojars.runa</groupId> + <artifactId>conjure</artifactId> + <version>2.1.3</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>reply</groupId> + <artifactId>reply</artifactId> + <version>0.3.0</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <artifactId>cd-client</artifactId> + <groupId>org.thnetos</groupId> + </exclusion> + <exclusion> + <artifactId>drawbridge</artifactId> + <groupId>com.cemerick</groupId> + </exclusion> + <exclusion> + <artifactId>versioneer</artifactId> + <groupId>trptcolin</groupId> + </exclusion> + <exclusion> + <artifactId>sjacket</artifactId> + <groupId>org.clojars.trptcolin</groupId> + </exclusion> + </exclusions> + </dependency> + </dependencies> +</project> + http://git-wip-us.apache.org/repos/asf/storm/blob/fabd682a/storm-core/pom.xml ---------------------------------------------------------------------- diff --git a/storm-core/pom.xml b/storm-core/pom.xml index 49c0f5a..4c72498 100644 --- a/storm-core/pom.xml +++ b/storm-core/pom.xml @@ -19,10 +19,10 @@ <modelVersion>4.0.0</modelVersion> <parent> <artifactId>storm</artifactId> - <groupId>com.hbo.hurley</groupId> + <groupId>org.apache.storm</groupId> <version>0.9.3-incubating-SNAPSHOT</version> </parent> - <groupId>com.hbo.hurley</groupId> + <groupId>org.apache.storm</groupId> <artifactId>storm-core</artifactId> <packaging>jar</packaging> <name>Storm Core</name> @@ -355,7 +355,7 @@ </configuration> <dependencies> <dependency> - <groupId>com.hbo.hurley</groupId> + <groupId>org.apache.storm</groupId> <artifactId>maven-shade-clojure-transformer</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/storm/blob/fabd682a/storm-dist/binary/pom.xml ---------------------------------------------------------------------- diff --git a/storm-dist/binary/pom.xml b/storm-dist/binary/pom.xml index 288f05d..0d97c0b 100644 --- a/storm-dist/binary/pom.xml +++ b/storm-dist/binary/pom.xml @@ -20,11 +20,11 @@ <modelVersion>4.0.0</modelVersion> <parent> <artifactId>storm</artifactId> - <groupId>com.hbo.hurley</groupId> + <groupId>org.apache.storm</groupId> <version>0.9.3-incubating-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <groupId>com.hbo.hurley</groupId> + <groupId>org.apache.storm</groupId> <artifactId>apache-storm-bin</artifactId> <packaging>pom</packaging> <name>Storm Binary Distribution</name> @@ -32,7 +32,7 @@ <dependencies> <dependency> - <groupId>com.hbo.hurley</groupId> + <groupId>org.apache.storm</groupId> <artifactId>storm-core</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/storm/blob/fabd682a/storm-dist/source/pom.xml ---------------------------------------------------------------------- diff --git a/storm-dist/source/pom.xml b/storm-dist/source/pom.xml index e61f2df..4fedefb 100644 --- a/storm-dist/source/pom.xml +++ b/storm-dist/source/pom.xml @@ -20,11 +20,11 @@ <modelVersion>4.0.0</modelVersion> <parent> <artifactId>storm</artifactId> - <groupId>com.hbo.hurley</groupId> + <groupId>org.apache.storm</groupId> <version>0.9.3-incubating-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <groupId>com.hbo.hurley</groupId> + <groupId>org.apache.storm</groupId> <artifactId>apache-storm-source</artifactId> <packaging>pom</packaging> <name>Storm Source Distribution</name> @@ -32,7 +32,7 @@ <dependencies> <dependency> - <groupId>com.hbo.hurley</groupId> + <groupId>org.apache.storm</groupId> <artifactId>storm-core</artifactId> <version>${project.version}</version> </dependency>
