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 2013/12/19 18:04:36 UTC
[1/2] git commit: update groupId to "org.apache.storm"
Updated Branches:
refs/heads/master d9268e468 -> 6331d6a93
update groupId to "org.apache.storm"
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/a2b1d5d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/a2b1d5d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/a2b1d5d9
Branch: refs/heads/master
Commit: a2b1d5d941f0cb924a4f1464b3a6b18cacf5c44f
Parents: d9268e4
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Thu Dec 19 11:35:54 2013 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Dec 19 11:35:54 2013 -0500
----------------------------------------------------------------------
project.clj | 10 +++++-----
storm-console-logging/project.clj | 2 +-
storm-core/project.clj | 2 +-
storm-lib/project.clj | 13 +++++++------
storm-netty/project.clj | 4 ++--
5 files changed, 16 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/a2b1d5d9/project.clj
----------------------------------------------------------------------
diff --git a/project.clj b/project.clj
index 8f63cd6..27f3d83 100644
--- a/project.clj
+++ b/project.clj
@@ -15,15 +15,15 @@
;; limitations under the License.
(def VERSION (.trim (slurp "VERSION")))
(def MODULES (-> "MODULES" slurp (.split "\n")))
-(def DEPENDENCIES (for [m MODULES] [(symbol (str "storm/" m)) VERSION]))
+(def DEPENDENCIES (for [m MODULES] [(symbol (str "org.apache.storm/" m)) VERSION]))
-(eval `(defproject storm/storm ~VERSION
+(eval `(defproject org.apache.storm/storm ~VERSION
:url "http://storm-project.net"
:description "Distributed and fault-tolerant realtime computation"
- :license {:name "Eclipse Public License - Version 1.0" :url "https://github.com/nathanmarz/storm/blob/master/LICENSE.html"}
+ :license {:name "The Apache Software License, Version 2.0" :url "http://www.apache.org/licenses/LICENSE-2.0.txt"}
:mailing-list {:name "Storm user mailing list"
- :archive "https://groups.google.com/group/storm-user"
- :post "storm-user@googlegroups.com"}
+ :archive "http://mail-archives.apache.org/mod_mbox/incubator-storm-user/"
+ :post "user@storm.incubator.apache.org"}
:dependencies [~@DEPENDENCIES]
:plugins [[~'lein-sub "0.2.1"]]
:min-lein-version "2.0.0"
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/a2b1d5d9/storm-console-logging/project.clj
----------------------------------------------------------------------
diff --git a/storm-console-logging/project.clj b/storm-console-logging/project.clj
index 4464419..d2e796f 100644
--- a/storm-console-logging/project.clj
+++ b/storm-console-logging/project.clj
@@ -16,7 +16,7 @@
(def ROOT-DIR (subs *file* 0 (- (count *file*) (count "project.clj"))))
(def VERSION (-> ROOT-DIR (str "/../VERSION") slurp (.trim)))
-(defproject storm/storm-console-logging VERSION
+(defproject org.apache.storm/storm-console-logging VERSION
:resource-paths ["logback"]
:target-path "target"
:javac-options ["-target" "1.6" "-source" "1.6"]
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/a2b1d5d9/storm-core/project.clj
----------------------------------------------------------------------
diff --git a/storm-core/project.clj b/storm-core/project.clj
index 06ea99e..77b4b0c 100644
--- a/storm-core/project.clj
+++ b/storm-core/project.clj
@@ -16,7 +16,7 @@
(def ROOT-DIR (subs *file* 0 (- (count *file*) (count "project.clj"))))
(def VERSION (-> ROOT-DIR (str "/../VERSION") slurp (.trim)))
-(defproject storm/storm-core VERSION
+(defproject org.apache.storm/storm-core VERSION
:dependencies [[org.clojure/clojure "1.4.0"]
[commons-io "1.4"]
[org.apache.commons/commons-exec "1.1"]
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/a2b1d5d9/storm-lib/project.clj
----------------------------------------------------------------------
diff --git a/storm-lib/project.clj b/storm-lib/project.clj
index 4e4a119..f8c1d78 100644
--- a/storm-lib/project.clj
+++ b/storm-lib/project.clj
@@ -16,17 +16,18 @@
(def ROOT-DIR (subs *file* 0 (- (count *file*) (count "project.clj"))))
(def VERSION (-> ROOT-DIR (str "/../VERSION") slurp (.trim)))
(def MODULES (-> ROOT-DIR (str "/../MODULES") slurp (.split "\n") (#(filter (fn [m] (not= m "storm-console-logging")) %)) ))
-(def DEPENDENCIES (for [m MODULES] [(symbol (str "storm/" m)) VERSION]))
+(def DEPENDENCIES (for [m MODULES] [(symbol (str "org.apache.storm/" m)) VERSION]))
+(println DEPENDENCIES)
;; for lib pom.xml, change the symbol to storm/storm-liba and filter out storm-console-logging from modules
-(eval `(defproject storm/storm-lib ~VERSION
- :url "http://storm-project.net"
+(eval `(defproject org.apache.storm/storm-lib ~VERSION
+ :url "http://storm.incubator.apache.org"
:description "Distributed and fault-tolerant realtime computation"
- :license {:name "Eclipse Public License - Version 1.0" :url "https://github.com/nathanmarz/storm/blob/master/LICENSE.html"}
+ :license {:name "The Apache Software License, Version 2.0" :url "http://www.apache.org/licenses/LICENSE-2.0.txt"}
:mailing-list {:name "Storm user mailing list"
- :archive "https://groups.google.com/group/storm-user"
- :post "storm-user@googlegroups.com"}
+ :archive "http://mail-archives.apache.org/mod_mbox/incubator-storm-user/"
+ :post "user@storm.incubator.apache.org"}
:dependencies [~@DEPENDENCIES]
:min-lein-version "2.0.0"
:target-path "target"
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/a2b1d5d9/storm-netty/project.clj
----------------------------------------------------------------------
diff --git a/storm-netty/project.clj b/storm-netty/project.clj
index 763bc00..48da0c4 100644
--- a/storm-netty/project.clj
+++ b/storm-netty/project.clj
@@ -16,8 +16,8 @@
(def ROOT-DIR (subs *file* 0 (- (count *file*) (count "project.clj"))))
(def VERSION (-> ROOT-DIR (str "/../VERSION") slurp (.trim)))
-(eval `(defproject storm/storm-netty ~VERSION
- :dependencies [[storm/storm-core ~VERSION]
+(eval `(defproject org.apache.storm/storm-netty ~VERSION
+ :dependencies [[org.apache.storm/storm-core ~VERSION]
[io.netty/netty "3.6.3.Final"]]
:java-source-paths ["src/jvm"]
:test-paths ["test/clj"]
[2/2] git commit: append "apache-" to release archives
Posted by pt...@apache.org.
append "apache-" to release archives
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/6331d6a9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/6331d6a9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/6331d6a9
Branch: refs/heads/master
Commit: 6331d6a937ebfb82bf990b6ce2e17d0479a321b1
Parents: a2b1d5d
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Thu Dec 19 12:03:30 2013 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Dec 19 12:03:30 2013 -0500
----------------------------------------------------------------------
bin/build_release.sh | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/6331d6a9/bin/build_release.sh
----------------------------------------------------------------------
diff --git a/bin/build_release.sh b/bin/build_release.sh
index d09649e..5a26ac6 100644
--- a/bin/build_release.sh
+++ b/bin/build_release.sh
@@ -22,12 +22,13 @@ function quit {
trap quit 1 2 3 15 #Ctrl+C exits.
RELEASE=`cat VERSION`
+PROJECT=apache-storm
LEIN=`which lein2 || which lein`
export LEIN_ROOT=1
-echo Making release $RELEASE
+echo Making release $PROJECT-$RELEASE
-DIR=`pwd`/_release/storm-$RELEASE
+DIR=`pwd`/_release/$PROJECT-$RELEASE
rm -rf _release
rm -f *.zip
@@ -47,7 +48,7 @@ do
cd ..
done
-cd _release/storm-$RELEASE
+cd _release/$PROJECT-$RELEASE
for i in *.jar
do
rm -f lib/$i
@@ -73,9 +74,9 @@ cp README.markdown $DIR/
cp LICENSE.html $DIR/
cd _release
-zip -r storm-$RELEASE.zip *
-mv storm-*.zip ../
-tar -cvzf ../storm-$RELEASE.tar.gz ./
+zip -r $PROJECT-$RELEASE.zip *
+mv $PROJECT-*.zip ../
+tar -cvzf ../$PROJECT-$RELEASE.tar.gz ./
cd ..