Resolve cherry-pick conflict
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/958a68e5 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/958a68e5 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/958a68e5 Branch: refs/heads/5.3 Commit: 958a68e5e004ac516c267c9f9697aebd213e3ba8 Parents: c5600a8 Author: Howard M. Lewis Ship <[email protected]> Authored: Tue Aug 21 10:13:43 2012 -0700 Committer: Howard M. Lewis Ship <[email protected]> Committed: Tue Aug 21 10:13:43 2012 -0700 ---------------------------------------------------------------------- tapestry-yuicompressor/build.gradle | 19 +------------------ 1 files changed, 1 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/958a68e5/tapestry-yuicompressor/build.gradle ---------------------------------------------------------------------- diff --git a/tapestry-yuicompressor/build.gradle b/tapestry-yuicompressor/build.gradle index 25c83c4..8b6917b 100644 --- a/tapestry-yuicompressor/build.gradle +++ b/tapestry-yuicompressor/build.gradle @@ -2,7 +2,7 @@ description = "Integrates YUI Compressor to minimize JavaScript and CSS resource dependencies { compile project(':tapestry-core') - compile "com.google.code.maven-play-plugin.com.yahoo.platform.yui:yuicompressor:2.4.7" + compile "com.yahoo.platform.yui:yuicompressor:2.4.7" testCompile project(':tapestry-test') } @@ -11,23 +11,6 @@ repositories { mavenRepo name: "Maven Play Plugin", url: "http://maven-play-plugin.googlecode.com/svn/mavenrepo/releases"; } -uploadPublished { - repositories { - mavenDeployer { - pom.project { - repositories { - repository { - id "maven-play-plugin" - name "Maven Play Plugin" - url "http://maven-play-plugin.googlecode.com/svn/mavenrepo/releases"; - } - } - } - } - } -} - - jar { manifest { attributes 'Tapestry-Module-Classes': 'org.apache.tapestry5.yuicompressor.services.YuiCompressorModule'
