From aa38a3f4e70c94a85b05d7101ab7813845f638f0 Mon Sep 17 00:00:00 2001 From: "R. Tyler Croy" Date: Fri, 7 Aug 2015 08:24:54 -0700 Subject: [PATCH] Publish of Github pages from Gradle. --- errors/jrubyjar-version-conflict/index.html | 137 ++++++++++++++++++ .../jrubygradle/GemUtils.OverwriteAction.html | 2 +- .../com/github/jrubygradle/GemUtils.html | 2 +- .../github/jrubygradle/GenerateGradleRb.html | 2 +- .../com/github/jrubygradle/JRubyExec.html | 2 +- .../com/github/jrubygradle/JRubyPlugin.html | 2 +- .../jrubygradle/JRubyPluginExtension.html | 2 +- .../com/github/jrubygradle/JRubyPrepare.html | 2 +- .../jrubygradle/internal/GemVersion.html | 2 +- .../internal/GemVersionResolver.html | 2 +- .../internal/JRubyExecDelegate.html | 2 +- .../jrubygradle/internal/JRubyExecTraits.html | 2 +- .../jrubygradle/internal/JRubyExecUtils.html | 2 +- .../github/jrubygradle/jar/JRubyJar.Type.html | 2 +- .../com/github/jrubygradle/jar/JRubyJar.html | 47 +++++- .../jrubygradle/jar/JRubyJarPlugin.html | 2 +- .../jar/internal/JRubyDirInfo.html | 2 +- .../jruby-gradle-jar-plugin/index-all.html | 2 + .../com/github/jrubygradle/war/JRubyWar.html | 2 +- .../jrubygradle/war/JRubyWarPlugin.html | 2 +- news.atom | 15 +- .../08/05/jrubyconfeu-presentation/index.html | 56 ------- news/index.html | 11 -- sitemap.xml | 12 +- 24 files changed, 203 insertions(+), 111 deletions(-) create mode 100644 errors/jrubyjar-version-conflict/index.html delete mode 100644 news/2015/08/05/jrubyconfeu-presentation/index.html diff --git a/errors/jrubyjar-version-conflict/index.html b/errors/jrubyjar-version-conflict/index.html new file mode 100644 index 0000000..3d48ff2 --- /dev/null +++ b/errors/jrubyjar-version-conflict/index.html @@ -0,0 +1,137 @@ + + + + + + +JRubyJar JRubyExec conflict on jrubyVersion/jrubyMainsVersion + + + + +Fork me on GitHub + + +
+

+JRubyJar JRubyExec conflict on jrubyVersion/jrubyMainsVersion +

+
+

What’s going on?

+
+
+

The +JRubyJar +task allows the user to define a specific version of +JRuby via the jrubyVersion property and a specific +version of the library jruby-mains via the jrubyMainsVersion property. +Changing these versions requires requested version to be added to a dependency +graph. In order to prevent unintentional conflicts in the dependency graph, the +jar plugin will prevent a JRubyJar task from adding a different +JRuby/jruby-mains version to the default jrubyJar +configuration.

+
+
+ + + + + +
+ + +This is effectively the same behavior that JRubyExec exhibits +
+
+
+
+
+

How to fix it

+
+
+

Fixing this behavior is relatively easy, the JRubyJar task which requires its +own custom version of JRuby or jruby-mains to be installed should also use a +custom, user-defined, +configuration. +E.g.

+
+
+
build.gradle
+
+
configurations {
+    backwardsCompat
+}
+
+dependencies {
+    backwardsCompat 'rubygems:sinatra:1.0.0'
+}
+
+task buildLegacyJar(type: JRubyJar) {
+    configuration backwardsCompat
+    jrubyVersion '1.7.19'
+    jrubyMainsVersion '0.2.0'
+}
+
+
+
+

Okay, that didn’t work

+
+

If that work-around didn’t help fix the issue, then you may have encountered an +unknown bug!. Please +file an issue +so we can correct the broken behavior!

