You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2014/01/30 05:11:05 UTC
[04/14] move shading of the thrift jar to the storm-core pom rename
'thrift7' back to 'thrift' in imports remove 'storm-deps' submodule
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/22ddd6e6/storm-core/test/clj/backtype/storm/security/auth/ThriftClient_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/backtype/storm/security/auth/ThriftClient_test.clj b/storm-core/test/clj/backtype/storm/security/auth/ThriftClient_test.clj
index cd814c8..7dcd86d 100644
--- a/storm-core/test/clj/backtype/storm/security/auth/ThriftClient_test.clj
+++ b/storm-core/test/clj/backtype/storm/security/auth/ThriftClient_test.clj
@@ -17,7 +17,7 @@
(:use [backtype.storm config])
(:use [clojure test])
(:import [backtype.storm.security.auth ThriftClient])
- (:import [org.apache.thrift7.transport TTransportException])
+ (:import [org.apache.thrift.transport TTransportException])
)
(deftest test-ctor-throws-if-port-invalid
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/22ddd6e6/storm-core/test/clj/backtype/storm/security/auth/ThriftServer_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/backtype/storm/security/auth/ThriftServer_test.clj b/storm-core/test/clj/backtype/storm/security/auth/ThriftServer_test.clj
index f8ca8cb..6213d4f 100644
--- a/storm-core/test/clj/backtype/storm/security/auth/ThriftServer_test.clj
+++ b/storm-core/test/clj/backtype/storm/security/auth/ThriftServer_test.clj
@@ -17,7 +17,7 @@
(:use [backtype.storm config])
(:use [clojure test])
(:import [backtype.storm.security.auth ThriftServer])
- (:import [org.apache.thrift7.transport TTransportException])
+ (:import [org.apache.thrift.transport TTransportException])
)
(deftest test-stop-checks-for-null
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/22ddd6e6/storm-core/test/clj/backtype/storm/security/auth/auth_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/backtype/storm/security/auth/auth_test.clj b/storm-core/test/clj/backtype/storm/security/auth/auth_test.clj
index 43573fb..c7d7411 100644
--- a/storm-core/test/clj/backtype/storm/security/auth/auth_test.clj
+++ b/storm-core/test/clj/backtype/storm/security/auth/auth_test.clj
@@ -16,8 +16,8 @@
(ns backtype.storm.security.auth.auth-test
(:use [clojure test])
(:require [backtype.storm.daemon [nimbus :as nimbus]])
- (:import [org.apache.thrift7 TException])
- (:import [org.apache.thrift7.transport TTransportException])
+ (:import [org.apache.thrift TException])
+ (:import [org.apache.thrift.transport TTransportException])
(:import [java.nio ByteBuffer])
(:import [backtype.storm Config])
(:import [backtype.storm.utils NimbusClient])
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/22ddd6e6/storm-core/test/clj/backtype/storm/utils_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/backtype/storm/utils_test.clj b/storm-core/test/clj/backtype/storm/utils_test.clj
index 7c37c0a..99bf7d1 100644
--- a/storm-core/test/clj/backtype/storm/utils_test.clj
+++ b/storm-core/test/clj/backtype/storm/utils_test.clj
@@ -17,7 +17,7 @@
(:import [backtype.storm Config])
(:import [backtype.storm.utils NimbusClient Utils])
(:import [com.netflix.curator.retry ExponentialBackoffRetry])
- (:import [org.apache.thrift7.transport TTransportException])
+ (:import [org.apache.thrift.transport TTransportException])
(:use [backtype.storm config util])
(:use [clojure test])
)
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/22ddd6e6/storm-deps/libthrift/pom.xml
----------------------------------------------------------------------
diff --git a/storm-deps/libthrift/pom.xml b/storm-deps/libthrift/pom.xml
deleted file mode 100644
index 4f61159..0000000
--- a/storm-deps/libthrift/pom.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<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>
- <parent>
- <artifactId>storm-deps</artifactId>
- <groupId>org.apache.storm</groupId>
- <version>0.9.2-incubating-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <groupId>org.apache.storm</groupId>
- <artifactId>libthrift7</artifactId>
- <packaging>jar</packaging>
- <name>Apache Thrift API (repackaged)</name>
- <description>Repackaging of the Apache Thrift API ("org.apache.thrift" --> "org.apache.thrift7")</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- <version>0.7.0</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
- <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
- <createDependencyReducedPom>true</createDependencyReducedPom>
- <!--<shadedArtifactAttached>true</shadedArtifactAttached>-->
- <artifactSet>
- <includes>
- <include>org.apache.thrift:*</include>
- </includes>
- </artifactSet>
- <relocations>
- <relocation>
- <pattern>org.apache.thrift</pattern>
- <shadedPattern>org.apache.thrift7</shadedPattern>
- </relocation>
- </relocations>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/22ddd6e6/storm-deps/pom.xml
----------------------------------------------------------------------
diff --git a/storm-deps/pom.xml b/storm-deps/pom.xml
deleted file mode 100644
index b1da660..0000000
--- a/storm-deps/pom.xml
+++ /dev/null
@@ -1,233 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<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>
-
- <parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>10</version>
- </parent>
-
-
- <groupId>org.apache.storm</groupId>
- <artifactId>storm-deps</artifactId>
- <version>0.9.2-incubating-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>Storm Dependencies</name>
-
-
- <prerequisites>
- <maven>3.0.0</maven>
- </prerequisites>
-
- <modules>
- <module>libthrift</module>
- </modules>
-
- <scm>
- <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-storm.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-storm.git</developerConnection>
- <tag>HEAD</tag>
- <url>https://git-wip-us.apache.org/repos/asf/incubator-storm</url>
- </scm>
-
-
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <profiles>
- <profile>
- <id>sign</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- </profiles>
-
- <distributionManagement>
- <repository>
- <uniqueVersion>false</uniqueVersion>
- <id>releases</id>
- <name>Local Release Repo</name>
- <url>file:///tmp/repo/</url>
- <layout>default</layout>
- </repository>
- <snapshotRepository>
- <uniqueVersion>false</uniqueVersion>
- <id>snapshots</id>
- <name>Local Snapshot Repo</name>
- <url>file:///tmp/repo/</url>
- <layout>default</layout>
- </snapshotRepository>
- <site>
- <id>storm.maven.website</id>
- <name>Storm Website</name>
- <url>file:///tmp/site</url>
- </site>
- </distributionManagement>
-
- <dependencyManagement>
-
- </dependencyManagement>
-
-
- <dependencies>
-
- </dependencies>
-
- <repositories>
- <repository>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <id>central</id>
- <url>http://repo1.maven.org/maven2/</url>
- </repository>
-
- </repositories>
-
- <build>
-
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.4.1</version>
- </plugin>
- <plugin>
- <groupId>com.theoryinpractise</groupId>
- <artifactId>clojure-maven-plugin</artifactId>
- <version>1.3.18</version>
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.16</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.7</version>
- </plugin>
- </plugins>
- </pluginManagement>
-
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- <goals>deploy assembly:assembly</goals>
- <tagNameFormat>v@{project.version}</tagNameFormat>
- <preparationGoals>clean test</preparationGoals>
- <remoteTagging>false</remoteTagging>
- <suppressCommitBeforeTag>true</suppressCommitBeforeTag>
- <pushChanges>false</pushChanges>
- </configuration>
- </plugin>
- <plugin>
- <groupId>com.theoryinpractise</groupId>
- <artifactId>clojure-maven-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <configuration>
- <createChecksum>true</createChecksum>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-
-</project>