change everything to com.hbo.hurley change everything to com.hbo.hurley so relative links work
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b95b6d68 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b95b6d68 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b95b6d68 Branch: refs/heads/master Commit: b95b6d68c54b3e80431c73609870c6935b6d56ce Parents: cbbea7c Author: rick-kilgore <[email protected]> Authored: Tue Sep 9 00:17:29 2014 +0000 Committer: rick-kilgore <[email protected]> Committed: Tue Sep 9 00:17:29 2014 +0000 ---------------------------------------------------------------------- examples/storm-starter/pom.xml | 6 +- external/storm-hdfs/pom.xml | 6 +- external/storm-kafka/gs | 7 + external/storm-kafka/pom.xml | 7 +- pom.xml | 2 +- .../maven-shade-clojure-transformer/pom.xml | 6 +- 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, 446 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/b95b6d68/examples/storm-starter/pom.xml ---------------------------------------------------------------------- diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml index 903c6e7..ccd2770 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>org.apache.storm</groupId> + <groupId>com.hbo.hurley</groupId> <version>0.9.3-incubating-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <groupId>org.apache.storm</groupId> + <groupId>com.hbo.hurley</groupId> <artifactId>storm-starter</artifactId> <packaging>jar</packaging> @@ -66,7 +66,7 @@ <version>3.0.3</version> </dependency> <dependency> - <groupId>org.apache.storm</groupId> + <groupId>com.hbo.hurley</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/b95b6d68/external/storm-hdfs/pom.xml ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/pom.xml b/external/storm-hdfs/pom.xml index 2aadac0..2fc6f54 100644 --- a/external/storm-hdfs/pom.xml +++ b/external/storm-hdfs/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>storm</artifactId> - <groupId>org.apache.storm</groupId> + <groupId>com.hbo.hurley</groupId> <version>0.9.3-incubating-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -37,7 +37,7 @@ <dependencies> <dependency> - <groupId>org.apache.storm</groupId> + <groupId>com.hbo.hurley</groupId> <artifactId>storm-core</artifactId> <version>${project.version}</version> <scope>provided</scope> @@ -65,4 +65,4 @@ </exclusions> </dependency> </dependencies> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/storm/blob/b95b6d68/external/storm-kafka/gs ---------------------------------------------------------------------- diff --git a/external/storm-kafka/gs b/external/storm-kafka/gs new file mode 100644 index 0000000..9f6e837 --- /dev/null +++ b/external/storm-kafka/gs @@ -0,0 +1,7 @@ +changes made since retries: + + 45.9% external/storm-kafka/ + + external/storm-kafka/pom.xml | 18 [1;32m+++++++++++++++[m[1;31m---[m + pom.xml | 21 [1;32m++++++++++++++++++++[m[1;31m-[m + 2 files changed, 35 insertions(+), 4 deletions(-) http://git-wip-us.apache.org/repos/asf/storm/blob/b95b6d68/external/storm-kafka/pom.xml ---------------------------------------------------------------------- diff --git a/external/storm-kafka/pom.xml b/external/storm-kafka/pom.xml index 4f960f3..21a79f1 100644 --- a/external/storm-kafka/pom.xml +++ b/external/storm-kafka/pom.xml @@ -20,14 +20,13 @@ <parent> <artifactId>storm</artifactId> - <groupId>org.apache.storm</groupId> + <groupId>com.hbo.hurley</groupId> <version>0.9.3-incubating-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <packaging>jar</packaging> - <groupId>com.hbo.hurley</groupId> - <artifactId>storm-kafka-hurley</artifactId> + <artifactId>storm-kafka</artifactId> <name>storm-kafka-hurley</name> <description>Storm Spouts for Apache Kafka</description> <build> @@ -123,7 +122,7 @@ </exclusions> </dependency> <dependency> - <groupId>org.apache.storm</groupId> + <groupId>com.hbo.hurley</groupId> <artifactId>storm-core</artifactId> <version>${project.version}</version> <scope>provided</scope> http://git-wip-us.apache.org/repos/asf/storm/blob/b95b6d68/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 825cc38..9b54055 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ </parent> - <groupId>org.apache.storm</groupId> + <groupId>com.hbo.hurley</groupId> <artifactId>storm</artifactId> <version>0.9.3-incubating-SNAPSHOT</version> <packaging>pom</packaging> http://git-wip-us.apache.org/repos/asf/storm/blob/b95b6d68/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 a6fbad1..e540355 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>org.apache.storm</groupId> + <groupId>com.hbo.hurley</groupId> <version>0.9.3-incubating-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <groupId>org.apache.storm</groupId> + <groupId>com.hbo.hurley</groupId> <artifactId>maven-shade-clojure-transformer</artifactId> <dependencies> @@ -36,4 +36,4 @@ <scope>provided</scope> </dependency> </dependencies> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/storm/blob/b95b6d68/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/b95b6d68/storm-core/pom.xml ---------------------------------------------------------------------- diff --git a/storm-core/pom.xml b/storm-core/pom.xml index 4c72498..49c0f5a 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>org.apache.storm</groupId> + <groupId>com.hbo.hurley</groupId> <version>0.9.3-incubating-SNAPSHOT</version> </parent> - <groupId>org.apache.storm</groupId> + <groupId>com.hbo.hurley</groupId> <artifactId>storm-core</artifactId> <packaging>jar</packaging> <name>Storm Core</name> @@ -355,7 +355,7 @@ </configuration> <dependencies> <dependency> - <groupId>org.apache.storm</groupId> + <groupId>com.hbo.hurley</groupId> <artifactId>maven-shade-clojure-transformer</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/storm/blob/b95b6d68/storm-dist/binary/pom.xml ---------------------------------------------------------------------- diff --git a/storm-dist/binary/pom.xml b/storm-dist/binary/pom.xml index 0d97c0b..288f05d 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>org.apache.storm</groupId> + <groupId>com.hbo.hurley</groupId> <version>0.9.3-incubating-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <groupId>org.apache.storm</groupId> + <groupId>com.hbo.hurley</groupId> <artifactId>apache-storm-bin</artifactId> <packaging>pom</packaging> <name>Storm Binary Distribution</name> @@ -32,7 +32,7 @@ <dependencies> <dependency> - <groupId>org.apache.storm</groupId> + <groupId>com.hbo.hurley</groupId> <artifactId>storm-core</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/storm/blob/b95b6d68/storm-dist/source/pom.xml ---------------------------------------------------------------------- diff --git a/storm-dist/source/pom.xml b/storm-dist/source/pom.xml index 4fedefb..e61f2df 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>org.apache.storm</groupId> + <groupId>com.hbo.hurley</groupId> <version>0.9.3-incubating-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <groupId>org.apache.storm</groupId> + <groupId>com.hbo.hurley</groupId> <artifactId>apache-storm-source</artifactId> <packaging>pom</packaging> <name>Storm Source Distribution</name> @@ -32,7 +32,7 @@ <dependencies> <dependency> - <groupId>org.apache.storm</groupId> + <groupId>com.hbo.hurley</groupId> <artifactId>storm-core</artifactId> <version>${project.version}</version> </dependency>
