You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by ke...@apache.org on 2013/12/13 23:01:19 UTC
git commit: Fix gradle to include same version as artifact in
generated distribution tarball
Updated Branches:
refs/heads/master 4eb26e744 -> 5f54d4de2
Fix gradle to include same version as artifact in generated distribution tarball
Version number is now available to both the application plugin and the maven-publish plugin.
Note that this also changes the Maven artifactId from 'twitter-aurora' to 'aurora-scheduler'.
groupId remains 'com.twitter.aurora' - I imagine we will change this to 'org.apache.aurora'
in combination with a refactor of package names.
Testing Done:
'vagrant up' works
'./gradlew distTar' produces dist/distributions/aurora-scheduler-0.2.0-SNAPSHOT.tar
'./gradlew distZip' produces dist/distributions/aurora-scheduler-0.2.0-SNAPSHOT.zip
'./gradlew publishToMavenLocal' publishes appropriately-named binary and source jars
Bugs closed: AURORA-10
Reviewed at https://reviews.apache.org/r/16257/
Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/5f54d4de
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/5f54d4de
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/5f54d4de
Branch: refs/heads/master
Commit: 5f54d4de25413bb18acec16120eb18f3e08c6bf0
Parents: 4eb26e7
Author: Kevin Sweeney <ke...@apache.org>
Authored: Fri Dec 13 14:01:01 2013 -0800
Committer: Kevin Sweeney <ks...@twitter.com>
Committed: Fri Dec 13 14:01:01 2013 -0800
----------------------------------------------------------------------
build.gradle | 8 ++++----
examples/vagrant/provision-aurora-scheduler.sh | 13 ++++++++-----
examples/vagrant/provision-dev-environment.sh | 3 ++-
3 files changed, 14 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5f54d4de/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 1c80b6d..9d67d14 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,13 +26,13 @@ task sourceJar(type: Jar) {
from sourceSets.main.allJava
}
+group 'com.twitter.aurora'
+version = file('.auroraversion').text.trim().toUpperCase()
+
publishing {
publications {
maven(MavenPublication) {
- groupId 'com.twitter.aurora'
- artifactId 'twitter-aurora'
- version file('.auroraversion').text.trim().toUpperCase()
-
+ artifactId 'aurora-scheduler'
from components.java
artifact sourceJar {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5f54d4de/examples/vagrant/provision-aurora-scheduler.sh
----------------------------------------------------------------------
diff --git a/examples/vagrant/provision-aurora-scheduler.sh b/examples/vagrant/provision-aurora-scheduler.sh
index 1b5887a..f96c2e7 100755
--- a/examples/vagrant/provision-aurora-scheduler.sh
+++ b/examples/vagrant/provision-aurora-scheduler.sh
@@ -1,6 +1,8 @@
#!/bin/bash -ex
# TODO(ksweeney): Use public and versioned URLs instead of local artifacts.
-tar xvf /vagrant/dist/distributions/aurora-scheduler.tar -C /usr/local
+AURORA_VERSION=$(cat /vagrant/.auroraversion | tr '[a-z]' '[A-Z]')
+
+tar xvf /vagrant/dist/distributions/aurora-scheduler-$AURORA_VERSION.tar -C /usr/local
install -m 755 /vagrant/dist/aurora_client.pex /usr/local/bin/aurora
install -m 755 /vagrant/dist/aurora_admin.pex /usr/local/bin/aurora_admin
@@ -10,12 +12,12 @@ wget -c http://downloads.mesosphere.io/master/ubuntu/12.04/mesos_0.15.0-rc4_amd6
dpkg --install mesos_0.15.0-rc4_amd64.deb
# TODO(ksweeney): Make this a be part of the Aurora distribution tarball.
-cat > /usr/local/sbin/aurora-scheduler.sh <<"EOF"
+# Location where aurora-scheduler.zip was unpacked.
+AURORA_SCHEDULER_HOME=/usr/local/aurora-scheduler-$AURORA_VERSION
+cat > /usr/local/sbin/aurora-scheduler.sh <<EOF
#!/usr/bin/env bash
# An example scheduler launch script that works with the included Vagrantfile.
-# Location where aurora-scheduler.zip was unpacked.
-AURORA_SCHEDULER_HOME=/usr/local/aurora-scheduler
# Flags that control the behavior of the JVM.
JAVA_OPTS=(
@@ -63,7 +65,8 @@ export LIBPROCESS_IP=192.168.33.5
(
while true
do
- JAVA_OPTS="${JAVA_OPTS[*]}" exec "$AURORA_SCHEDULER_HOME/bin/aurora-scheduler" "${AURORA_FLAGS[@]}"
+ JAVA_OPTS="\${JAVA_OPTS[*]}" exec "$AURORA_SCHEDULER_HOME/bin/aurora-scheduler" \\
+ "\${AURORA_FLAGS[@]}"
done
) &
EOF
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5f54d4de/examples/vagrant/provision-dev-environment.sh
----------------------------------------------------------------------
diff --git a/examples/vagrant/provision-dev-environment.sh b/examples/vagrant/provision-dev-environment.sh
index 5418708..3e1bbbb 100755
--- a/examples/vagrant/provision-dev-environment.sh
+++ b/examples/vagrant/provision-dev-environment.sh
@@ -10,6 +10,7 @@ if [ ! -d aurora ]; then
fi
pushd aurora
+ AURORA_VERSION=$(cat .auroraversion | tr '[a-z]' '[A-Z]')
mkdir -p third_party
pushd third_party
wget -c http://downloads.mesosphere.io/master/ubuntu/12.04/mesos_0.15.0-rc4_amd64.egg \
@@ -40,7 +41,7 @@ with contextlib.closing(zipfile.ZipFile('dist/thermos_executor.pex', 'a')) as zf
EOF
mkdir -p /vagrant/dist/distributions
- cp dist/distributions/aurora-scheduler.tar /vagrant/dist/distributions
+ cp dist/distributions/aurora-scheduler-$AURORA_VERSION.tar /vagrant/dist/distributions
for pex in aurora_admin aurora_client gc_executor thermos_executor thermos_observer; do
cp dist/$pex.pex /vagrant/dist