+
+
+
+
+
+ +
+
+
    +
  • +

    issue +#168 contains a reported side-effect of this behavior prior to an error +being generated

    +
    • +
+
+
+
+
+
+ + diff --git a/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/GemUtils.OverwriteAction.html b/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/GemUtils.OverwriteAction.html index 2fa7f91..8cc759a 100644 --- a/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/GemUtils.OverwriteAction.html +++ b/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/GemUtils.OverwriteAction.html @@ -6,7 +6,7 @@ - + GemUtils.OverwriteAction (jruby-gradle-base-plugin 1.0.1 API) diff --git a/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/GemUtils.html b/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/GemUtils.html index eff3059..0fbbd9a 100644 --- a/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/GemUtils.html +++ b/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/GemUtils.html @@ -6,7 +6,7 @@ - + GemUtils (jruby-gradle-base-plugin 1.0.1 API) diff --git a/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/GenerateGradleRb.html b/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/GenerateGradleRb.html index 3c7c57f..978c8d0 100644 --- a/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/GenerateGradleRb.html +++ b/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/GenerateGradleRb.html @@ -6,7 +6,7 @@ - + GenerateGradleRb (jruby-gradle-base-plugin 1.0.1 API) diff --git a/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/JRubyExec.html b/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/JRubyExec.html index cace4a2..9b233a7 100644 --- a/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/JRubyExec.html +++ b/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/JRubyExec.html @@ -6,7 +6,7 @@ - + JRubyExec (jruby-gradle-base-plugin 1.0.1 API) diff --git a/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/JRubyPlugin.html b/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/JRubyPlugin.html index 2314b5d..76897cf 100644 --- a/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/JRubyPlugin.html +++ b/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/JRubyPlugin.html @@ -6,7 +6,7 @@ - + JRubyPlugin (jruby-gradle-base-plugin 1.0.1 API) diff --git a/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/JRubyPluginExtension.html b/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/JRubyPluginExtension.html index 3e67198..045d861 100644 --- a/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/JRubyPluginExtension.html +++ b/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/JRubyPluginExtension.html @@ -6,7 +6,7 @@ - + JRubyPluginExtension (jruby-gradle-base-plugin 1.0.1 API) diff --git a/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/JRubyPrepare.html b/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/JRubyPrepare.html index d8bacf7..891ec34 100644 --- a/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/JRubyPrepare.html +++ b/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/JRubyPrepare.html @@ -6,7 +6,7 @@ - + JRubyPrepare (jruby-gradle-base-plugin 1.0.1 API) diff --git a/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/internal/GemVersion.html b/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/internal/GemVersion.html index 347cdc4..f3aa898 100644 --- a/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/internal/GemVersion.html +++ b/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/internal/GemVersion.html @@ -6,7 +6,7 @@ - + GemVersion (jruby-gradle-base-plugin 1.0.1 API) diff --git a/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/internal/GemVersionResolver.html b/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/internal/GemVersionResolver.html index 15b38fa..66ed807 100644 --- a/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/internal/GemVersionResolver.html +++ b/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/internal/GemVersionResolver.html @@ -6,7 +6,7 @@ - + GemVersionResolver (jruby-gradle-base-plugin 1.0.1 API) diff --git a/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/internal/JRubyExecDelegate.html b/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/internal/JRubyExecDelegate.html index a88cf1f..f3feafc 100644 --- a/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/internal/JRubyExecDelegate.html +++ b/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/internal/JRubyExecDelegate.html @@ -6,7 +6,7 @@ - + JRubyExecDelegate (jruby-gradle-base-plugin 1.0.1 API) diff --git a/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/internal/JRubyExecTraits.html b/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/internal/JRubyExecTraits.html index cb0962d..6f62f6a 100644 --- a/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/internal/JRubyExecTraits.html +++ b/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/internal/JRubyExecTraits.html @@ -6,7 +6,7 @@ - + JRubyExecTraits (jruby-gradle-base-plugin 1.0.1 API) diff --git a/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/internal/JRubyExecUtils.html b/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/internal/JRubyExecUtils.html index f114c31..cbd1f93 100644 --- a/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/internal/JRubyExecUtils.html +++ b/groovydoc/jruby-gradle-base-plugin/com/github/jrubygradle/internal/JRubyExecUtils.html @@ -6,7 +6,7 @@ - + JRubyExecUtils (jruby-gradle-base-plugin 1.0.1 API) diff --git a/groovydoc/jruby-gradle-jar-plugin/com/github/jrubygradle/jar/JRubyJar.Type.html b/groovydoc/jruby-gradle-jar-plugin/com/github/jrubygradle/jar/JRubyJar.Type.html index a15df16..85c2dde 100644 --- a/groovydoc/jruby-gradle-jar-plugin/com/github/jrubygradle/jar/JRubyJar.Type.html +++ b/groovydoc/jruby-gradle-jar-plugin/com/github/jrubygradle/jar/JRubyJar.Type.html @@ -6,7 +6,7 @@ - + JRubyJar.Type (jruby-gradle-jar-plugin 1.0.1) diff --git a/groovydoc/jruby-gradle-jar-plugin/com/github/jrubygradle/jar/JRubyJar.html b/groovydoc/jruby-gradle-jar-plugin/com/github/jrubygradle/jar/JRubyJar.html index 3056aef..26ba93a 100644 --- a/groovydoc/jruby-gradle-jar-plugin/com/github/jrubygradle/jar/JRubyJar.html +++ b/groovydoc/jruby-gradle-jar-plugin/com/github/jrubygradle/jar/JRubyJar.html @@ -6,7 +6,7 @@ - + JRubyJar (jruby-gradle-jar-plugin 1.0.1) @@ -182,25 +182,30 @@ if (location.href.indexOf('is-external=true') == -1) { static java.lang.String  - DEFAULT_MAIN_CLASS
+ DEFAULT_JRUBY_MAINS
static java.lang.String  - EXTRACTING_MAIN_CLASS
+ DEFAULT_MAIN_CLASS
- java.lang.String  - configuration
+ static java.lang.String  + EXTRACTING_MAIN_CLASS
java.lang.String  - jrubyMainsVersion
+ configuration
+ java.lang.String  + jrubyMainsVersion
+ + + java.lang.String  mainClass
@@ -328,6 +333,11 @@ if (location.href.indexOf('is-external=true') == -1) { updateDependencies()
+ + void + validateTaskConfiguration()
Verify that we are in a good configuration for execution + + @@ -403,6 +413,14 @@ if (location.href.indexOf('is-external=true') == -1) { + + + diff --git a/groovydoc/jruby-gradle-jar-plugin/com/github/jrubygradle/jar/JRubyJarPlugin.html b/groovydoc/jruby-gradle-jar-plugin/com/github/jrubygradle/jar/JRubyJarPlugin.html index b753d38..4e29e19 100644 --- a/groovydoc/jruby-gradle-jar-plugin/com/github/jrubygradle/jar/JRubyJarPlugin.html +++ b/groovydoc/jruby-gradle-jar-plugin/com/github/jrubygradle/jar/JRubyJarPlugin.html @@ -6,7 +6,7 @@ - + JRubyJarPlugin (jruby-gradle-jar-plugin 1.0.1) diff --git a/groovydoc/jruby-gradle-jar-plugin/com/github/jrubygradle/jar/internal/JRubyDirInfo.html b/groovydoc/jruby-gradle-jar-plugin/com/github/jrubygradle/jar/internal/JRubyDirInfo.html index 7ef4e51..f48eebc 100644 --- a/groovydoc/jruby-gradle-jar-plugin/com/github/jrubygradle/jar/internal/JRubyDirInfo.html +++ b/groovydoc/jruby-gradle-jar-plugin/com/github/jrubygradle/jar/internal/JRubyDirInfo.html @@ -6,7 +6,7 @@ - + JRubyDirInfo (jruby-gradle-jar-plugin 1.0.1) diff --git a/groovydoc/jruby-gradle-jar-plugin/index-all.html b/groovydoc/jruby-gradle-jar-plugin/index-all.html index e76dcb2..8ec9a8f 100644 --- a/groovydoc/jruby-gradle-jar-plugin/index-all.html +++ b/groovydoc/jruby-gradle-jar-plugin/index-all.html @@ -311,6 +311,8 @@ if (location.href.indexOf('is-external=true') == -1) {

V

+
validateTaskConfiguration() - Method in JRubyJar +
Verify that we are in a good configuration for execution
diff --git a/groovydoc/jruby-gradle-war-plugin/com/github/jrubygradle/war/JRubyWar.html b/groovydoc/jruby-gradle-war-plugin/com/github/jrubygradle/war/JRubyWar.html index 1302e76..f031409 100644 --- a/groovydoc/jruby-gradle-war-plugin/com/github/jrubygradle/war/JRubyWar.html +++ b/groovydoc/jruby-gradle-war-plugin/com/github/jrubygradle/war/JRubyWar.html @@ -6,7 +6,7 @@ - + JRubyWar (jruby-gradle-war-plugin 1.0.1-alpha API) diff --git a/groovydoc/jruby-gradle-war-plugin/com/github/jrubygradle/war/JRubyWarPlugin.html b/groovydoc/jruby-gradle-war-plugin/com/github/jrubygradle/war/JRubyWarPlugin.html index cdfaaa8..82dd254 100644 --- a/groovydoc/jruby-gradle-war-plugin/com/github/jrubygradle/war/JRubyWarPlugin.html +++ b/groovydoc/jruby-gradle-war-plugin/com/github/jrubygradle/war/JRubyWarPlugin.html @@ -6,7 +6,7 @@ - + JRubyWarPlugin (jruby-gradle-war-plugin 1.0.1-alpha API) diff --git a/news.atom b/news.atom index 84d7b37..81eb0cd 100644 --- a/news.atom +++ b/news.atom @@ -1,23 +1,10 @@ http://jruby-gradle.org/ JRuby/Gradle News -2015-08-04T04:53:54-07:00 +2015-08-06T11:08:31-07:00 -http://jruby-gradle.org/news/2015/08/05/jrubyconfeu-presentation/ -{"Presentation"=>"JRuby/Gradle at JRubyConf EU 2015"} -2015-08-04T04:53:54-07:00 -2015-08-05T00:00:00+00:00 - - -... - - - - - - http://jruby-gradle.org/news/2015/08/04/jrubygradle-one-point-oh/ JRuby/Gradle 1.0 Announced 2015-08-06T11:08:31-07:00 diff --git a/news/2015/08/05/jrubyconfeu-presentation/index.html b/news/2015/08/05/jrubyconfeu-presentation/index.html deleted file mode 100644 index 03d6410..0000000 --- a/news/2015/08/05/jrubyconfeu-presentation/index.html +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - -{"Presentation"=>"JRuby/Gradle at JRubyConf EU 2015"} - - - - -Fork me on GitHub - - -
-

-{"Presentation"=>"JRuby/Gradle at JRubyConf EU 2015"} -

- -
-
- - diff --git a/news/index.html b/news/index.html index 7729afa..cabb7ad 100644 --- a/news/index.html +++ b/news/index.html @@ -51,17 +51,6 @@ JRuby/Gradle News

-{"Presentation"=>"JRuby/Gradle at JRubyConf EU 2015"} -

- -05 August 2015 - -
- -
-
-
-

JRuby/Gradle 1.0 Announced

diff --git a/sitemap.xml b/sitemap.xml index da6bb7d..efc6c15 100644 --- a/sitemap.xml +++ b/sitemap.xml @@ -48,6 +48,12 @@ never +http://jruby-gradle.org/errors/jrubyjar-version-conflict/ +2015-08-07 +0.1 +never + + http://jruby-gradle.org/examples/basic-topology.gradle 2015-08-07 0.1 @@ -90,12 +96,6 @@ never -http://jruby-gradle.org/news/2015/08/05/jrubyconfeu-presentation/ -2015-08-05 -0.1 -never - - http://jruby-gradle.org/news/ 2015-08-07 0.1