You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@yetus.apache.org by aw...@apache.org on 2018/07/20 04:19:25 UTC
[1/2] yetus git commit: YETUS-635 Maven plugin should fail when
partially enabled
Repository: yetus
Updated Branches:
refs/heads/master 6c9c3d9ce -> b226a8f61
YETUS-635 Maven plugin should fail when partially enabled
Signed-off-by: Allen Wittenauer <aw...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/yetus/repo
Commit: http://git-wip-us.apache.org/repos/asf/yetus/commit/d8448028
Tree: http://git-wip-us.apache.org/repos/asf/yetus/tree/d8448028
Diff: http://git-wip-us.apache.org/repos/asf/yetus/diff/d8448028
Branch: refs/heads/master
Commit: d844802869a8f77bba50e1ed8dbec88339a336a3
Parents: 6c9c3d9
Author: Sean Busbey <bu...@apache.org>
Authored: Wed May 16 12:23:56 2018 -0500
Committer: Allen Wittenauer <aw...@apache.org>
Committed: Thu Jul 19 14:23:10 2018 -0700
----------------------------------------------------------------------
precommit/test-patch.d/maven.sh | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/yetus/blob/d8448028/precommit/test-patch.d/maven.sh
----------------------------------------------------------------------
diff --git a/precommit/test-patch.d/maven.sh b/precommit/test-patch.d/maven.sh
index b16478f..89aa949 100755
--- a/precommit/test-patch.d/maven.sh
+++ b/precommit/test-patch.d/maven.sh
@@ -130,12 +130,29 @@ function maven_initialize
fi
}
+## @audience private
+## @stability stable
+function mvnsite_precheck
+{
+ if ! verify_plugin_enabled 'maven'; then
+ yetus_error "ERROR: to run the mvnsite test you must ensure the 'maven' plugin is enabled."
+ return 1
+ fi
+}
+
+## @audience private
+## @stability stable
function maven_precheck
{
declare logfile="${PATCH_DIR}/mvnrepoclean.log"
declare line
declare maven_version
+ if ! verify_plugin_enabled 'maven'; then
+ yetus_error "ERROR: you can't specify maven as the buildtool if you don't enable the plugin."
+ return 1
+ fi
+
if ! verify_command maven "${MAVEN}"; then
add_vote_table -1 maven "ERROR: maven was not available."
return 1
[2/2] yetus git commit: YETUS-607. Update bundle and remove version
constraint from middleman-livereload
Posted by aw...@apache.org.
YETUS-607. Update bundle and remove version constraint from middleman-livereload
Signed-off-by: Allen Wittenauer <aw...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/yetus/repo
Commit: http://git-wip-us.apache.org/repos/asf/yetus/commit/b226a8f6
Tree: http://git-wip-us.apache.org/repos/asf/yetus/tree/b226a8f6
Diff: http://git-wip-us.apache.org/repos/asf/yetus/diff/b226a8f6
Branch: refs/heads/master
Commit: b226a8f619b1b07c843898020e00ac83510a55c7
Parents: d844802
Author: jack-altiscale <ja...@altiscale.com>
Authored: Thu Jul 19 16:34:48 2018 -0700
Committer: Allen Wittenauer <aw...@apache.org>
Committed: Thu Jul 19 21:18:50 2018 -0700
----------------------------------------------------------------------
asf-site-src/Gemfile | 2 +-
asf-site-src/Gemfile.lock | 75 +++++++++++++++++++++---------------------
2 files changed, 38 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/yetus/blob/b226a8f6/asf-site-src/Gemfile
----------------------------------------------------------------------
diff --git a/asf-site-src/Gemfile b/asf-site-src/Gemfile
index ff3872d..7db8b0b 100644
--- a/asf-site-src/Gemfile
+++ b/asf-site-src/Gemfile
@@ -21,7 +21,7 @@ source 'https://rubygems.org'
gem "middleman", "~>3.4.0"
# Live-reloading plugin
-gem "middleman-livereload", "~> 3.1.0"
+gem "middleman-livereload"
gem 'middleman-syntax', github: 'middleman/middleman-syntax'
http://git-wip-us.apache.org/repos/asf/yetus/blob/b226a8f6/asf-site-src/Gemfile.lock
----------------------------------------------------------------------
diff --git a/asf-site-src/Gemfile.lock b/asf-site-src/Gemfile.lock
index d879160..0ce4618 100644
--- a/asf-site-src/Gemfile.lock
+++ b/asf-site-src/Gemfile.lock
@@ -1,21 +1,21 @@
GIT
remote: git://github.com/middleman/middleman-syntax.git
- revision: 270a86dd56220e069d55461ec570c73434de4a41
+ revision: 0377cc9d2219c2a6ffc2acfd39057f833934af9a
specs:
- middleman-syntax (3.0.0)
+ middleman-syntax (3.1.0)
middleman-core (>= 3.2)
- rouge (~> 2.0)
+ rouge (~> 3.1)
GIT
remote: git://github.com/vmg/redcarpet.git
- revision: 68bfb5b79a08de4ee16e06905f27adb25eabbbe9
+ revision: 92a7b3ae2241b862e9bf45e0af3cf53ebdfb0afb
specs:
redcarpet (3.4.0)
GEM
remote: https://rubygems.org/
specs:
- activesupport (4.2.8)
+ activesupport (4.2.10)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
@@ -26,7 +26,7 @@ GEM
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
- chunky_png (1.3.8)
+ chunky_png (1.3.10)
coffee-script (2.4.1)
coffee-script-source
execjs
@@ -47,10 +47,10 @@ GEM
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
erubis (2.7.0)
- eventmachine (1.2.3)
+ eventmachine (1.2.7)
execjs (2.7.0)
- ffi (1.9.18)
- haml (5.0.1)
+ ffi (1.9.25)
+ haml (5.0.4)
temple (>= 0.8.0)
tilt
hike (1.2.3)
@@ -59,7 +59,7 @@ GEM
http_parser.rb (0.6.0)
i18n (0.7.0)
json (2.1.0)
- kramdown (1.13.2)
+ kramdown (1.17.0)
libv8 (3.16.14.19)
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -87,11 +87,10 @@ GEM
rack (>= 1.4.5, < 2.0)
thor (>= 0.15.2, < 2.0)
tilt (~> 1.4.1, < 2.0)
- middleman-livereload (3.1.1)
- em-websocket (>= 0.2.0)
- middleman-core (>= 3.0.2)
- multi_json (~> 1.0)
- rack-livereload
+ middleman-livereload (3.4.6)
+ em-websocket (~> 0.5.1)
+ middleman-core (>= 3.3)
+ rack-livereload (~> 0.3.15)
middleman-sprockets (3.5.0)
middleman-core (>= 3.3)
sprockets (~> 2.12.1)
@@ -100,30 +99,30 @@ GEM
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
- mini_portile2 (2.1.0)
- minitest (5.10.2)
- multi_json (1.12.1)
- nokogiri (1.7.2)
- mini_portile2 (~> 2.1.0)
- padrino-helpers (0.12.8.1)
+ mini_portile2 (2.3.0)
+ minitest (5.11.3)
+ multi_json (1.13.1)
+ nokogiri (1.8.4)
+ mini_portile2 (~> 2.3.0)
+ padrino-helpers (0.12.9)
i18n (~> 0.6, >= 0.6.7)
- padrino-support (= 0.12.8.1)
- tilt (~> 1.4.1)
- padrino-support (0.12.8.1)
+ padrino-support (= 0.12.9)
+ tilt (>= 1.4.1, < 3)
+ padrino-support (0.12.9)
activesupport (>= 3.1)
- rack (1.6.8)
- rack-livereload (0.3.16)
+ rack (1.6.10)
+ rack-livereload (0.3.17)
rack
- rack-test (0.6.3)
- rack (>= 1.0)
+ rack-test (1.0.0)
+ rack (>= 1.0, < 3)
rake (10.3.1)
- rb-fsevent (0.9.8)
- rb-inotify (0.9.8)
- ffi (>= 0.5.0)
+ rb-fsevent (0.10.3)
+ rb-inotify (0.9.10)
+ ffi (>= 0.5.0, < 2)
ref (2.0.0)
- rouge (2.0.7)
- sass (3.4.24)
- sprockets (2.12.4)
+ rouge (3.1.1)
+ sass (3.4.25)
+ sprockets (2.12.5)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
@@ -137,10 +136,10 @@ GEM
therubyracer (0.12.3)
libv8 (~> 3.16.14.15)
ref
- thor (0.19.1)
+ thor (0.20.0)
thread_safe (0.3.6)
tilt (1.4.1)
- tzinfo (1.2.3)
+ tzinfo (1.2.5)
thread_safe (~> 0.1)
uber (0.0.15)
uglifier (2.7.2)
@@ -154,7 +153,7 @@ PLATFORMS
DEPENDENCIES
middleman (~> 3.4.0)
- middleman-livereload (~> 3.1.0)
+ middleman-livereload
middleman-syntax!
rake (= 10.3.1)
redcarpet!
@@ -163,4 +162,4 @@ DEPENDENCIES
wdm (~> 0.1.0)
BUNDLED WITH
- 1.15.1
+ 1.16.1