diff --git a/README.adoc b/README.adoc index f32a38fa..9c8dc043 100644 --- a/README.adoc +++ b/README.adoc @@ -30,6 +30,56 @@ ____ compile 'org.springframework.rewrite:spring-rewrite-commons-launcher:{projectVersion}' ---- +=== Select Parser +Currently, different ways to parse projects and execute recipes exist. +They all fulfill specific needs or fill gaps of other implementations. + +==== `RewriteProjectParser` +WARNING: This implementation is affected by . + +Use MavenCli to parse a Maven project and a customized parser to create the OpenRewrite LST. +This implementation allows for customizations and provides access to OpenRewrite LST. + +==== `OpenRewriteProjectParser` +WARNING: This implementation is affected by and . + +Use MavenCli to parse Maven projects and instantiate OpenRewrite's `MAvenMojoProjectParser`. +The parser provides access to OpenRewrite's LST. +This implementation uses as much code as possible from OpenRewrite and Maven being the closest to the execution of OpenRewrite recipes inside OR's Maven plugin. + +==== `OpenRewriteRecipeLauncher` +Use Maven Invoker to run OpenRewrite recipes in a separate process like from command line but started from inside a Java application. +It + + +[plantuml,"models",svg] +..... + +class OpenRewritePluginLauncher + +class RewriteProjectParser + +class FlexRewriteProjectParser + +class ProjectResourceSet + +component srcMaven as "src-maven" { + component srcMavenInvoker as "src-maven-invoker" { + } + component srcMavenEmbedder as "src-maven-embedder" { + } +} + +component srcGradle as "src-gradle" { + component srcGradleModel as "src-gradle-model" { + } + component srcGradleParser as "src-gradle-parser" { + } + component srcGradlePlugin as "src-gradle-plugin" { + } +} +} +..... === Implement a Recipe Launcher diff --git a/pom.xml b/pom.xml index 7a00c973..e018b561 100644 --- a/pom.xml +++ b/pom.xml @@ -18,6 +18,9 @@ spring-rewrite-commons-starters spring-rewrite-commons-gradle spring-rewrite-commons-plugin-invoker + spring-rewrite-commons-test + spring-rewrite-commons-utils + spring-rewrite-commons-maven-embedder @@ -33,19 +36,20 @@ 3.2.1 8.13.4 - 1.8.4 - 1.8.11 + 1.10.0 + 1.9.2 5.20.0 2.3.1 8.4 - 3.9.1 + 3.9.6 3.2.0 3.4.2 - 1.9.13 + 1.9.18 + 3.9.6 3.5.3 - 1.8 + 2.0 2.1.0 @@ -129,9 +133,75 @@ rewrite-core ${rewrite.version} + + org.springframework.rewrite + spring-rewrite-commons-test + ${project.version} + + + org.apache.maven + maven-embedder + ${maven-embedder.version} + + + org.codehaus.plexus + plexus-component-annotations + + + + org.apache.maven.shared + maven-shared-utils + + + org.sonatype.plexus + plexus-cipher + + + + + org.apache.maven.shared + maven-invoker + ${maven-invoker.version} + + + org.apache.maven.shared + maven-shared-utils + + + + + org.apache.maven + maven-core + ${maven.version} + + + + org.apache.maven.shared + maven-shared-utils + + + + + + org.openrewrite + rewrite-bom + ${rewrite.version} + pom + + + @@ -239,6 +309,7 @@ limitations under the License. + **/CLIReportingUtils.java **/internal/** **/demo/** **/.sdkmanrc @@ -272,6 +343,66 @@ limitations under the License. + + org.apache.maven.plugins + maven-enforcer-plugin + 3.3.0 + + + enforce + + enforce + + + + + + org.jetbrains:annotations + org.ow2.asm:asm + + javax.annotation:javax.annotation-api + + org.codehaus.plexus:plexus-utils + org.codehaus.plexus:plexus-classworlds + com.google.guava:guava + org.xerial.snappy:snappy-java + org.ow2.asm:asm-util + + commons-io:commons-io + + + + + + + diff --git a/spring-rewrite-commons-docs/src/main/antora/modules/ROOT/pages/index.adoc b/spring-rewrite-commons-docs/src/main/antora/modules/ROOT/pages/index.adoc index 05c74274..bb931d94 100644 --- a/spring-rewrite-commons-docs/src/main/antora/modules/ROOT/pages/index.adoc +++ b/spring-rewrite-commons-docs/src/main/antora/modules/ROOT/pages/index.adoc @@ -43,15 +43,7 @@ All examples can be found file://spring-rewrite-commons-examples[here]. == Limitations The project has currently some limitations. -. Only JDK 17 supported and required -. No Gradle support. + - OpenRewrite provides a build tool plugin for Gradle projects. - This project currently only parses Maven projects. -. No Kotlin support. + -OpenRewrite can parse other languages than Java, especially Kotlin. This is not yet supported. -. Inherited version will just be read from direct parent. Meaning a version from a parent with distance > 1 will be empty (`null`) -. Maven profiles are currently ignored and 'default' profile is used -. Styles are not supported + -OpenRewrite styles are currently not supported. -. Migrating projects for Maven plugins might fail + -Maven plugin projects (modules) are currently ignored when building the reactor order. \ No newline at end of file +. JDK 17 is a requirement +. Kotlin is not supported. +. Styles are not supported +. Migrating projects for Maven plugins might fail \ No newline at end of file diff --git a/spring-rewrite-commons-docs/src/main/antora/modules/ROOT/pages/testing.adoc b/spring-rewrite-commons-docs/src/main/antora/modules/ROOT/pages/testing.adoc index 44129a82..35e71ac3 100644 --- a/spring-rewrite-commons-docs/src/main/antora/modules/ROOT/pages/testing.adoc +++ b/spring-rewrite-commons-docs/src/main/antora/modules/ROOT/pages/testing.adoc @@ -5,6 +5,32 @@ The `RewriteProjectParser` == Test Helper === TestProjectHelper + +The `TestProjectHelper` allows reading test projects from disk or to create them in memory. + +==== Clone a Git Repository +[source,java] +.... + +.toAbsolutePath().normalize(); +TestProjectHelper.createTestProject(projectRoot) + .deleteDirIfExists() + .cloneGitProject("https://github.com/corona-warn-app/cwa-server.git") + .checkoutTag("v3.2.0") + .writeToFilesystem(); +.... + +==== Read a project from testcode dir + +Projects used for testing can be provided in a `testcode` directory. +Maven projects are read from `testcode/maven-projects`. + +Example: Get Path to `./testcode/maven-projects/my-test-project`: +[source, java] +.... +Path baseDir = TestProjectHelper.TestProjectHelper.getMavenProject("my-test-project"); +.... + === ParserParityTestHelper === ParserExecutionHelper === RewriteMavenProjectParser diff --git a/spring-rewrite-commons-docs/src/main/asciidoc/aiclient.adoc b/spring-rewrite-commons-docs/src/main/asciidoc/aiclient.adoc deleted file mode 100644 index d418dcae..00000000 --- a/spring-rewrite-commons-docs/src/main/asciidoc/aiclient.adoc +++ /dev/null @@ -1,15 +0,0 @@ -:toc: left -:toclevels: 4 - -[[configureClient]] -== Configuring an `AiClient` - -include::attributes.adoc[] - -TBD - -[[usingAiClient]] -=== Using AiClient - -TBD - diff --git a/spring-rewrite-commons-docs/src/main/asciidoc/attributes.adoc b/spring-rewrite-commons-docs/src/main/asciidoc/attributes.adoc deleted file mode 100644 index e8007dfd..00000000 --- a/spring-rewrite-commons-docs/src/main/asciidoc/attributes.adoc +++ /dev/null @@ -1 +0,0 @@ -:ai-asciidoc: ./ diff --git a/spring-rewrite-commons-docs/src/main/asciidoc/domain.adoc b/spring-rewrite-commons-docs/src/main/asciidoc/domain.adoc deleted file mode 100644 index a3c1d8b2..00000000 --- a/spring-rewrite-commons-docs/src/main/asciidoc/domain.adoc +++ /dev/null @@ -1,19 +0,0 @@ -:toc: left -:toclevels: 4 - -[[domainLanguageOfAi]] -== The Domain Language of AI - -include::attributes.adoc[] - -TBD - - -=== Prompt - -TBD - - -==== AiClient - -TBD diff --git a/spring-rewrite-commons-docs/src/main/asciidoc/footer/index-footer.adoc b/spring-rewrite-commons-docs/src/main/asciidoc/footer/index-footer.adoc deleted file mode 100644 index 5351a739..00000000 --- a/spring-rewrite-commons-docs/src/main/asciidoc/footer/index-footer.adoc +++ /dev/null @@ -1,9 +0,0 @@ -''' -Mark Pollack - -Copyright © 2023 VMware, Inc. All Rights Reserved. - -Copies of this document may be made for your own use and for -distribution to others, provided that you do not charge any fee for such -copies and further provided that each copy contains this Copyright -Notice, whether distributed in print or electronically. diff --git a/spring-rewrite-commons-docs/src/main/asciidoc/glossary.adoc b/spring-rewrite-commons-docs/src/main/asciidoc/glossary.adoc deleted file mode 100644 index 55835e76..00000000 --- a/spring-rewrite-commons-docs/src/main/asciidoc/glossary.adoc +++ /dev/null @@ -1,6 +0,0 @@ -[[glossary]] -[appendix] -== Glossary - -[glossary] -=== Spring AI Glossary diff --git a/spring-rewrite-commons-docs/src/main/asciidoc/header/index-header.adoc b/spring-rewrite-commons-docs/src/main/asciidoc/header/index-header.adoc deleted file mode 100644 index 0fcf3f29..00000000 --- a/spring-rewrite-commons-docs/src/main/asciidoc/header/index-header.adoc +++ /dev/null @@ -1 +0,0 @@ -= Spring AI - Reference Documentation diff --git a/spring-rewrite-commons-docs/src/main/asciidoc/index-single.adoc b/spring-rewrite-commons-docs/src/main/asciidoc/index-single.adoc deleted file mode 100644 index 893e64f9..00000000 --- a/spring-rewrite-commons-docs/src/main/asciidoc/index-single.adoc +++ /dev/null @@ -1,20 +0,0 @@ -:doctype: book -:toc: left -:toclevels: 4 -:sectnums: - -include::attributes.adoc[] - -include::header/index-header.adoc[] - -include::toggle.adoc[] - -include::spring-ai-intro.adoc[] - -include::domain.adoc[] - -include::prompt.adoc[] - -include::aiclient.adoc[] - -include::glossary.adoc[] diff --git a/spring-rewrite-commons-docs/src/main/asciidoc/index.adoc b/spring-rewrite-commons-docs/src/main/asciidoc/index.adoc deleted file mode 100644 index 85a42953..00000000 --- a/spring-rewrite-commons-docs/src/main/asciidoc/index.adoc +++ /dev/null @@ -1,27 +0,0 @@ -include::attributes.adoc[] - -include::header/index-header.adoc[] - -// ====================================================================================== - -This documentation is also available -as a link:index-single.html[single HTML file] and as link:../pdf/spring-ai-reference.pdf[PDF] -and link:../epub/spring-ai-reference.epub[EPUB] documents. - -The reference documentation is divided into several sections: - -[horizontal] -<> :: Background, usage - scenarios, and general guidelines. -<> :: Core concepts and abstractions -of the AI domain language. -<> :: Prompt creation. -<> :: AiClient configuration and execution. - -The following appendices are available: - -[horizontal] -<> :: Glossary of common terms, concepts, and vocabulary of -the AI domain. - -include::footer/index-footer.adoc[] diff --git a/spring-rewrite-commons-docs/src/main/asciidoc/js/DocumentToggle.js b/spring-rewrite-commons-docs/src/main/asciidoc/js/DocumentToggle.js deleted file mode 100644 index c2941f35..00000000 --- a/spring-rewrite-commons-docs/src/main/asciidoc/js/DocumentToggle.js +++ /dev/null @@ -1,76 +0,0 @@ -$(document).ready(function(){ - - var BATCH_LANGUAGES = ["java", "xml", "both"]; - var $xmlButton = $("#xmlButton"); - var $javaButton = $("#javaButton"); - var $bothButton = $("#bothButton"); - - var $xmlContent = $("*.xmlContent"); - var $xmlContentAll = $("*.xmlContent > *"); - - var $javaContent = $("*.javaContent"); - var $javaContentAll = $("*.javaContent > *"); - - // Initial cookie handler. This part remembers the - // reader's choice and sets the toggle accordingly. - var lang = window.localStorage.getItem("docToggle"); - if (BATCH_LANGUAGES.indexOf(lang) === -1) { - lang = "java"; - $javaButton.prop("checked", true); - setJava(); - } else { - if (lang === "xml") { - $xmlButton.prop("checked", true); - setXml(); - } - if (lang === "java") { - $javaButton.prop("checked", true); - setJava(); - } - if (lang === "both") { - $javaButton.prop("checked", true); - setBoth(); - } - } - - // Click handlers - $xmlButton.on("click", function() { - setXml(); - }); - $javaButton.on("click", function() { - setJava(); - }); - $bothButton.on("click", function() { - setBoth(); - }); - - // Functions to do the work of handling the reader's choice, whether through a click - // or through a cookie. 3652 days is 10 years, give or take a leap day. - function setXml() { - $xmlContent.show(); - $javaContent.hide(); - $javaContentAll.addClass("js-toc-ignore"); - $xmlContentAll.removeClass("js-toc-ignore"); - window.dispatchEvent(new Event("tocRefresh")); - window.localStorage.setItem('docToggle', 'xml'); - } - - function setJava() { - $javaContent.show(); - $xmlContent.hide(); - $xmlContentAll.addClass("js-toc-ignore"); - $javaContentAll.removeClass("js-toc-ignore"); - window.dispatchEvent(new Event("tocRefresh")); - window.localStorage.setItem('docToggle', 'java'); - } - - function setBoth() { - $javaContent.show(); - $xmlContent.show(); - $javaContentAll.removeClass("js-toc-ignore"); - $xmlContentAll.removeClass("js-toc-ignore"); - window.dispatchEvent(new Event("tocRefresh")); - window.localStorage.setItem('docToggle', 'both'); - } - -}); diff --git a/spring-rewrite-commons-docs/src/main/asciidoc/js/Redirect.js b/spring-rewrite-commons-docs/src/main/asciidoc/js/Redirect.js deleted file mode 100644 index e69de29b..00000000 diff --git a/spring-rewrite-commons-docs/src/main/asciidoc/js/jquery-3.2.1.min.js b/spring-rewrite-commons-docs/src/main/asciidoc/js/jquery-3.2.1.min.js deleted file mode 100644 index 644d35e2..00000000 --- a/spring-rewrite-commons-docs/src/main/asciidoc/js/jquery-3.2.1.min.js +++ /dev/null @@ -1,4 +0,0 @@ -/*! jQuery v3.2.1 | (c) JS Foundation and other contributors | jquery.org/license */ -!function(a,b){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){"use strict";var c=[],d=a.document,e=Object.getPrototypeOf,f=c.slice,g=c.concat,h=c.push,i=c.indexOf,j={},k=j.toString,l=j.hasOwnProperty,m=l.toString,n=m.call(Object),o={};function p(a,b){b=b||d;var c=b.createElement("script");c.text=a,b.head.appendChild(c).parentNode.removeChild(c)}var q="3.2.1",r=function(a,b){return new r.fn.init(a,b)},s=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,t=/^-ms-/,u=/-([a-z])/g,v=function(a,b){return b.toUpperCase()};r.fn=r.prototype={jquery:q,constructor:r,length:0,toArray:function(){return f.call(this)},get:function(a){return null==a?f.call(this):a<0?this[a+this.length]:this[a]},pushStack:function(a){var b=r.merge(this.constructor(),a);return b.prevObject=this,b},each:function(a){return r.each(this,a)},map:function(a){return this.pushStack(r.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(f.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(a<0?b:0);return this.pushStack(c>=0&&c0&&b-1 in a)}var x=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ha(),z=ha(),A=ha(),B=function(a,b){return a===b&&(l=!0),0},C={}.hasOwnProperty,D=[],E=D.pop,F=D.push,G=D.push,H=D.slice,I=function(a,b){for(var c=0,d=a.length;c+~]|"+K+")"+K+"*"),S=new RegExp("="+K+"*([^\\]'\"]*?)"+K+"*\\]","g"),T=new RegExp(N),U=new RegExp("^"+L+"$"),V={ID:new RegExp("^#("+L+")"),CLASS:new RegExp("^\\.("+L+")"),TAG:new RegExp("^("+L+"|[*])"),ATTR:new RegExp("^"+M),PSEUDO:new RegExp("^"+N),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+K+"*(even|odd|(([+-]|)(\\d*)n|)"+K+"*(?:([+-]|)"+K+"*(\\d+)|))"+K+"*\\)|)","i"),bool:new RegExp("^(?:"+J+")$","i"),needsContext:new RegExp("^"+K+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+K+"*((?:-\\d)?\\d*)"+K+"*\\)|)(?=[^-]|$)","i")},W=/^(?:input|select|textarea|button)$/i,X=/^h\d$/i,Y=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,$=/[+~]/,_=new RegExp("\\\\([\\da-f]{1,6}"+K+"?|("+K+")|.)","ig"),aa=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:d<0?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},ba=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ca=function(a,b){return b?"\0"===a?"\ufffd":a.slice(0,-1)+"\\"+a.charCodeAt(a.length-1).toString(16)+" ":"\\"+a},da=function(){m()},ea=ta(function(a){return a.disabled===!0&&("form"in a||"label"in a)},{dir:"parentNode",next:"legend"});try{G.apply(D=H.call(v.childNodes),v.childNodes),D[v.childNodes.length].nodeType}catch(fa){G={apply:D.length?function(a,b){F.apply(a,H.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function ga(a,b,d,e){var f,h,j,k,l,o,r,s=b&&b.ownerDocument,w=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==w&&9!==w&&11!==w)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==w&&(l=Z.exec(a)))if(f=l[1]){if(9===w){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(s&&(j=s.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(l[2])return G.apply(d,b.getElementsByTagName(a)),d;if((f=l[3])&&c.getElementsByClassName&&b.getElementsByClassName)return G.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==w)s=b,r=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(ba,ca):b.setAttribute("id",k=u),o=g(a),h=o.length;while(h--)o[h]="#"+k+" "+sa(o[h]);r=o.join(","),s=$.test(a)&&qa(b.parentNode)||b}if(r)try{return G.apply(d,s.querySelectorAll(r)),d}catch(x){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(P,"$1"),b,d,e)}function ha(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ia(a){return a[u]=!0,a}function ja(a){var b=n.createElement("fieldset");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ka(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function la(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&a.sourceIndex-b.sourceIndex;if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function na(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function oa(a){return function(b){return"form"in b?b.parentNode&&b.disabled===!1?"label"in b?"label"in b.parentNode?b.parentNode.disabled===a:b.disabled===a:b.isDisabled===a||b.isDisabled!==!a&&ea(b)===a:b.disabled===a:"label"in b&&b.disabled===a}}function pa(a){return ia(function(b){return b=+b,ia(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function qa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=ga.support={},f=ga.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return!!b&&"HTML"!==b.nodeName},m=ga.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),v!==n&&(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ja(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ja(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Y.test(n.getElementsByClassName),c.getById=ja(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.getElementsByName(u).length}),c.getById?(d.filter.ID=function(a){var b=a.replace(_,aa);return function(a){return a.getAttribute("id")===b}},d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c?[c]:[]}}):(d.filter.ID=function(a){var b=a.replace(_,aa);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}},d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c,d,e,f=b.getElementById(a);if(f){if(c=f.getAttributeNode("id"),c&&c.value===a)return[f];e=b.getElementsByName(a),d=0;while(f=e[d++])if(c=f.getAttributeNode("id"),c&&c.value===a)return[f]}return[]}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){if("undefined"!=typeof b.getElementsByClassName&&p)return b.getElementsByClassName(a)},r=[],q=[],(c.qsa=Y.test(n.querySelectorAll))&&(ja(function(a){o.appendChild(a).innerHTML="",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+K+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+K+"*(?:value|"+J+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ja(function(a){a.innerHTML="";var b=n.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+K+"*[*^$|!~]?="),2!==a.querySelectorAll(":enabled").length&&q.push(":enabled",":disabled"),o.appendChild(a).disabled=!0,2!==a.querySelectorAll(":disabled").length&&q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=Y.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ja(function(a){c.disconnectedMatch=s.call(a,"*"),s.call(a,"[s!='']:x"),r.push("!=",N)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Y.test(o.compareDocumentPosition),t=b||Y.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===n||a.ownerDocument===v&&t(v,a)?-1:b===n||b.ownerDocument===v&&t(v,b)?1:k?I(k,a)-I(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?I(k,a)-I(k,b):0;if(e===f)return la(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?la(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},ga.matches=function(a,b){return ga(a,null,null,b)},ga.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(S,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!r||!r.test(b))&&(!q||!q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return ga(b,n,null,[a]).length>0},ga.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},ga.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&C.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},ga.escape=function(a){return(a+"").replace(ba,ca)},ga.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},ga.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=ga.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=ga.selectors={cacheLength:50,createPseudo:ia,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(_,aa),a[3]=(a[3]||a[4]||a[5]||"").replace(_,aa),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||ga.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&ga.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return V.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&T.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(_,aa).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+K+")"+a+"("+K+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=ga.attr(d,a);return null==e?"!="===b:!b||(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(O," ")+" ").indexOf(c)>-1:"|="===b&&(e===c||e.slice(0,c.length+1)===c+"-"))}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||ga.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ia(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=I(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ia(function(a){var b=[],c=[],d=h(a.replace(P,"$1"));return d[u]?ia(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ia(function(a){return function(b){return ga(a,b).length>0}}),contains:ia(function(a){return a=a.replace(_,aa),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ia(function(a){return U.test(a||"")||ga.error("unsupported lang: "+a),a=a.replace(_,aa).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:oa(!1),disabled:oa(!0),checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return X.test(a.nodeName)},input:function(a){return W.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:pa(function(){return[0]}),last:pa(function(a,b){return[b-1]}),eq:pa(function(a,b,c){return[c<0?c+b:c]}),even:pa(function(a,b){for(var c=0;c=0;)a.push(d);return a}),gt:pa(function(a,b,c){for(var d=c<0?c+b:c;++d1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function va(a,b,c){for(var d=0,e=b.length;d-1&&(f[j]=!(g[j]=l))}}else r=wa(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):G.apply(g,r)})}function ya(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ta(function(a){return a===b},h,!0),l=ta(function(a){return I(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];i1&&ua(m),i>1&&sa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(P,"$1"),c,i0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=E.call(i));u=wa(u)}G.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&ga.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ia(f):f}return h=ga.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=ya(b[c]),f[u]?d.push(f):e.push(f);f=A(a,za(e,d)),f.selector=a}return f},i=ga.select=function(a,b,c,e){var f,i,j,k,l,m="function"==typeof a&&a,n=!e&&g(a=m.selector||a);if(c=c||[],1===n.length){if(i=n[0]=n[0].slice(0),i.length>2&&"ID"===(j=i[0]).type&&9===b.nodeType&&p&&d.relative[i[1].type]){if(b=(d.find.ID(j.matches[0].replace(_,aa),b)||[])[0],!b)return c;m&&(b=b.parentNode),a=a.slice(i.shift().value.length)}f=V.needsContext.test(a)?0:i.length;while(f--){if(j=i[f],d.relative[k=j.type])break;if((l=d.find[k])&&(e=l(j.matches[0].replace(_,aa),$.test(i[0].type)&&qa(b.parentNode)||b))){if(i.splice(f,1),a=e.length&&sa(i),!a)return G.apply(c,e),c;break}}}return(m||h(a,n))(e,b,!p,c,!b||$.test(a)&&qa(b.parentNode)||b),c},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ja(function(a){return 1&a.compareDocumentPosition(n.createElement("fieldset"))}),ja(function(a){return a.innerHTML="","#"===a.firstChild.getAttribute("href")})||ka("type|href|height|width",function(a,b,c){if(!c)return a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ja(function(a){return a.innerHTML="",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ka("value",function(a,b,c){if(!c&&"input"===a.nodeName.toLowerCase())return a.defaultValue}),ja(function(a){return null==a.getAttribute("disabled")})||ka(J,function(a,b,c){var d;if(!c)return a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),ga}(a);r.find=x,r.expr=x.selectors,r.expr[":"]=r.expr.pseudos,r.uniqueSort=r.unique=x.uniqueSort,r.text=x.getText,r.isXMLDoc=x.isXML,r.contains=x.contains,r.escapeSelector=x.escape;var y=function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&r(a).is(c))break;d.push(a)}return d},z=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},A=r.expr.match.needsContext;function B(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()}var C=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i,D=/^.[^:#\[\.,]*$/;function E(a,b,c){return r.isFunction(b)?r.grep(a,function(a,d){return!!b.call(a,d,a)!==c}):b.nodeType?r.grep(a,function(a){return a===b!==c}):"string"!=typeof b?r.grep(a,function(a){return i.call(b,a)>-1!==c}):D.test(b)?r.filter(b,a,c):(b=r.filter(b,a),r.grep(a,function(a){return i.call(b,a)>-1!==c&&1===a.nodeType}))}r.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?r.find.matchesSelector(d,a)?[d]:[]:r.find.matches(a,r.grep(b,function(a){return 1===a.nodeType}))},r.fn.extend({find:function(a){var b,c,d=this.length,e=this;if("string"!=typeof a)return this.pushStack(r(a).filter(function(){for(b=0;b1?r.uniqueSort(c):c},filter:function(a){return this.pushStack(E(this,a||[],!1))},not:function(a){return this.pushStack(E(this,a||[],!0))},is:function(a){return!!E(this,"string"==typeof a&&A.test(a)?r(a):a||[],!1).length}});var F,G=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/,H=r.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||F,"string"==typeof a){if(e="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:G.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof r?b[0]:b,r.merge(this,r.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),C.test(e[1])&&r.isPlainObject(b))for(e in b)r.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}return f=d.getElementById(e[2]),f&&(this[0]=f,this.length=1),this}return a.nodeType?(this[0]=a,this.length=1,this):r.isFunction(a)?void 0!==c.ready?c.ready(a):a(r):r.makeArray(a,this)};H.prototype=r.fn,F=r(d);var I=/^(?:parents|prev(?:Until|All))/,J={children:!0,contents:!0,next:!0,prev:!0};r.fn.extend({has:function(a){var b=r(a,this),c=b.length;return this.filter(function(){for(var a=0;a-1:1===c.nodeType&&r.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?r.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?i.call(r(a),this[0]):i.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(r.uniqueSort(r.merge(this.get(),r(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function K(a,b){while((a=a[b])&&1!==a.nodeType);return a}r.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return y(a,"parentNode")},parentsUntil:function(a,b,c){return y(a,"parentNode",c)},next:function(a){return K(a,"nextSibling")},prev:function(a){return K(a,"previousSibling")},nextAll:function(a){return y(a,"nextSibling")},prevAll:function(a){return y(a,"previousSibling")},nextUntil:function(a,b,c){return y(a,"nextSibling",c)},prevUntil:function(a,b,c){return y(a,"previousSibling",c)},siblings:function(a){return z((a.parentNode||{}).firstChild,a)},children:function(a){return z(a.firstChild)},contents:function(a){return B(a,"iframe")?a.contentDocument:(B(a,"template")&&(a=a.content||a),r.merge([],a.childNodes))}},function(a,b){r.fn[a]=function(c,d){var e=r.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=r.filter(d,e)),this.length>1&&(J[a]||r.uniqueSort(e),I.test(a)&&e.reverse()),this.pushStack(e)}});var L=/[^\x20\t\r\n\f]+/g;function M(a){var b={};return r.each(a.match(L)||[],function(a,c){b[c]=!0}),b}r.Callbacks=function(a){a="string"==typeof a?M(a):r.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=e||a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h-1)f.splice(c,1),c<=h&&h--}),this},has:function(a){return a?r.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=g=[],c||b||(f=c=""),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j};function N(a){return a}function O(a){throw a}function P(a,b,c,d){var e;try{a&&r.isFunction(e=a.promise)?e.call(a).done(b).fail(c):a&&r.isFunction(e=a.then)?e.call(a,b,c):b.apply(void 0,[a].slice(d))}catch(a){c.apply(void 0,[a])}}r.extend({Deferred:function(b){var c=[["notify","progress",r.Callbacks("memory"),r.Callbacks("memory"),2],["resolve","done",r.Callbacks("once memory"),r.Callbacks("once memory"),0,"resolved"],["reject","fail",r.Callbacks("once memory"),r.Callbacks("once memory"),1,"rejected"]],d="pending",e={state:function(){return d},always:function(){return f.done(arguments).fail(arguments),this},"catch":function(a){return e.then(null,a)},pipe:function(){var a=arguments;return r.Deferred(function(b){r.each(c,function(c,d){var e=r.isFunction(a[d[4]])&&a[d[4]];f[d[1]](function(){var a=e&&e.apply(this,arguments);a&&r.isFunction(a.promise)?a.promise().progress(b.notify).done(b.resolve).fail(b.reject):b[d[0]+"With"](this,e?[a]:arguments)})}),a=null}).promise()},then:function(b,d,e){var f=0;function g(b,c,d,e){return function(){var h=this,i=arguments,j=function(){var a,j;if(!(b=f&&(d!==O&&(h=void 0,i=[a]),c.rejectWith(h,i))}};b?k():(r.Deferred.getStackHook&&(k.stackTrace=r.Deferred.getStackHook()),a.setTimeout(k))}}return r.Deferred(function(a){c[0][3].add(g(0,a,r.isFunction(e)?e:N,a.notifyWith)),c[1][3].add(g(0,a,r.isFunction(b)?b:N)),c[2][3].add(g(0,a,r.isFunction(d)?d:O))}).promise()},promise:function(a){return null!=a?r.extend(a,e):e}},f={};return r.each(c,function(a,b){var g=b[2],h=b[5];e[b[1]]=g.add,h&&g.add(function(){d=h},c[3-a][2].disable,c[0][2].lock),g.add(b[3].fire),f[b[0]]=function(){return f[b[0]+"With"](this===f?void 0:this,arguments),this},f[b[0]+"With"]=g.fireWith}),e.promise(f),b&&b.call(f,f),f},when:function(a){var b=arguments.length,c=b,d=Array(c),e=f.call(arguments),g=r.Deferred(),h=function(a){return function(c){d[a]=this,e[a]=arguments.length>1?f.call(arguments):c,--b||g.resolveWith(d,e)}};if(b<=1&&(P(a,g.done(h(c)).resolve,g.reject,!b),"pending"===g.state()||r.isFunction(e[c]&&e[c].then)))return g.then();while(c--)P(e[c],h(c),g.reject);return g.promise()}});var Q=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;r.Deferred.exceptionHook=function(b,c){a.console&&a.console.warn&&b&&Q.test(b.name)&&a.console.warn("jQuery.Deferred exception: "+b.message,b.stack,c)},r.readyException=function(b){a.setTimeout(function(){throw b})};var R=r.Deferred();r.fn.ready=function(a){return R.then(a)["catch"](function(a){r.readyException(a)}),this},r.extend({isReady:!1,readyWait:1,ready:function(a){(a===!0?--r.readyWait:r.isReady)||(r.isReady=!0,a!==!0&&--r.readyWait>0||R.resolveWith(d,[r]))}}),r.ready.then=R.then;function S(){d.removeEventListener("DOMContentLoaded",S), -a.removeEventListener("load",S),r.ready()}"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll?a.setTimeout(r.ready):(d.addEventListener("DOMContentLoaded",S),a.addEventListener("load",S));var T=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===r.type(c)){e=!0;for(h in c)T(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,r.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(r(a),c)})),b))for(;h1,null,!0)},removeData:function(a){return this.each(function(){X.remove(this,a)})}}),r.extend({queue:function(a,b,c){var d;if(a)return b=(b||"fx")+"queue",d=W.get(a,b),c&&(!d||Array.isArray(c)?d=W.access(a,b,r.makeArray(c)):d.push(c)),d||[]},dequeue:function(a,b){b=b||"fx";var c=r.queue(a,b),d=c.length,e=c.shift(),f=r._queueHooks(a,b),g=function(){r.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return W.get(a,c)||W.access(a,c,{empty:r.Callbacks("once memory").add(function(){W.remove(a,[b+"queue",c])})})}}),r.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length\x20\t\r\n\f]+)/i,la=/^$|\/(?:java|ecma)script/i,ma={option:[1,""],thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};ma.optgroup=ma.option,ma.tbody=ma.tfoot=ma.colgroup=ma.caption=ma.thead,ma.th=ma.td;function na(a,b){var c;return c="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):[],void 0===b||b&&B(a,b)?r.merge([a],c):c}function oa(a,b){for(var c=0,d=a.length;c-1)e&&e.push(f);else if(j=r.contains(f.ownerDocument,f),g=na(l.appendChild(f),"script"),j&&oa(g),c){k=0;while(f=g[k++])la.test(f.type||"")&&c.push(f)}return l}!function(){var a=d.createDocumentFragment(),b=a.appendChild(d.createElement("div")),c=d.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),o.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="",o.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var ra=d.documentElement,sa=/^key/,ta=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,ua=/^([^.]*)(?:\.(.+)|)/;function va(){return!0}function wa(){return!1}function xa(){try{return d.activeElement}catch(a){}}function ya(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)ya(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=wa;else if(!e)return a;return 1===f&&(g=e,e=function(a){return r().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=r.guid++)),a.each(function(){r.event.add(this,b,e,d,c)})}r.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=W.get(a);if(q){c.handler&&(f=c,c=f.handler,e=f.selector),e&&r.find.matchesSelector(ra,e),c.guid||(c.guid=r.guid++),(i=q.events)||(i=q.events={}),(g=q.handle)||(g=q.handle=function(b){return"undefined"!=typeof r&&r.event.triggered!==b.type?r.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(L)||[""],j=b.length;while(j--)h=ua.exec(b[j])||[],n=p=h[1],o=(h[2]||"").split(".").sort(),n&&(l=r.event.special[n]||{},n=(e?l.delegateType:l.bindType)||n,l=r.event.special[n]||{},k=r.extend({type:n,origType:p,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&r.expr.match.needsContext.test(e),namespace:o.join(".")},f),(m=i[n])||(m=i[n]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,o,g)!==!1||a.addEventListener&&a.addEventListener(n,g)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),r.event.global[n]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=W.hasData(a)&&W.get(a);if(q&&(i=q.events)){b=(b||"").match(L)||[""],j=b.length;while(j--)if(h=ua.exec(b[j])||[],n=p=h[1],o=(h[2]||"").split(".").sort(),n){l=r.event.special[n]||{},n=(d?l.delegateType:l.bindType)||n,m=i[n]||[],h=h[2]&&new RegExp("(^|\\.)"+o.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&p!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,o,q.handle)!==!1||r.removeEvent(a,n,q.handle),delete i[n])}else for(n in i)r.event.remove(a,n+b[j],c,d,!0);r.isEmptyObject(i)&&W.remove(a,"handle events")}},dispatch:function(a){var b=r.event.fix(a),c,d,e,f,g,h,i=new Array(arguments.length),j=(W.get(this,"events")||{})[b.type]||[],k=r.event.special[b.type]||{};for(i[0]=b,c=1;c=1))for(;j!==this;j=j.parentNode||this)if(1===j.nodeType&&("click"!==a.type||j.disabled!==!0)){for(f=[],g={},c=0;c-1:r.find(e,this,null,[j]).length),g[e]&&f.push(d);f.length&&h.push({elem:j,handlers:f})}return j=this,i\x20\t\r\n\f]*)[^>]*)\/>/gi,Aa=/\s*$/g;function Ea(a,b){return B(a,"table")&&B(11!==b.nodeType?b:b.firstChild,"tr")?r(">tbody",a)[0]||a:a}function Fa(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function Ga(a){var b=Ca.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Ha(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(W.hasData(a)&&(f=W.access(a),g=W.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;c1&&"string"==typeof q&&!o.checkClone&&Ba.test(q))return a.each(function(e){var f=a.eq(e);s&&(b[0]=q.call(this,e,f.html())),Ja(f,b,c,d)});if(m&&(e=qa(b,a[0].ownerDocument,!1,a,d),f=e.firstChild,1===e.childNodes.length&&(e=f),f||d)){for(h=r.map(na(e,"script"),Fa),i=h.length;l")},clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=r.contains(a.ownerDocument,a);if(!(o.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||r.isXMLDoc(a)))for(g=na(h),f=na(a),d=0,e=f.length;d0&&oa(g,!i&&na(a,"script")),h},cleanData:function(a){for(var b,c,d,e=r.event.special,f=0;void 0!==(c=a[f]);f++)if(U(c)){if(b=c[W.expando]){if(b.events)for(d in b.events)e[d]?r.event.remove(c,d):r.removeEvent(c,d,b.handle);c[W.expando]=void 0}c[X.expando]&&(c[X.expando]=void 0)}}}),r.fn.extend({detach:function(a){return Ka(this,a,!0)},remove:function(a){return Ka(this,a)},text:function(a){return T(this,function(a){return void 0===a?r.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=a)})},null,a,arguments.length)},append:function(){return Ja(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ea(this,a);b.appendChild(a)}})},prepend:function(){return Ja(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ea(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return Ja(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return Ja(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(r.cleanData(na(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null!=a&&a,b=null==b?a:b,this.map(function(){return r.clone(this,a,b)})},html:function(a){return T(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!Aa.test(a)&&!ma[(ka.exec(a)||["",""])[1].toLowerCase()]){a=r.htmlPrefilter(a);try{for(;c1)}});function _a(a,b,c,d,e){return new _a.prototype.init(a,b,c,d,e)}r.Tween=_a,_a.prototype={constructor:_a,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||r.easing._default,this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(r.cssNumber[c]?"":"px")},cur:function(){var a=_a.propHooks[this.prop];return a&&a.get?a.get(this):_a.propHooks._default.get(this)},run:function(a){var b,c=_a.propHooks[this.prop];return this.options.duration?this.pos=b=r.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):_a.propHooks._default.set(this),this}},_a.prototype.init.prototype=_a.prototype,_a.propHooks={_default:{get:function(a){var b;return 1!==a.elem.nodeType||null!=a.elem[a.prop]&&null==a.elem.style[a.prop]?a.elem[a.prop]:(b=r.css(a.elem,a.prop,""),b&&"auto"!==b?b:0)},set:function(a){r.fx.step[a.prop]?r.fx.step[a.prop](a):1!==a.elem.nodeType||null==a.elem.style[r.cssProps[a.prop]]&&!r.cssHooks[a.prop]?a.elem[a.prop]=a.now:r.style(a.elem,a.prop,a.now+a.unit)}}},_a.propHooks.scrollTop=_a.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},r.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2},_default:"swing"},r.fx=_a.prototype.init,r.fx.step={};var ab,bb,cb=/^(?:toggle|show|hide)$/,db=/queueHooks$/;function eb(){bb&&(d.hidden===!1&&a.requestAnimationFrame?a.requestAnimationFrame(eb):a.setTimeout(eb,r.fx.interval),r.fx.tick())}function fb(){return a.setTimeout(function(){ab=void 0}),ab=r.now()}function gb(a,b){var c,d=0,e={height:a};for(b=b?1:0;d<4;d+=2-b)c=ca[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function hb(a,b,c){for(var d,e=(kb.tweeners[b]||[]).concat(kb.tweeners["*"]),f=0,g=e.length;f1)},removeAttr:function(a){return this.each(function(){r.removeAttr(this,a)})}}),r.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return"undefined"==typeof a.getAttribute?r.prop(a,b,c):(1===f&&r.isXMLDoc(a)||(e=r.attrHooks[b.toLowerCase()]||(r.expr.match.bool.test(b)?lb:void 0)),void 0!==c?null===c?void r.removeAttr(a,b):e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:(a.setAttribute(b,c+""),c):e&&"get"in e&&null!==(d=e.get(a,b))?d:(d=r.find.attr(a,b), -null==d?void 0:d))},attrHooks:{type:{set:function(a,b){if(!o.radioValue&&"radio"===b&&B(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}},removeAttr:function(a,b){var c,d=0,e=b&&b.match(L);if(e&&1===a.nodeType)while(c=e[d++])a.removeAttribute(c)}}),lb={set:function(a,b,c){return b===!1?r.removeAttr(a,c):a.setAttribute(c,c),c}},r.each(r.expr.match.bool.source.match(/\w+/g),function(a,b){var c=mb[b]||r.find.attr;mb[b]=function(a,b,d){var e,f,g=b.toLowerCase();return d||(f=mb[g],mb[g]=e,e=null!=c(a,b,d)?g:null,mb[g]=f),e}});var nb=/^(?:input|select|textarea|button)$/i,ob=/^(?:a|area)$/i;r.fn.extend({prop:function(a,b){return T(this,r.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[r.propFix[a]||a]})}}),r.extend({prop:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return 1===f&&r.isXMLDoc(a)||(b=r.propFix[b]||b,e=r.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=r.find.attr(a,"tabindex");return b?parseInt(b,10):nb.test(a.nodeName)||ob.test(a.nodeName)&&a.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),o.optSelected||(r.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null},set:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}}),r.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){r.propFix[this.toLowerCase()]=this});function pb(a){var b=a.match(L)||[];return b.join(" ")}function qb(a){return a.getAttribute&&a.getAttribute("class")||""}r.fn.extend({addClass:function(a){var b,c,d,e,f,g,h,i=0;if(r.isFunction(a))return this.each(function(b){r(this).addClass(a.call(this,b,qb(this)))});if("string"==typeof a&&a){b=a.match(L)||[];while(c=this[i++])if(e=qb(c),d=1===c.nodeType&&" "+pb(e)+" "){g=0;while(f=b[g++])d.indexOf(" "+f+" ")<0&&(d+=f+" ");h=pb(d),e!==h&&c.setAttribute("class",h)}}return this},removeClass:function(a){var b,c,d,e,f,g,h,i=0;if(r.isFunction(a))return this.each(function(b){r(this).removeClass(a.call(this,b,qb(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof a&&a){b=a.match(L)||[];while(c=this[i++])if(e=qb(c),d=1===c.nodeType&&" "+pb(e)+" "){g=0;while(f=b[g++])while(d.indexOf(" "+f+" ")>-1)d=d.replace(" "+f+" "," ");h=pb(d),e!==h&&c.setAttribute("class",h)}}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):r.isFunction(a)?this.each(function(c){r(this).toggleClass(a.call(this,c,qb(this),b),b)}):this.each(function(){var b,d,e,f;if("string"===c){d=0,e=r(this),f=a.match(L)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else void 0!==a&&"boolean"!==c||(b=qb(this),b&&W.set(this,"__className__",b),this.setAttribute&&this.setAttribute("class",b||a===!1?"":W.get(this,"__className__")||""))})},hasClass:function(a){var b,c,d=0;b=" "+a+" ";while(c=this[d++])if(1===c.nodeType&&(" "+pb(qb(c))+" ").indexOf(b)>-1)return!0;return!1}});var rb=/\r/g;r.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=r.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,r(this).val()):a,null==e?e="":"number"==typeof e?e+="":Array.isArray(e)&&(e=r.map(e,function(a){return null==a?"":a+""})),b=r.valHooks[this.type]||r.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=r.valHooks[e.type]||r.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(rb,""):null==c?"":c)}}}),r.extend({valHooks:{option:{get:function(a){var b=r.find.attr(a,"value");return null!=b?b:pb(r.text(a))}},select:{get:function(a){var b,c,d,e=a.options,f=a.selectedIndex,g="select-one"===a.type,h=g?null:[],i=g?f+1:e.length;for(d=f<0?i:g?f:0;d-1)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),r.each(["radio","checkbox"],function(){r.valHooks[this]={set:function(a,b){if(Array.isArray(b))return a.checked=r.inArray(r(a).val(),b)>-1}},o.checkOn||(r.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var sb=/^(?:focusinfocus|focusoutblur)$/;r.extend(r.event,{trigger:function(b,c,e,f){var g,h,i,j,k,m,n,o=[e||d],p=l.call(b,"type")?b.type:b,q=l.call(b,"namespace")?b.namespace.split("."):[];if(h=i=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!sb.test(p+r.event.triggered)&&(p.indexOf(".")>-1&&(q=p.split("."),p=q.shift(),q.sort()),k=p.indexOf(":")<0&&"on"+p,b=b[r.expando]?b:new r.Event(p,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=q.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:r.makeArray(c,[b]),n=r.event.special[p]||{},f||!n.trigger||n.trigger.apply(e,c)!==!1)){if(!f&&!n.noBubble&&!r.isWindow(e)){for(j=n.delegateType||p,sb.test(j+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),i=h;i===(e.ownerDocument||d)&&o.push(i.defaultView||i.parentWindow||a)}g=0;while((h=o[g++])&&!b.isPropagationStopped())b.type=g>1?j:n.bindType||p,m=(W.get(h,"events")||{})[b.type]&&W.get(h,"handle"),m&&m.apply(h,c),m=k&&h[k],m&&m.apply&&U(h)&&(b.result=m.apply(h,c),b.result===!1&&b.preventDefault());return b.type=p,f||b.isDefaultPrevented()||n._default&&n._default.apply(o.pop(),c)!==!1||!U(e)||k&&r.isFunction(e[p])&&!r.isWindow(e)&&(i=e[k],i&&(e[k]=null),r.event.triggered=p,e[p](),r.event.triggered=void 0,i&&(e[k]=i)),b.result}},simulate:function(a,b,c){var d=r.extend(new r.Event,c,{type:a,isSimulated:!0});r.event.trigger(d,null,b)}}),r.fn.extend({trigger:function(a,b){return this.each(function(){r.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];if(c)return r.event.trigger(a,b,c,!0)}}),r.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(a,b){r.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),r.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),o.focusin="onfocusin"in a,o.focusin||r.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){r.event.simulate(b,a.target,r.event.fix(a))};r.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=W.access(d,b);e||d.addEventListener(a,c,!0),W.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=W.access(d,b)-1;e?W.access(d,b,e):(d.removeEventListener(a,c,!0),W.remove(d,b))}}});var tb=a.location,ub=r.now(),vb=/\?/;r.parseXML=function(b){var c;if(!b||"string"!=typeof b)return null;try{c=(new a.DOMParser).parseFromString(b,"text/xml")}catch(d){c=void 0}return c&&!c.getElementsByTagName("parsererror").length||r.error("Invalid XML: "+b),c};var wb=/\[\]$/,xb=/\r?\n/g,yb=/^(?:submit|button|image|reset|file)$/i,zb=/^(?:input|select|textarea|keygen)/i;function Ab(a,b,c,d){var e;if(Array.isArray(b))r.each(b,function(b,e){c||wb.test(a)?d(a,e):Ab(a+"["+("object"==typeof e&&null!=e?b:"")+"]",e,c,d)});else if(c||"object"!==r.type(b))d(a,b);else for(e in b)Ab(a+"["+e+"]",b[e],c,d)}r.param=function(a,b){var c,d=[],e=function(a,b){var c=r.isFunction(b)?b():b;d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(null==c?"":c)};if(Array.isArray(a)||a.jquery&&!r.isPlainObject(a))r.each(a,function(){e(this.name,this.value)});else for(c in a)Ab(c,a[c],b,e);return d.join("&")},r.fn.extend({serialize:function(){return r.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=r.prop(this,"elements");return a?r.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!r(this).is(":disabled")&&zb.test(this.nodeName)&&!yb.test(a)&&(this.checked||!ja.test(a))}).map(function(a,b){var c=r(this).val();return null==c?null:Array.isArray(c)?r.map(c,function(a){return{name:b.name,value:a.replace(xb,"\r\n")}}):{name:b.name,value:c.replace(xb,"\r\n")}}).get()}});var Bb=/%20/g,Cb=/#.*$/,Db=/([?&])_=[^&]*/,Eb=/^(.*?):[ \t]*([^\r\n]*)$/gm,Fb=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Gb=/^(?:GET|HEAD)$/,Hb=/^\/\//,Ib={},Jb={},Kb="*/".concat("*"),Lb=d.createElement("a");Lb.href=tb.href;function Mb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(L)||[];if(r.isFunction(c))while(d=f[e++])"+"===d[0]?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Nb(a,b,c,d){var e={},f=a===Jb;function g(h){var i;return e[h]=!0,r.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Ob(a,b){var c,d,e=r.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&r.extend(!0,a,d),a}function Pb(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===d&&(d=a.mimeType||b.getResponseHeader("Content-Type"));if(d)for(e in h)if(h[e]&&h[e].test(d)){i.unshift(e);break}if(i[0]in c)f=i[0];else{for(e in c){if(!i[0]||a.converters[e+" "+i[0]]){f=e;break}g||(g=e)}f=f||g}if(f)return f!==i[0]&&i.unshift(f),c[f]}function Qb(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}r.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:tb.href,type:"GET",isLocal:Fb.test(tb.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Kb,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":r.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Ob(Ob(a,r.ajaxSettings),b):Ob(r.ajaxSettings,a)},ajaxPrefilter:Mb(Ib),ajaxTransport:Mb(Jb),ajax:function(b,c){"object"==typeof b&&(c=b,b=void 0),c=c||{};var e,f,g,h,i,j,k,l,m,n,o=r.ajaxSetup({},c),p=o.context||o,q=o.context&&(p.nodeType||p.jquery)?r(p):r.event,s=r.Deferred(),t=r.Callbacks("once memory"),u=o.statusCode||{},v={},w={},x="canceled",y={readyState:0,getResponseHeader:function(a){var b;if(k){if(!h){h={};while(b=Eb.exec(g))h[b[1].toLowerCase()]=b[2]}b=h[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return k?g:null},setRequestHeader:function(a,b){return null==k&&(a=w[a.toLowerCase()]=w[a.toLowerCase()]||a,v[a]=b),this},overrideMimeType:function(a){return null==k&&(o.mimeType=a),this},statusCode:function(a){var b;if(a)if(k)y.always(a[y.status]);else for(b in a)u[b]=[u[b],a[b]];return this},abort:function(a){var b=a||x;return e&&e.abort(b),A(0,b),this}};if(s.promise(y),o.url=((b||o.url||tb.href)+"").replace(Hb,tb.protocol+"//"),o.type=c.method||c.type||o.method||o.type,o.dataTypes=(o.dataType||"*").toLowerCase().match(L)||[""],null==o.crossDomain){j=d.createElement("a");try{j.href=o.url,j.href=j.href,o.crossDomain=Lb.protocol+"//"+Lb.host!=j.protocol+"//"+j.host}catch(z){o.crossDomain=!0}}if(o.data&&o.processData&&"string"!=typeof o.data&&(o.data=r.param(o.data,o.traditional)),Nb(Ib,o,c,y),k)return y;l=r.event&&o.global,l&&0===r.active++&&r.event.trigger("ajaxStart"),o.type=o.type.toUpperCase(),o.hasContent=!Gb.test(o.type),f=o.url.replace(Cb,""),o.hasContent?o.data&&o.processData&&0===(o.contentType||"").indexOf("application/x-www-form-urlencoded")&&(o.data=o.data.replace(Bb,"+")):(n=o.url.slice(f.length),o.data&&(f+=(vb.test(f)?"&":"?")+o.data,delete o.data),o.cache===!1&&(f=f.replace(Db,"$1"),n=(vb.test(f)?"&":"?")+"_="+ub++ +n),o.url=f+n),o.ifModified&&(r.lastModified[f]&&y.setRequestHeader("If-Modified-Since",r.lastModified[f]),r.etag[f]&&y.setRequestHeader("If-None-Match",r.etag[f])),(o.data&&o.hasContent&&o.contentType!==!1||c.contentType)&&y.setRequestHeader("Content-Type",o.contentType),y.setRequestHeader("Accept",o.dataTypes[0]&&o.accepts[o.dataTypes[0]]?o.accepts[o.dataTypes[0]]+("*"!==o.dataTypes[0]?", "+Kb+"; q=0.01":""):o.accepts["*"]);for(m in o.headers)y.setRequestHeader(m,o.headers[m]);if(o.beforeSend&&(o.beforeSend.call(p,y,o)===!1||k))return y.abort();if(x="abort",t.add(o.complete),y.done(o.success),y.fail(o.error),e=Nb(Jb,o,c,y)){if(y.readyState=1,l&&q.trigger("ajaxSend",[y,o]),k)return y;o.async&&o.timeout>0&&(i=a.setTimeout(function(){y.abort("timeout")},o.timeout));try{k=!1,e.send(v,A)}catch(z){if(k)throw z;A(-1,z)}}else A(-1,"No Transport");function A(b,c,d,h){var j,m,n,v,w,x=c;k||(k=!0,i&&a.clearTimeout(i),e=void 0,g=h||"",y.readyState=b>0?4:0,j=b>=200&&b<300||304===b,d&&(v=Pb(o,y,d)),v=Qb(o,v,y,j),j?(o.ifModified&&(w=y.getResponseHeader("Last-Modified"),w&&(r.lastModified[f]=w),w=y.getResponseHeader("etag"),w&&(r.etag[f]=w)),204===b||"HEAD"===o.type?x="nocontent":304===b?x="notmodified":(x=v.state,m=v.data,n=v.error,j=!n)):(n=x,!b&&x||(x="error",b<0&&(b=0))),y.status=b,y.statusText=(c||x)+"",j?s.resolveWith(p,[m,x,y]):s.rejectWith(p,[y,x,n]),y.statusCode(u),u=void 0,l&&q.trigger(j?"ajaxSuccess":"ajaxError",[y,o,j?m:n]),t.fireWith(p,[y,x]),l&&(q.trigger("ajaxComplete",[y,o]),--r.active||r.event.trigger("ajaxStop")))}return y},getJSON:function(a,b,c){return r.get(a,b,c,"json")},getScript:function(a,b){return r.get(a,void 0,b,"script")}}),r.each(["get","post"],function(a,b){r[b]=function(a,c,d,e){return r.isFunction(c)&&(e=e||d,d=c,c=void 0),r.ajax(r.extend({url:a,type:b,dataType:e,data:c,success:d},r.isPlainObject(a)&&a))}}),r._evalUrl=function(a){return r.ajax({url:a,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},r.fn.extend({wrapAll:function(a){var b;return this[0]&&(r.isFunction(a)&&(a=a.call(this[0])),b=r(a,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstElementChild)a=a.firstElementChild;return a}).append(this)),this},wrapInner:function(a){return r.isFunction(a)?this.each(function(b){r(this).wrapInner(a.call(this,b))}):this.each(function(){var b=r(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=r.isFunction(a);return this.each(function(c){r(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(a){return this.parent(a).not("body").each(function(){r(this).replaceWith(this.childNodes)}),this}}),r.expr.pseudos.hidden=function(a){return!r.expr.pseudos.visible(a)},r.expr.pseudos.visible=function(a){return!!(a.offsetWidth||a.offsetHeight||a.getClientRects().length)},r.ajaxSettings.xhr=function(){try{return new a.XMLHttpRequest}catch(b){}};var Rb={0:200,1223:204},Sb=r.ajaxSettings.xhr();o.cors=!!Sb&&"withCredentials"in Sb,o.ajax=Sb=!!Sb,r.ajaxTransport(function(b){var c,d;if(o.cors||Sb&&!b.crossDomain)return{send:function(e,f){var g,h=b.xhr();if(h.open(b.type,b.url,b.async,b.username,b.password),b.xhrFields)for(g in b.xhrFields)h[g]=b.xhrFields[g];b.mimeType&&h.overrideMimeType&&h.overrideMimeType(b.mimeType),b.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest");for(g in e)h.setRequestHeader(g,e[g]);c=function(a){return function(){c&&(c=d=h.onload=h.onerror=h.onabort=h.onreadystatechange=null,"abort"===a?h.abort():"error"===a?"number"!=typeof h.status?f(0,"error"):f(h.status,h.statusText):f(Rb[h.status]||h.status,h.statusText,"text"!==(h.responseType||"text")||"string"!=typeof h.responseText?{binary:h.response}:{text:h.responseText},h.getAllResponseHeaders()))}},h.onload=c(),d=h.onerror=c("error"),void 0!==h.onabort?h.onabort=d:h.onreadystatechange=function(){4===h.readyState&&a.setTimeout(function(){c&&d()})},c=c("abort");try{h.send(b.hasContent&&b.data||null)}catch(i){if(c)throw i}},abort:function(){c&&c()}}}),r.ajaxPrefilter(function(a){a.crossDomain&&(a.contents.script=!1)}),r.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(a){return r.globalEval(a),a}}}),r.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),r.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(e,f){b=r(" - - - -
- - - -
- -+++ -endif::backend-spring-html[] diff --git a/spring-rewrite-commons-examples/boot-3-upgrade-atomic-example/pom.xml b/spring-rewrite-commons-examples/boot-3-upgrade-atomic-example/pom.xml index 34036eff..b81b0777 100644 --- a/spring-rewrite-commons-examples/boot-3-upgrade-atomic-example/pom.xml +++ b/spring-rewrite-commons-examples/boot-3-upgrade-atomic-example/pom.xml @@ -20,7 +20,6 @@ 17 17 UTF-8 - 3.1.3 diff --git a/spring-rewrite-commons-functional-tests/dependency-resolution-tests/pom.xml b/spring-rewrite-commons-functional-tests/dependency-resolution-tests/pom.xml index a0b0bb90..3cfa1c88 100644 --- a/spring-rewrite-commons-functional-tests/dependency-resolution-tests/pom.xml +++ b/spring-rewrite-commons-functional-tests/dependency-resolution-tests/pom.xml @@ -28,19 +28,6 @@ org.openrewrite rewrite-java - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.rewrite - spring-rewrite-commons-launcher - test - test-jar - 0.1.0-SNAPSHOT - test - \ No newline at end of file diff --git a/spring-rewrite-commons-functional-tests/pom.xml b/spring-rewrite-commons-functional-tests/pom.xml index 9df71749..80afa0cc 100644 --- a/spring-rewrite-commons-functional-tests/pom.xml +++ b/spring-rewrite-commons-functional-tests/pom.xml @@ -32,7 +32,6 @@ UTF-8 - 3.1.3 2.6.2 @@ -53,6 +52,21 @@ import - + + + + org.springframework.rewrite + spring-rewrite-commons-test + test + + + org.springframework.rewrite + spring-rewrite-commons-launcher + test + test-jar + 0.1.0-SNAPSHOT + test + + \ No newline at end of file diff --git a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/pom.xml b/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/pom.xml index 58172e7e..82c37f39 100644 --- a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/pom.xml +++ b/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/pom.xml @@ -18,16 +18,13 @@ org.springframework.rewrite - spring-rewrite-commons-launcher - 0.1.0-SNAPSHOT + spring-rewrite-commons-maven-embedder + ${project.version} org.springframework.rewrite spring-rewrite-commons-launcher - test - test-jar - 0.1.0-SNAPSHOT - test + ${project.version} @@ -169,7 +166,6 @@ 2.11.3 test - \ No newline at end of file diff --git a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/src/test/java/org/springframework/sbm/PrivateArtifactRepositoryTest.java b/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/src/test/java/org/springframework/sbm/PrivateArtifactRepositoryTest.java index 620c17d5..8af71caf 100644 --- a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/src/test/java/org/springframework/sbm/PrivateArtifactRepositoryTest.java +++ b/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/src/test/java/org/springframework/sbm/PrivateArtifactRepositoryTest.java @@ -15,6 +15,7 @@ */ package org.springframework.sbm; +import groovy.util.logging.Slf4j; import net.lingala.zip4j.ZipFile; import org.apache.maven.shared.invoker.*; import org.junit.jupiter.api.*; @@ -26,14 +27,16 @@ import org.openrewrite.maven.cache.MavenArtifactCache; import org.openrewrite.maven.tree.MavenRepository; import org.powermock.reflect.Whitebox; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.rewrite.RewriteProjectParser; import org.springframework.rewrite.boot.autoconfigure.RewriteLauncherConfiguration; +import org.springframework.rewrite.embedder.MavenExecutor; import org.springframework.rewrite.parser.RewriteProjectParsingResult; -import org.springframework.rewrite.parser.maven.SbmTestConfiguration; import org.springframework.util.FileSystemUtils; import org.testcontainers.containers.GenericContainer; import org.testcontainers.junit.jupiter.Container; @@ -48,6 +51,8 @@ import java.nio.file.Paths; import java.util.Arrays; import java.util.List; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Fail.fail; @@ -87,9 +92,9 @@ * * @author Fabian Krüger */ -@SpringBootTest(classes = { MavenArtifactCacheTestConfig.class, RewriteLauncherConfiguration.class, - SbmTestConfiguration.class }) +@SpringBootTest(classes = { MavenArtifactCacheTestConfig.class, RewriteLauncherConfiguration.class }) @Testcontainers +@Slf4j public class PrivateArtifactRepositoryTest { // All test resources live here @@ -172,7 +177,7 @@ void beforeEach() throws IOException { Integer port = reposilite.getMappedPort(8080); System.out.println("Reposilite: http://localhost:" + port + " login with user:secret"); TestHelper.renderTemplates(port); - TestHelper.clearDependencyFromLocalMavenRepo(); + TestHelper.clearLocalMavenRepo(); } @AfterAll @@ -185,13 +190,29 @@ static void afterAll() { @Test @DisplayName("Maven settings should be read from secured private repo") - void mavenSettingsShouldBeReadFromSecuredPrivateRepo() { + void mavenSettingsShouldBeReadFromSecuredPrivateRepo() throws InterruptedException { verifyDependencyDoesNotExistInLocalMavenRepo(); RewriteProjectParsingResult parsingResult = parseDependentProject(); verifyDependencyExistsInLocalMavenRepo(); verifyTypesFromDependencyWereResolved(parsingResult); } + @Test + @DisplayName("MavenExecutor should read settings") + void mavenExecutorShouldReadSettings() throws InterruptedException { + verifyDependencyDoesNotExistInLocalMavenRepo(); + + Path baseDir = Path.of(TESTCODE_DIR + "/dependent-project"); + CountDownLatch latch = new CountDownLatch(1); + Logger log = LoggerFactory.getLogger(PrivateArtifactRepositoryTest.class); + new MavenExecutor(log, successEvent -> { + latch.countDown(); + }) + .execute(List.of("clean", "install"), baseDir); + latch.await(10, TimeUnit.MINUTES); + verifyDependencyExistsInLocalMavenRepo(); + } + private static void verifyTypesFromDependencyWereResolved(RewriteProjectParsingResult parsingResult) { J.CompilationUnit cu = (J.CompilationUnit) parsingResult.sourceFiles() .stream() @@ -230,8 +251,9 @@ private static void verifyTypesFromDependencyWereResolved(RewriteProjectParsingR private static void verifyDependencyExistsInLocalMavenRepo() { Path snapshotDir = DEPENDENCY_PATH_IN_LOCAL_MAVEN_REPO.resolve("1.0-SNAPSHOT").toAbsolutePath().normalize(); assertThat(snapshotDir).isDirectory(); - assertThat(Arrays.stream(snapshotDir.toFile().listFiles()).map(f -> f.getName()).findFirst().get()) - .matches("dependency-project-1.0-.*\\.jar"); + assertThat(Arrays.stream(snapshotDir.toFile().listFiles()) + .map(f -> f.getName()) + .anyMatch(s -> s.matches("dependency-project-1.0-.*\\.jar"))).isTrue(); } private RewriteProjectParsingResult parseDependentProject() { @@ -287,14 +309,14 @@ private static Path renderPomXml(Integer port, Path pomXmlTmplPath) throws IOExc return Files.writeString(pomXmlPath, replaced); } - static void clearDependencyFromLocalMavenRepo() { - try { - FileSystemUtils.deleteRecursively(DEPENDENCY_PATH_IN_LOCAL_MAVEN_REPO); - } - catch (IOException e) { - throw new RuntimeException(e); - } - } + static void clearLocalMavenRepo() { + FileSystemUtils.deleteRecursively(LOCAL_MAVEN_REPOSITORY); + try { + Files.createDirectories(LOCAL_MAVEN_REPOSITORY.toPath()); + } catch (IOException e) { + throw new RuntimeException(e); + } + } void deployDependency(Path pomXmlPath) throws MavenInvocationException { InvocationRequest request = new DefaultInvocationRequest(); diff --git a/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-model/pom.xml b/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-model/pom.xml index 67da2526..7ca90105 100644 --- a/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-model/pom.xml +++ b/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-model/pom.xml @@ -16,7 +16,7 @@ 17 17 UTF-8 - 1.1.2 + 1.5.0 diff --git a/spring-rewrite-commons-launcher/pom.xml b/spring-rewrite-commons-launcher/pom.xml index b1ceb082..4e97ecbd 100644 --- a/spring-rewrite-commons-launcher/pom.xml +++ b/spring-rewrite-commons-launcher/pom.xml @@ -26,6 +26,11 @@ spring-boot-configuration-processor true + + org.springframework.rewrite + spring-rewrite-commons-maven-embedder + ${project.version} + org.openrewrite rewrite-maven @@ -91,21 +96,12 @@ org.apache.maven maven-embedder - ${maven.version} - - - org.sonatype.plexus - plexus-cipher - - - org.openrewrite.maven rewrite-maven-plugin ${rewrite-maven-plugin.version} - test org.apache.maven.wagon @@ -146,7 +142,6 @@ org.apache.maven.shared maven-invoker - ${maven-invoker.version} test @@ -162,17 +157,11 @@ - org.springframework.boot - spring-boot-starter-test - test - - - org.junit-pioneer - junit-pioneer - ${junit-pioneer.version} - test + org.springframework.rewrite + spring-rewrite-commons-test + com.google.code.findbugs diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/OpenRewriteProjectParser.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/OpenRewriteProjectParser.java new file mode 100644 index 00000000..6c8bccd2 --- /dev/null +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/OpenRewriteProjectParser.java @@ -0,0 +1,196 @@ +/* + * Copyright 2021 - 2023 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.rewrite; + +import org.apache.maven.artifact.DependencyResolutionRequiredException; +import org.apache.maven.execution.MavenSession; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugin.logging.Log; +import org.apache.maven.rtinfo.RuntimeInformation; +import org.apache.maven.settings.crypto.SettingsDecrypter; +import org.codehaus.plexus.PlexusContainer; +import org.codehaus.plexus.component.repository.exception.ComponentLookupException; +import org.openrewrite.ExecutionContext; +import org.openrewrite.SourceFile; +import org.openrewrite.config.Environment; +import org.openrewrite.internal.lang.Nullable; +import org.openrewrite.maven.*; +import org.openrewrite.style.NamedStyles; +import org.slf4j.LoggerFactory; +import org.springframework.rewrite.embedder.MavenExecutor; +import org.springframework.rewrite.embedder.Slf4jToMavenLoggerAdapter; +import org.springframework.rewrite.parser.RewriteProjectParsingResult; +import org.springframework.rewrite.parser.SpringRewriteProperties; +import org.springframework.util.ReflectionUtils; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.nio.file.Path; +import java.util.Collection; +import java.util.List; +import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Stream; + +/** + * @author Fabian Krüger + */ +public class OpenRewriteProjectParser { + + private final SpringRewriteProperties properties; + + private final ExecutionContext executionContext; + + public OpenRewriteProjectParser(SpringRewriteProperties properties, ExecutionContext executionContext) { + this.properties = properties; + this.executionContext = executionContext; + } + + public RewriteProjectParsingResult parse(Path givenBaseDir) { + + AtomicReference> mavenSessionRef = new AtomicReference<>(); + new MavenExecutor(executionEvent -> { + MavenSession mavenSession = executionEvent.getSession(); + Log logger = new Slf4jToMavenLoggerAdapter(LoggerFactory.getLogger("OpenRewriteProjectParser")); + boolean pomCacheEnabled = properties.isPomCacheEnabled(); + @Nullable + String pomCacheDirectory = properties.getPomCacheDirectory(); + Class aClass = RuntimeInformation.class; + RuntimeInformation runtimeInformation = lookup(mavenSession.getContainer(), aClass); + boolean skipMavenParsing = properties.isSkipMavenParsing(); + Collection exclusions = properties.getIgnoredPathPatterns(); + Collection plainTextMasks = properties.getPlainTextMasks(); + int sizeThresholdMb = properties.getSizeThresholdMb(); + SettingsDecrypter settingsDecrypter = lookup(mavenSession.getContainer(), SettingsDecrypter.class); + boolean runPerSubmodule = properties.isRunPerSubmodule(); + boolean parseAdditionalResources = properties.isParseAdditionalResources(); + + MavenMojoProjectParser mojoProjectParser = new MavenMojoProjectParser(logger, givenBaseDir, pomCacheEnabled, + pomCacheDirectory, runtimeInformation, skipMavenParsing, exclusions, plainTextMasks, + sizeThresholdMb, mavenSession, settingsDecrypter, runPerSubmodule, parseAdditionalResources); + FakedRewriteRunMojo fakedRewriteRunMojo = FakedRewriteRunMojo.from(mavenSession); + Environment env = Environment.builder().build(); + try { + // LargeSoruceSet hides access to source files + // LargeSourceSet largeSourceSet = + // fakedRewriteRunMojo.loadSourceSet(givenBaseDir, env, executionContext); + List sourceFiles = fakedRewriteRunMojo.loadSources(givenBaseDir, env, executionContext); + mavenSessionRef.set(sourceFiles); + } + catch (DependencyResolutionRequiredException e) { + throw new RuntimeException(e); + } + catch (MojoExecutionException e) { + throw new RuntimeException(e); + } + }).execute(List.of("clean", "package", "--fail-at-end"), givenBaseDir); + + RewriteProjectParsingResult parsingResult = new RewriteProjectParsingResult(mavenSessionRef.get(), + executionContext); + + return parsingResult; + } + + private static T lookup(PlexusContainer plexusContainer, Class aClass) { + try { + return plexusContainer.lookup(aClass); + } + catch (ComponentLookupException e) { + throw new RuntimeException(e); + } + } + + private static class FakedRewriteRunMojo extends AbstractRewriteDryRunMojo { + + private final MavenSession mavenSession1; + + public FakedRewriteRunMojo(MavenSession mavenSession) { + mavenSession1 = mavenSession; + } + + public static FakedRewriteRunMojo from(MavenSession mavenSession) { + FakedRewriteRunMojo fakedRewriteRunMojo = new FakedRewriteRunMojo(mavenSession); + // project + setField(fakedRewriteRunMojo, "project", mavenSession.getCurrentProject()); + // runtime + PlexusContainer plexusContainer = mavenSession.getContainer(); + RuntimeInformation runtimeInformation = lookup(plexusContainer, RuntimeInformation.class); + setField(fakedRewriteRunMojo, "runtime", runtimeInformation); + setField(fakedRewriteRunMojo, "mavenSession", mavenSession); + setField(fakedRewriteRunMojo, "settingsDecrypter", lookup(plexusContainer, SettingsDecrypter.class)); + return fakedRewriteRunMojo; + } + + private static void setField(FakedRewriteRunMojo fakedRewriteRunMojo, String fieldName, Object value) { + Field project = ReflectionUtils.findField(FakedRewriteRunMojo.class, fieldName); + ReflectionUtils.makeAccessible(project); + ReflectionUtils.setField(project, fakedRewriteRunMojo, value); + } + + @Override + public ResultsContainer listResults(ExecutionContext ctx) { + try { + super.project = mavenSession.getTopLevelProject(); + return super.listResults(ctx); + } + catch (MojoExecutionException e) { + throw new RuntimeException(e); + } + } + + public List loadSources(Path repositoryRoot, Environment env, ExecutionContext ctx) + throws DependencyResolutionRequiredException, MojoExecutionException { + List styles = loadStyles(project, env); + + // Parse and collect source files from each project in the maven session. + MavenMojoProjectParser projectParser = new MavenMojoProjectParser(getLog(), repositoryRoot, pomCacheEnabled, + pomCacheDirectory, runtime, skipMavenParsing, getExclusions(), getPlainTextMasks(), sizeThresholdMb, + mavenSession, settingsDecrypter, runPerSubmodule, true); + + Stream sourceFiles = projectParser.listSourceFiles(project, styles, ctx); + Method m = ReflectionUtils.findMethod(AbstractRewriteMojo.class, "sourcesWithAutoDetectedStyles", + Stream.class); + ReflectionUtils.makeAccessible(m); + List sourceFileList = (List) ReflectionUtils.invokeMethod(m, this, sourceFiles); + return sourceFileList; + } + + } + + /** + * Container for gathered Maven runtime information required for parsing. + */ + private record MavenRuntimeInformation(RuntimeInformation runtimeInformation) { + + public static MavenRuntimeInformation gathering(MavenSession mavenSession) { + + RuntimeInformation runtimeInformation = lookup(mavenSession.getContainer(), RuntimeInformation.class); + + MavenRuntimeInformation mavenRuntimeInformation = new MavenRuntimeInformation(runtimeInformation); + return mavenRuntimeInformation; + } + + private static T lookup(PlexusContainer plexusContainer, Class aClass) { + try { + return plexusContainer.lookup(aClass); + } + catch (ComponentLookupException e) { + throw new RuntimeException(e); + } + } + + } + +} diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/RewriteProjectParser.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/RewriteProjectParser.java index 677d4769..b15ea737 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/RewriteProjectParser.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/RewriteProjectParser.java @@ -15,10 +15,14 @@ */ package org.springframework.rewrite; +import org.apache.maven.execution.ExecutionEvent; +import org.apache.maven.rtinfo.RuntimeInformation; +import org.codehaus.plexus.component.repository.exception.ComponentLookupException; import org.jetbrains.annotations.NotNull; import org.openrewrite.ExecutionContext; import org.openrewrite.SourceFile; import org.openrewrite.marker.Marker; +import org.openrewrite.maven.utilities.MavenArtifactDownloader; import org.openrewrite.style.NamedStyles; import org.openrewrite.tree.ParsingEventListener; import org.openrewrite.tree.ParsingExecutionContextView; @@ -27,21 +31,25 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.context.ApplicationEventPublisher; +import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.Resource; +import org.springframework.rewrite.embedder.MavenExecutor; import org.springframework.rewrite.parser.*; import org.springframework.rewrite.parser.events.StartedParsingProjectEvent; import org.springframework.rewrite.parser.events.SuccessfullyParsedProjectEvent; import org.springframework.rewrite.parser.maven.MavenBuildFileParser; import org.springframework.rewrite.parser.maven.MavenProject; -import org.springframework.rewrite.parser.maven.MavenProjectAnalyzer; +import org.springframework.rewrite.parser.maven.MavenRuntimeInformation; import org.springframework.rewrite.parser.maven.ProvenanceMarkerFactory; import org.springframework.rewrite.scopes.ScanScope; import org.springframework.util.StringUtils; +import java.io.File; import java.nio.file.Path; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.concurrent.atomic.AtomicReference; /** * Project parser parsing resources under a given {@link Path} to OpenRewrite Lossless @@ -92,13 +100,13 @@ public class RewriteProjectParser { private final ExecutionContext executionContext; - private final MavenProjectAnalyzer mavenProjectAnalyzer; + private final MavenArtifactDownloader artifactDownloader; public RewriteProjectParser(ProvenanceMarkerFactory provenanceMarkerFactory, MavenBuildFileParser buildFileParser, SourceFileParser sourceFileParser, StyleDetector styleDetector, SpringRewriteProperties springRewriteProperties, ParsingEventListener parsingEventListener, ApplicationEventPublisher eventPublisher, ScanScope scanScope, ConfigurableListableBeanFactory beanFactory, - ProjectScanner scanner, ExecutionContext executionContext, MavenProjectAnalyzer mavenProjectAnalyzer) { + ProjectScanner scanner, ExecutionContext executionContext, MavenArtifactDownloader artifactDownloader) { this.provenanceMarkerFactory = provenanceMarkerFactory; this.buildFileParser = buildFileParser; this.sourceFileParser = sourceFileParser; @@ -110,7 +118,7 @@ public RewriteProjectParser(ProvenanceMarkerFactory provenanceMarkerFactory, Mav this.beanFactory = beanFactory; this.scanner = scanner; this.executionContext = executionContext; - this.mavenProjectAnalyzer = mavenProjectAnalyzer; + this.artifactDownloader = artifactDownloader; } /** @@ -137,10 +145,28 @@ public RewriteProjectParsingResult parse(Path givenBaseDir, List resou // TODO: See ConfigurableRewriteMojo#getPlainTextMasks() // TODO: where to retrieve styles from? --> see // AbstractRewriteMojo#getActiveStyles() & AbstractRewriteMojo#loadStyles() + + AtomicReference> sourceFilesRef = new AtomicReference<>(); + new MavenExecutor(onSuccess -> { + List sourceFiles = runInMavenSession(onSuccess, baseDir, resources); + sourceFilesRef.set(sourceFiles); + }).execute(List.of("clean", "package", "--fail-at-end"), baseDir); + + return new RewriteProjectParsingResult(sourceFilesRef.get(), executionContext); + } + + private List runInMavenSession(ExecutionEvent executionEvent, Path baseDir, List resources) { List styles = List.of(); - // Get the ordered otherSourceFiles of projects - List sortedProjects = mavenProjectAnalyzer.getBuildProjects(baseDir, resources); + final RuntimeInformation runtimeInformation = getRuntimeInformation(executionEvent); + + List sortedProjects = executionEvent.getSession() + .getProjectDependencyGraph() + .getSortedProjects() + .stream() + .map(p -> this.mavenProjectToMavenProject(p, artifactDownloader, resources, runtimeInformation)) + .toList(); + ParserContext parserContext = new ParserContext(baseDir, resources, sortedProjects); // generate provenance @@ -169,8 +195,35 @@ public RewriteProjectParsingResult parse(Path givenBaseDir, List resou List sourceFiles = styleDetector.sourcesWithAutoDetectedStyles(resultingList.stream()); eventPublisher.publishEvent(new SuccessfullyParsedProjectEvent(sourceFiles)); + return sourceFiles; + } + + private static RuntimeInformation getRuntimeInformation(ExecutionEvent onSuccess) { + RuntimeInformation runtimeInformation; + try { + runtimeInformation = onSuccess.getSession().getContainer().lookup(RuntimeInformation.class); + } + catch (ComponentLookupException e) { + throw new RuntimeException(e); + } + return runtimeInformation; + } - return new RewriteProjectParsingResult(sourceFiles, executionContext); + private MavenProject mavenProjectToMavenProject(org.apache.maven.project.MavenProject mavenProject, + MavenArtifactDownloader artifactDownloader, List resources, + RuntimeInformation runtimeInformation) { + Path baseDir = mavenProject.getBasedir().toPath(); + File file = mavenProject.getExecutionProject().getFile(); + Resource rootPom = new FileSystemResource(file); + + MavenProject newMavenProject = new MavenProject(baseDir, rootPom, artifactDownloader, resources, + new MavenRuntimeInformation(runtimeInformation.getMavenVersion())); + List mavenProjects = mavenProject.getCollectedProjects() + .stream() + .map(p -> this.mavenProjectToMavenProject(p, artifactDownloader, resources, runtimeInformation)) + .toList(); + newMavenProject.setReactorProjects(mavenProjects); + return newMavenProject; } @NotNull diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/RewriteLauncherConfiguration.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/RewriteLauncherConfiguration.java index b5849306..1a97630f 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/RewriteLauncherConfiguration.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/RewriteLauncherConfiguration.java @@ -15,11 +15,14 @@ */ package org.springframework.rewrite.boot.autoconfigure; +import org.openrewrite.ExecutionContext; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Import; +import org.springframework.rewrite.OpenRewriteProjectParser; import org.springframework.rewrite.RewriteRecipeLauncher; import org.springframework.rewrite.RewriteProjectParser; +import org.springframework.rewrite.parser.SpringRewriteProperties; import org.springframework.rewrite.resource.ProjectResourceSetFactory; import org.springframework.rewrite.resource.ProjectResourceSetSerializer; import org.springframework.rewrite.RewriteRecipeDiscovery; @@ -37,4 +40,10 @@ RewriteRecipeLauncher rewriteRecipeLauncher(RewriteProjectParser parser, Rewrite return new RewriteRecipeLauncher(parser, dicovery, resourceSetFactory, deserializer); } + @Bean + OpenRewriteProjectParser openRewriteProjectParser(SpringRewriteProperties properties, + ExecutionContext executionContext) { + return new OpenRewriteProjectParser(properties, executionContext); + } + } diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/ParserContext.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/ParserContext.java index ad5544cc..8feec850 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/ParserContext.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/ParserContext.java @@ -53,8 +53,7 @@ public List getSortedProjects() { } public List getActiveProfiles() { - // FIXME: Add support for Maven profiles - return List.of("default"); + return List.of(); } public Resource getMatchingBuildFileResource(MavenProject pom) { diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/RewriteParserConfiguration.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/RewriteParserConfiguration.java index ba15cf34..cbc4d1b7 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/RewriteParserConfiguration.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/RewriteParserConfiguration.java @@ -101,24 +101,16 @@ ParsingEventListener parsingEventListener(ApplicationEventPublisher eventPublish return new RewriteParsingEventListenerAdapter(eventPublisher); } - @Bean - MavenProjectAnalyzer mavenProjectAnalyzer(MavenArtifactDownloader artifactDownloader) { - MavenProjectGraph mavenProjectGraph = new MavenProjectGraph(); - MavenProjectSorter mavenProjectSorter = new MavenProjectSorter(mavenProjectGraph); - MavenProjectFactory mavenProjectFactory = new MavenProjectFactory(artifactDownloader); - return new MavenProjectAnalyzer(mavenProjectSorter, mavenProjectFactory); - } - @Bean RewriteProjectParser rewriteProjectParser(ProvenanceMarkerFactory provenanceMarkerFactory, MavenBuildFileParser buildFileParser, SourceFileParser sourceFileParser, StyleDetector styleDetector, SpringRewriteProperties springRewriteProperties, ParsingEventListener parsingEventListener, ApplicationEventPublisher eventPublisher, org.springframework.rewrite.scopes.ScanScope scanScope, ConfigurableListableBeanFactory beanFactory, ProjectScanner projectScanner, - ExecutionContext executionContext, MavenProjectAnalyzer mavenProjectAnalyzer) { + ExecutionContext executionContext, MavenArtifactDownloader artifactDownloader) { return new RewriteProjectParser(provenanceMarkerFactory, buildFileParser, sourceFileParser, styleDetector, springRewriteProperties, parsingEventListener, eventPublisher, scanScope, beanFactory, projectScanner, - executionContext, mavenProjectAnalyzer); + executionContext, artifactDownloader); } @Bean diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenPasswordDecrypter.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenPasswordDecrypter.java index 4bbb810d..510b722b 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenPasswordDecrypter.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenPasswordDecrypter.java @@ -39,12 +39,7 @@ class MavenPasswordDecrypter { private final SecDispatcher secDispatcher; public MavenPasswordDecrypter() { - try { - this.secDispatcher = new DefaultSecDispatcher(new DefaultPlexusCipher()); - } - catch (PlexusCipherException e) { - throw new RuntimeException(e); - } + this.secDispatcher = new DefaultSecDispatcher(new DefaultPlexusCipher()); } public void decryptMavenServerPasswords(MavenSettings mavenSettings, Path mavenSecuritySettingsFile) { diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenProject.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenProject.java index c9afe61d..dc947a86 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenProject.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenProject.java @@ -47,6 +47,8 @@ public class MavenProject { private final MavenBuildFile buildFile; + private final MavenRuntimeInformation runtimeInformation; + /** * All {@link MavenProject}s of this build. */ @@ -71,13 +73,15 @@ public class MavenProject { private ProjectId projectId; public MavenProject(Path baseDir, Resource rootPom, MavenArtifactDownloader rewriteMavenArtifactDownloader, - List resources) { - this(baseDir, rootPom, List.of(), rewriteMavenArtifactDownloader, resources); + List resources, MavenRuntimeInformation runtimeInformation) { + this(baseDir, rootPom, List.of(), rewriteMavenArtifactDownloader, resources, runtimeInformation); } public MavenProject(Path baseDir, Resource pomFile, List dependsOnModels, - MavenArtifactDownloader rewriteMavenArtifactDownloader, List resources) { + MavenArtifactDownloader rewriteMavenArtifactDownloader, List resources, + MavenRuntimeInformation runtimeInformation) { this.projectRoot = baseDir; + this.runtimeInformation = runtimeInformation; this.buildFile = new MavenBuildFile(pomFile); if (dependsOnModels != null) { this.dependentProjects.addAll(dependsOnModels); @@ -164,7 +168,7 @@ public Properties getProperties() { public MavenRuntimeInformation getMavenRuntimeInformation() { // FIXME: 945 implement this - return new MavenRuntimeInformation(); + return new MavenRuntimeInformation(runtimeInformation.getMavenVersion()); } public String getName() { diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenProjectAnalyzer.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenProjectAnalyzer.java deleted file mode 100644 index f731bcfd..00000000 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenProjectAnalyzer.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright 2021 - 2023 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.rewrite.parser.maven; - -import org.springframework.core.io.Resource; -import org.springframework.rewrite.utils.LinuxWindowsPathUnifier; - -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; - -/** - * Implements the ordering of Maven (reactor) build projects. See Reactor - * Sorting - * - * @author Fabian Krüger - */ -public class MavenProjectAnalyzer { - - private final MavenProjectSorter mavenProjectSorter; - - private final MavenProjectFactory mavenProjectFactory; - - public MavenProjectAnalyzer(MavenProjectSorter mavenProjectSorter, MavenProjectFactory mavenProjectFactory) { - this.mavenProjectSorter = mavenProjectSorter; - this.mavenProjectFactory = mavenProjectFactory; - } - - public List getBuildProjects(Path baseDir, List resources) { - List allMavenProjects = mavenProjectFactory.create(baseDir, resources); - List mavenProjects = mavenProjectSorter.sort(baseDir, allMavenProjects); - return map(baseDir, resources, mavenProjects); - } - - private List map(Path baseDir, List resources, List sortedModels) { - - List mavenProjects = new ArrayList<>(); - sortedModels.stream().filter(Objects::nonNull).forEach(mavenProject -> { - String projectDir = LinuxWindowsPathUnifier - .unifiedPathString(baseDir.resolve(mavenProject.getModuleDir()).normalize()); - List filteredResources = resources.stream() - .filter(r -> LinuxWindowsPathUnifier.unifiedPathString(r).startsWith(projectDir)) - .toList(); - mavenProjects.add(mavenProject); - }); - // set all non parent poms as collected projects for root parent p - List collected = new ArrayList<>(mavenProjects); - collected.remove(0); - mavenProjects.get(0).setReactorProjects(collected); - return mavenProjects; - } - -} diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenProjectFactory.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenProjectFactory.java index 357375cc..0f38a19c 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenProjectFactory.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenProjectFactory.java @@ -15,6 +15,7 @@ */ package org.springframework.rewrite.parser.maven; +import org.apache.maven.rtinfo.RuntimeInformation; import org.jetbrains.annotations.NotNull; import org.openrewrite.maven.utilities.MavenArtifactDownloader; import org.springframework.core.io.Resource; @@ -33,17 +34,19 @@ public MavenProjectFactory(MavenArtifactDownloader artifactDownloader) { this.artifactDownloader = artifactDownloader; } - public List create(Path baseDir, List projectResources) { + public List create(Path baseDir, List projectResources, + MavenRuntimeInformation runtimeInformation) { List allPomFiles = MavenBuildFileFilter.filterBuildFiles(projectResources); if (allPomFiles.isEmpty()) { throw new IllegalArgumentException("The provided resources did not contain any 'pom.xml' file."); } - return allPomFiles.stream().map(pf -> create(baseDir, pf, projectResources)).toList(); + return allPomFiles.stream().map(pf -> create(baseDir, pf, projectResources, runtimeInformation)).toList(); } @NotNull - public MavenProject create(Path baseDir, Resource pomFile, List projectResources) { - return new MavenProject(baseDir, pomFile, artifactDownloader, projectResources); + public MavenProject create(Path baseDir, Resource pomFile, List projectResources, + MavenRuntimeInformation runtimeInformation) { + return new MavenProject(baseDir, pomFile, artifactDownloader, projectResources, runtimeInformation); } } diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenRuntimeInformation.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenRuntimeInformation.java index 4cf8f0c9..efade82c 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenRuntimeInformation.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenRuntimeInformation.java @@ -15,14 +15,22 @@ */ package org.springframework.rewrite.parser.maven; +import org.apache.maven.rtinfo.RuntimeInformation; + /** * @author Fabian Krüger */ public class MavenRuntimeInformation { + private final String mavenVersion; + + public MavenRuntimeInformation(String mavenVersion) { + + this.mavenVersion = mavenVersion; + } + public String getMavenVersion() { - // FIXME: 945 implement this - return "3.9.1"; + return this.mavenVersion; } } diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenSettingsInitializer.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenSettingsInitializer.java index c4f86997..5c4dc725 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenSettingsInitializer.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenSettingsInitializer.java @@ -59,9 +59,8 @@ public void initializeMavenSettings() { Path mavenSecuritySettingsFile = userHome.resolve(".m2/settings-security.xml"); MavenRepository mavenRepository = new MavenRepository("local", repo, null, null, true, null, null, null); - MavenSettings.Profile defaultProfile = new MavenSettings.Profile("default", null, new RawRepositories()); - MavenSettings.@Nullable Profiles profiles = new MavenSettings.Profiles(List.of(defaultProfile)); - MavenSettings.@Nullable ActiveProfiles activeProfiles = new MavenSettings.ActiveProfiles(List.of("default")); + MavenSettings.@Nullable Profiles profiles = new MavenSettings.Profiles(List.of()); + MavenSettings.@Nullable ActiveProfiles activeProfiles = new MavenSettings.ActiveProfiles(List.of()); MavenSettings.@Nullable Mirrors mirrors = new MavenSettings.Mirrors(); MavenSettings.Servers servers = new MavenSettings.Servers(); MavenSettings mavenSettings = new MavenSettings(repo, mavenRepository, profiles, activeProfiles, mirrors, diff --git a/spring-rewrite-commons-launcher/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-rewrite-commons-launcher/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 612ba6f3..d84c57cd 100644 --- a/spring-rewrite-commons-launcher/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/spring-rewrite-commons-launcher/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -2,5 +2,4 @@ org.springframework.rewrite.boot.autoconfigure.ScopeConfiguration org.springframework.rewrite.parser.RewriteParserConfiguration org.springframework.rewrite.boot.autoconfigure.RecipeDiscoveryConfiguration org.springframework.rewrite.boot.autoconfigure.ProjectResourceSetConfiguration -org.springframework.rewrite.boot.autoconfigure.SpringRewriteCommonsConfiguration org.springframework.rewrite.boot.autoconfigure.RewriteLauncherConfiguration \ No newline at end of file diff --git a/spring-rewrite-commons-launcher/src/test/java/org/openrewrite/maven/CalculateClasspathTest.java b/spring-rewrite-commons-launcher/src/test/java/org/openrewrite/maven/CalculateClasspathTest.java index 219b9290..a2b0fb1e 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/openrewrite/maven/CalculateClasspathTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/openrewrite/maven/CalculateClasspathTest.java @@ -85,7 +85,7 @@ void classpathForSingleModuleProject(@TempDir Path tmpDir) { import javax.validation.constraints.Min; public class MainClass { - @Min("10") + @Min(10) private int value; } """; @@ -102,11 +102,13 @@ void someTest() {} """; Path baseDir = LinuxWindowsPathUnifier.unifiedPath(tmpDir.resolve("example-1").toAbsolutePath().normalize()); - List resources = List.of(new DummyResource(baseDir.resolve("pom.xml"), pom), - new DummyResource(baseDir.resolve("src/main/java/com/example/MainClass.java"), mainClass), - new DummyResource(baseDir.resolve("src/test/java/com/example/TestClass.java"), testClass)); + TestProjectHelper.createTestProject(baseDir) + .addResource("pom.xml", pom) + .addResource("src/main/java/com/example/MainClass.java", mainClass) + .addResource("src/test/java/com/example/TestClass.java", testClass) + .writeToFilesystem(); - RewriteProjectParsingResult parsingResult = parser.parse(baseDir, resources); + RewriteProjectParsingResult parsingResult = parser.parse(baseDir); // verify types in use SourceFile mainSourceFile = parsingResult.sourceFiles().get(1); @@ -116,7 +118,7 @@ void someTest() {} // Having Min annotation resolved proves type resolution is working for main // resources assertThat(mainCu.getTypesInUse().getTypesInUse().stream().map(t -> t.toString())) - .containsExactlyInAnyOrder("int", "String", "javax.validation.constraints.Min"); + .containsExactlyInAnyOrder("int", "javax.validation.constraints.Min"); SourceFile testSourceFile = parsingResult.sourceFiles().get(2); assertThat(testSourceFile).isInstanceOf(J.CompilationUnit.class); diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenExecutorTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/OpenRewriteProjectParserTest.java similarity index 50% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenExecutorTest.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/OpenRewriteProjectParserTest.java index 64169f3f..13508021 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenExecutorTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/OpenRewriteProjectParserTest.java @@ -13,32 +13,31 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parser.maven; +package org.springframework.rewrite; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.rewrite.boot.autoconfigure.RewriteLauncherConfiguration; +import org.springframework.rewrite.test.util.TestProjectHelper; import java.nio.file.Path; -import java.util.List; - -import static org.assertj.core.api.Assertions.assertThat; /** * @author Fabian Krüger */ -class MavenExecutorTest { +@SpringBootTest(classes = RewriteLauncherConfiguration.class) +class OpenRewriteProjectParserTest { + + @Autowired + private OpenRewriteProjectParser sut; @Test - @DisplayName("Verify MavenSession when running in Maven") - void verifyMavenSessionWhenRunningInMaven() { - MavenExecutionRequestFactory requestFactory = new MavenExecutionRequestFactory(new MavenConfigFileParser()); - MavenPlexusContainer containerFactory = new MavenPlexusContainer(); - MavenExecutor sut = new MavenExecutor(requestFactory, containerFactory); - Path baseDir = Path.of("./testcode/maven-projects/maven-config"); - List goals = List.of("clean", "install"); - sut.onProjectSucceededEvent(baseDir, goals, event -> { - assertThat(event.getSession()).isNotNull(); - }); + @DisplayName("test") + void test() { + Path mavenProject = TestProjectHelper.getMavenProject("test1"); + sut.parse(mavenProject); } } \ No newline at end of file diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/CompareParserRecipeRunTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/CompareParserRecipeRunTest.java index 6f458ef0..a730c3af 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/CompareParserRecipeRunTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/CompareParserRecipeRunTest.java @@ -29,7 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.rewrite.RewriteProjectParser; -import org.springframework.rewrite.boot.autoconfigure.SpringRewriteCommonsConfiguration; +import org.springframework.rewrite.boot.autoconfigure.RewriteLauncherConfiguration; import org.springframework.rewrite.parser.maven.RewriteMavenProjectParser; import org.springframework.rewrite.parser.maven.SbmTestConfiguration; import org.springframework.rewrite.test.util.ParallelParsingResult; @@ -45,7 +45,7 @@ /** * @author Fabian Krüger */ -@SpringBootTest(classes = { SpringRewriteCommonsConfiguration.class, SbmTestConfiguration.class }) +@SpringBootTest(classes = { RewriteLauncherConfiguration.class, SbmTestConfiguration.class }) public class CompareParserRecipeRunTest { @Autowired @@ -61,9 +61,11 @@ public class CompareParserRecipeRunTest { @DisplayName("Running a recipe with RewriteMavenParser should yield the same result as with RewriteProjectParser") void runningARecipeWithRewriteMavenParserYieldsTheSameResultAsWithRewriteProjectParser() { Path baseDir = TestProjectHelper.getMavenProject("parser-recipe-run"); - ParallelParsingResult parallelParsingResult = new ParserExecutionHelper().parseParallel(baseDir); - RewriteProjectParsingResult sutParsingResult = parallelParsingResult.actualParsingResult(); - RewriteProjectParsingResult compParsingResult = parallelParsingResult.expectedParsingResult(); + ParserExecutionHelper helper = new ParserExecutionHelper(); + SpringRewriteProperties properties = new SpringRewriteProperties(); + RewriteProjectParsingResult sutResult = helper.parseWithRewriteProjectParser(baseDir, properties); + RewriteProjectParsingResult comparingResult = helper.parseWithComparingParser(baseDir, properties, + executionContext); AtomicInteger counter = new AtomicInteger(0); @@ -99,15 +101,14 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, } }; // Run the Comparing Parser reusing OpenRewrite code - RecipeRun compRecipeRun = recipe.run(new InMemoryLargeSourceSet(compParsingResult.sourceFiles()), + RecipeRun compRecipeRun = recipe.run(new InMemoryLargeSourceSet(comparingResult.sourceFiles()), executionContext); assertThat(counter.get()).isEqualTo(1); assertThat(compRecipeRun.getChangeset().getAllResults()).hasSize(1); // Run Parser independent from Maven counter.setRelease(0); - RecipeRun sutRecipeRun = recipe.run(new InMemoryLargeSourceSet(sutParsingResult.sourceFiles()), - executionContext); + RecipeRun sutRecipeRun = recipe.run(new InMemoryLargeSourceSet(sutResult.sourceFiles()), executionContext); assertThat(counter.get()).isEqualTo(1); assertThat(sutRecipeRun.getChangeset().getAllResults()).hasSize(1); // is 0 } diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/RewriteProjectParserIntegrationTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/RewriteProjectParserIntegrationTest.java index 9a320912..89a175e3 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/RewriteProjectParserIntegrationTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/RewriteProjectParserIntegrationTest.java @@ -15,22 +15,32 @@ */ package org.springframework.rewrite.parser; +import org.apache.maven.artifact.DependencyResolutionRequiredException; +import org.apache.maven.execution.MavenSession; +import org.apache.maven.model.Dependency; +import org.apache.maven.project.MavenProject; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; import org.junitpioneer.jupiter.Issue; +import org.openrewrite.java.marker.JavaSourceSet; import org.openrewrite.java.tree.J; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.rewrite.RewriteProjectParser; +import org.springframework.rewrite.boot.autoconfigure.RewriteLauncherConfiguration; import org.springframework.rewrite.boot.autoconfigure.SpringRewriteCommonsConfiguration; +import org.springframework.rewrite.embedder.MavenExecutor; import org.springframework.rewrite.parser.maven.RewriteMavenProjectParser; import org.springframework.rewrite.parser.maven.SbmTestConfiguration; +import org.springframework.rewrite.test.util.ParserExecutionHelper; import org.springframework.rewrite.test.util.ParserParityTestHelper; import org.springframework.rewrite.test.util.TestProjectHelper; import java.nio.file.Path; +import java.util.List; +import java.util.concurrent.atomic.AtomicReference; import static org.assertj.core.api.Assertions.assertThat; @@ -39,7 +49,7 @@ */ @DisabledOnOs(value = OS.WINDOWS, disabledReason = "The repository URIs of dependencies differ.") @Issue("https://github.com/spring-projects/spring-rewrite-commons/issues/12") -@SpringBootTest(classes = { SpringRewriteCommonsConfiguration.class, SbmTestConfiguration.class }) +@SpringBootTest(classes = { RewriteLauncherConfiguration.class, SbmTestConfiguration.class }) public class RewriteProjectParserIntegrationTest { @Autowired @@ -55,32 +65,126 @@ public class RewriteProjectParserIntegrationTest { @DisplayName("testFailingProject") void testFailingProject() { Path baseDir = Path.of("./testcode/maven-projects/failing"); - ParserParityTestHelper.scanProjectDir(baseDir).verifyParity((comparingParsingResult, testedParsingResult) -> { - assertThat(comparingParsingResult.sourceFiles().get(1)).isInstanceOf(J.CompilationUnit.class); - J.CompilationUnit cu = (J.CompilationUnit) comparingParsingResult.sourceFiles().get(1); - assertThat(cu.getTypesInUse() - .getTypesInUse() - .stream() - .map(t -> t.toString()) - .anyMatch(t -> t.equals("javax.validation.constraints.Min"))).isTrue(); + ParserParityTestHelper.scanProjectDir(baseDir) + .parseSequentially() + .verifyParity((comparingParsingResult, testedParsingResult) -> { + assertThat(comparingParsingResult.sourceFiles().get(1)).isInstanceOf(J.CompilationUnit.class); + J.CompilationUnit cu = (J.CompilationUnit) comparingParsingResult.sourceFiles().get(1); + assertThat(cu.getTypesInUse() + .getTypesInUse() + .stream() + .map(t -> t.toString()) + .anyMatch(t -> t.equals("javax.validation.constraints.Min"))).isTrue(); - assertThat(testedParsingResult.sourceFiles().get(1)).isInstanceOf(J.CompilationUnit.class); - J.CompilationUnit cu2 = (J.CompilationUnit) testedParsingResult.sourceFiles().get(1); - assertThat(cu2.getTypesInUse() - .getTypesInUse() - .stream() - .map(t -> t.toString()) - .anyMatch(t -> t.equals("javax.validation.constraints.Min"))).isTrue(); - }); + assertThat(testedParsingResult.sourceFiles().get(1)).isInstanceOf(J.CompilationUnit.class); + J.CompilationUnit cu2 = (J.CompilationUnit) testedParsingResult.sourceFiles().get(1); + assertThat(cu2.getTypesInUse() + .getTypesInUse() + .stream() + .map(t -> t.toString()) + .anyMatch(t -> t.equals("javax.validation.constraints.Min"))).isTrue(); + }); } @Test @DisplayName("parseResources") void parseResources() { Path baseDir = TestProjectHelper.getMavenProject("resources"); - ParserParityTestHelper.scanProjectDir(baseDir).verifyParity((comparingParsingResult, testedParsingResult) -> { - assertThat(comparingParsingResult.sourceFiles()).hasSize(5); - }); + ParserParityTestHelper.scanProjectDir(baseDir) + .parseSequentially() + .verifyParity((comparingParsingResult, testedParsingResult) -> { + assertThat(comparingParsingResult.sourceFiles()).hasSize(5); + }); + } + + @Test + @DisplayName("parseResources") + void parseResourcesRewriteOnly() { + Path baseDir = TestProjectHelper.getMavenProject("resources"); + RewriteProjectParsingResult parsingResult = new ParserExecutionHelper().parseWithComparingParser(baseDir, + new SpringRewriteProperties(), new RewriteExecutionContext()); + List list = parsingResult.sourceFiles() + .get(3) + .getMarkers() + .findFirst(JavaSourceSet.class) + .get() + .getClasspath() + .stream() + .map(fqn -> fqn.getFullyQualifiedName()) + .toList(); + assertThat(list).contains("javax.validation.BootstrapConfiguration"); + } + + @Test + // TODO: Move to maven-embedder + @DisplayName("parseResources") + void parseResourcesMavenExecutor() { + Path baseDir = TestProjectHelper.getMavenProject("resources"); + AtomicReference> cpRef = new AtomicReference<>(); + new MavenExecutor(event -> { + MavenSession mavenSession = event.getSession(); + MavenProject application = mavenSession.getProjects() + .stream() + .filter(p -> p.getArtifactId().equals("application")) + .findFirst() + .get(); + List compileDependencies = application.getCompileDependencies(); + try { + List compileClasspathElements = application.getCompileClasspathElements(); + cpRef.set(compileClasspathElements); + } + catch (DependencyResolutionRequiredException e) { + throw new RuntimeException(e); + } + + }).execute(List.of("clean", "package"), baseDir); + + assertThat(cpRef.get()).contains( + Path.of(System.getProperty("user.home")) + .resolve( + ".m2/repository/javax/validation/validation-api/2.0.1.Final/validation-api-2.0.1.Final.jar") + .toString(), + Path.of(".") + .resolve("testcode/maven-projects/resources/application/target/classes") + .toAbsolutePath() + .normalize() + .toString()); + } + + @Test + // TODO: Move to maven-embedder + @DisplayName("parseResources") + void parseTest1MavenExecutor() { + Path baseDir = TestProjectHelper.getMavenProject("test1"); + AtomicReference> cpRef = new AtomicReference<>(); + new MavenExecutor(event -> { + MavenSession mavenSession = event.getSession(); + MavenProject application = mavenSession.getProjects() + .stream() + .filter(p -> p.getArtifactId().equals("dummy-root")) + .findFirst() + .get(); + List compileDependencies = application.getCompileDependencies(); + try { + List compileClasspathElements = application.getCompileClasspathElements(); + cpRef.set(compileClasspathElements); + } + catch (DependencyResolutionRequiredException e) { + throw new RuntimeException(e); + } + + }).execute(List.of("clean", "package"), baseDir); + + assertThat(cpRef.get()).contains( + Path.of(System.getProperty("user.home")) + .resolve( + ".m2/repository/javax/validation/validation-api/2.0.1.Final/validation-api-2.0.1.Final.jar") + .toString(), + Path.of(".") + .resolve("testcode/maven-projects/test1/target/classes") + .toAbsolutePath() + .normalize() + .toString()); } @Test diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/RewriteProjectParserParityTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/RewriteProjectParserParityTest.java index 5688b423..4767f20f 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/RewriteProjectParserParityTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/RewriteProjectParserParityTest.java @@ -31,6 +31,7 @@ import org.openrewrite.shaded.jgit.api.errors.GitAPIException; import org.openrewrite.tree.ParsingEventListener; import org.openrewrite.tree.ParsingExecutionContextView; +import org.springframework.rewrite.OpenRewriteProjectParser; import org.springframework.rewrite.parser.maven.ComparingParserFactory; import org.springframework.rewrite.parser.maven.RewriteMavenProjectParser; import org.springframework.rewrite.test.util.DummyResource; @@ -151,9 +152,8 @@ void shouldParseMavenConfigProject() { Path baseDir = Path.of("./testcode/maven-projects/maven-config").toAbsolutePath().normalize(); SpringRewriteProperties springRewriteProperties = new SpringRewriteProperties(); springRewriteProperties.setIgnoredPathPatterns(Set.of(".mvn")); - RewriteMavenProjectParser mavenProjectParser = new ComparingParserFactory().createComparingParser(); - RewriteProjectParsingResult parsingResult = mavenProjectParser.parse(baseDir, - new InMemoryExecutionContext(t -> fail(t.getMessage()))); + OpenRewriteProjectParser mavenProjectParser = new ComparingParserFactory().createComparingParser(); + RewriteProjectParsingResult parsingResult = mavenProjectParser.parse(baseDir); assertThat(parsingResult.sourceFiles()).hasSize(2); } diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/RewriteProjectParserTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/RewriteProjectParserTest.java index 459796ed..c9508874 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/RewriteProjectParserTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/RewriteProjectParserTest.java @@ -23,6 +23,7 @@ import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.Parser; import org.openrewrite.SourceFile; +import org.openrewrite.maven.cache.LocalMavenArtifactCache; import org.openrewrite.tree.ParsingEventListener; import org.openrewrite.tree.ParsingExecutionContextView; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; @@ -107,7 +108,7 @@ void parseSimpleMavenProject(@TempDir Path tempDir) { new StyleDetector(), springRewriteProperties, mock(ParsingEventListener.class), mock(ApplicationEventPublisher.class), new ScanScope(), mock(ConfigurableListableBeanFactory.class), new ProjectScanner(new DefaultResourceLoader(), springRewriteProperties), executionContext, - new MavenProjectAnalyzer(new MavenProjectSorter(projectCollector), mavenProjectFactory)); + artifactDownloader); List parsedFiles = new ArrayList<>(); ParsingExecutionContextView.view(executionContext).setParsingListener(new ParsingEventListener() { diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/ComparingParserFactory.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/ComparingParserFactory.java index b10a3d9d..94f22c51 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/ComparingParserFactory.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/ComparingParserFactory.java @@ -19,6 +19,8 @@ import org.openrewrite.InMemoryExecutionContext; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.context.ApplicationEventPublisher; +import org.springframework.rewrite.OpenRewriteProjectParser; +import org.springframework.rewrite.parser.RewriteExecutionContext; import org.springframework.rewrite.parser.SpringRewriteProperties; import org.springframework.rewrite.parser.events.RewriteParsingEventListenerAdapter; import org.springframework.rewrite.scopes.ScanScope; @@ -31,23 +33,13 @@ public class ComparingParserFactory { @NotNull - public RewriteMavenProjectParser createComparingParser() { + public OpenRewriteProjectParser createComparingParser() { return createComparingParser(new SpringRewriteProperties()); } - public RewriteMavenProjectParser createComparingParser(SpringRewriteProperties springRewriteProperties) { - MavenPlexusContainer plexusContainer = new MavenPlexusContainer(); - ConfigurableListableBeanFactory beanFactory = mock(ConfigurableListableBeanFactory.class); - ScanScope scanScope = mock(ScanScope.class); - ApplicationEventPublisher eventPublisher = mock(ApplicationEventPublisher.class); - RewriteParsingEventListenerAdapter parsingListener = new RewriteParsingEventListenerAdapter(eventPublisher); - MavenExecutionRequestFactory requestFactory = new MavenExecutionRequestFactory(new MavenConfigFileParser()); - RewriteMavenProjectParser mavenProjectParser1 = new RewriteMavenProjectParser(plexusContainer, parsingListener, - new MavenExecutor(requestFactory, plexusContainer), - new MavenMojoProjectParserFactory(springRewriteProperties), scanScope, beanFactory, - new InMemoryExecutionContext(t -> { - throw new RuntimeException(t); - })); + public OpenRewriteProjectParser createComparingParser(SpringRewriteProperties springRewriteProperties) { + OpenRewriteProjectParser mavenProjectParser1 = new OpenRewriteProjectParser(springRewriteProperties, + new RewriteExecutionContext()); return mavenProjectParser1; } diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenExecutionRequestFactory.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenExecutionRequestFactory.java deleted file mode 100644 index 0cc52de6..00000000 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenExecutionRequestFactory.java +++ /dev/null @@ -1,136 +0,0 @@ -/* - * Copyright 2021 - 2023 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.rewrite.parser.maven; - -import org.apache.maven.artifact.repository.ArtifactRepository; -import org.apache.maven.artifact.repository.ArtifactRepositoryFactory; -import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy; -import org.apache.maven.artifact.repository.MavenArtifactRepository; -import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout; -import org.apache.maven.execution.DefaultMavenExecutionRequest; -import org.apache.maven.execution.MavenExecutionRequest; -import org.apache.maven.model.Profile; -import org.apache.maven.repository.UserLocalArtifactRepository; -import org.codehaus.plexus.PlexusContainer; -import org.codehaus.plexus.component.repository.exception.ComponentLookupException; - -import java.io.File; -import java.nio.file.Path; -import java.util.List; -import java.util.Map; -import java.util.Properties; - -/** - * @author Fabian Krüger - */ -class MavenExecutionRequestFactory { - - private final MavenConfigFileParser mavenConfigFileParser; - - public MavenExecutionRequestFactory(MavenConfigFileParser mavenConfigFileParser) { - this.mavenConfigFileParser = mavenConfigFileParser; - } - - private static final String LOCAL_REPOSITORY = Path.of(System.getProperty("user.home")) - .resolve(".m2") - .resolve("repository") - .toString(); - - private static final List MAVEN_GOALS = List.of("clean", "package");// "dependency:resolve"; - - public MavenExecutionRequest createMavenExecutionRequest(PlexusContainer plexusContainer, Path baseDir) { - try { - MavenExecutionRequest request = new DefaultMavenExecutionRequest(); - ArtifactRepositoryFactory repositoryFactory = plexusContainer.lookup(ArtifactRepositoryFactory.class); - - repositoryFactory.setGlobalChecksumPolicy("warn"); - repositoryFactory.setGlobalUpdatePolicy("never"); - ArtifactRepository repository = new UserLocalArtifactRepository(repositoryFactory.createArtifactRepository( - "local", "file://" + LOCAL_REPOSITORY, new DefaultRepositoryLayout(), null, null));// repositoryFactory.createArtifactRepository("local", - // "file://" - // + - // LOCAL_REPOSITORY, - // new - // DefaultRepositoryLayout(), - // null, - // null); - // // - // new - // MavenArtifactRepository("local", - // "file://"+LOCAL_REPOSITORY, - // new - // DefaultRepositoryLayout(), - // null, - // null); - repository.setUrl("file://" + LOCAL_REPOSITORY); - repository.setReleaseUpdatePolicy(new ArtifactRepositoryPolicy(true, "never", "warn")); - repository.setMirroredRepositories(List.of()); - repository.setSnapshotUpdatePolicy(new ArtifactRepositoryPolicy(true, "never", "warn")); - - request.setBaseDirectory(baseDir.toFile()); - request.setShowErrors(true); - request.setLocalRepositoryPath(LOCAL_REPOSITORY); - request.setPluginArtifactRepositories(List.of(repository)); - File userSettingsFile = Path.of(System.getProperty("user.home")).resolve(".m2/settings.xml").toFile(); - if (userSettingsFile.exists()) { - request.setUserSettingsFile(userSettingsFile); - } - - List activatedProfiles = mavenConfigFileParser.getActivatedProfiles(baseDir); - if (activatedProfiles.isEmpty()) { - request.setActiveProfiles(List.of("default")); - } - else { - request.setActiveProfiles(activatedProfiles); - } - - Map userPropertiesFromConfig = mavenConfigFileParser.getUserProperties(baseDir); - Properties userProperties = new Properties(); - if (!userPropertiesFromConfig.isEmpty()) { - userProperties.putAll(userPropertiesFromConfig); - } - userProperties.put("skipTests", "true"); - request.setUserProperties(userProperties); - - request.setRemoteRepositories( - List.of(new MavenArtifactRepository("central", "https://repo.maven.apache.org/maven2", - new DefaultRepositoryLayout(), new ArtifactRepositoryPolicy(true, "never", "warn"), - new ArtifactRepositoryPolicy(true, "never", "warn")))); - - // TODO: make profile configurable - // fixes the maven run when plugins depending on Java version are encountered. - // This is the case for some transitive dependencies when running against the - // SBM code base itself. - // In these cases the Java version could not be retrieved without this line - request.setSystemProperties(System.getProperties()); - - Profile profile = new Profile(); - profile.setId("default"); - request.setProfiles(List.of(profile)); - request.setDegreeOfConcurrency(1); - request.setLoggingLevel(MavenExecutionRequest.LOGGING_LEVEL_DEBUG); - request.setMultiModuleProjectDirectory(baseDir.toFile()); - request.setLocalRepository(repository); - request.setGoals(MAVEN_GOALS); - request.setPom(baseDir.resolve("pom.xml").toFile()); - return request; - } - catch (ComponentLookupException e) { - throw new RuntimeException(e); - } - } - -} diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenExecutionResultException.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenExecutionResultException.java deleted file mode 100644 index ab0410b0..00000000 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenExecutionResultException.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2021 - 2023 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.rewrite.parser.maven; - -import org.apache.commons.lang3.exception.ExceptionUtils; - -import java.util.List; -import java.util.stream.Collectors; - -/** - * Exception thrown if {@link MavenExecutor} had errors during execution. - * - * @author Fabian Krüger - */ -public class MavenExecutionResultException extends RuntimeException { - - private final List exceptions; - - public MavenExecutionResultException(String message, List exceptions) { - super(buildMessage(message, exceptions)); - this.exceptions = exceptions; - } - - public List getExceptions() { - return exceptions; - } - - private static String buildMessage(String message, List exceptions) { - return message + "\n" - + exceptions.stream().map(t -> ExceptionUtils.getStackTrace(t)).collect(Collectors.joining("\n")); - } - -} diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenExecutor.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenExecutor.java deleted file mode 100644 index 5455ca72..00000000 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenExecutor.java +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Copyright 2021 - 2023 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.rewrite.parser.maven; - -import org.apache.maven.Maven; -import org.apache.maven.execution.*; -import org.apache.maven.project.MavenProject; -import org.codehaus.plexus.PlexusContainer; -import org.codehaus.plexus.component.repository.exception.ComponentLookupException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.nio.file.Path; -import java.util.List; -import java.util.function.Consumer; - -/** - * Execute Maven goals and provides the current MavenSession to a custom listener. - * - * @author Fabian Krüger - */ -class MavenExecutor { - - private static final Logger LOGGER = LoggerFactory.getLogger(MavenExecutor.class); - - private final MavenExecutionRequestFactory requestFactory; - - private final MavenPlexusContainer mavenPlexusContainer; - - public MavenExecutor(MavenExecutionRequestFactory requestFactory, MavenPlexusContainer mavenPlexusContainer) { - this.requestFactory = requestFactory; - this.mavenPlexusContainer = mavenPlexusContainer; - } - - /** - * Runs given {@code goals} in Maven and calls {@code eventConsumer} when Maven - * processed the last MavenProject. Maven then calls - * {@link org.apache.maven.execution.ExecutionListener#projectSucceeded(ExecutionEvent)}. - * The {@code eventConsumer} will be provided with the current {@link MavenSession} - * through the {@link ExecutionEvent}. The MavenSession provides all required - * information about the given project. - */ - public void onProjectSucceededEvent(Path baseDir, List goals, Consumer eventConsumer) { - PlexusContainer plexusContainer = mavenPlexusContainer.get(); - AbstractExecutionListener executionListener = new AbstractExecutionListener() { - @Override - public void mojoFailed(ExecutionEvent event) { - super.mojoFailed(event); - String mojo = event.getMojoExecution().getGroupId() + ":" + event.getMojoExecution().getArtifactId() - + ":" + event.getMojoExecution().getGoal(); - throw new RuntimeException("Exception while executing Maven Mojo: " + mojo, event.getException()); - } - - @Override - public void projectSucceeded(ExecutionEvent event) { - List sortedProjects = event.getSession().getProjectDependencyGraph().getSortedProjects(); - MavenProject lastProject = (MavenProject) sortedProjects.get(sortedProjects.size() - 1); - LOGGER.info("Maven successfully processed project: %s" - .formatted(event.getSession().getCurrentProject().getName())); - if (event.getSession() - .getCurrentProject() - .getFile() - .toPath() - .toString() - .equals(lastProject.getFile().getPath().toString())) { - eventConsumer.accept(event); - } - } - - @Override - public void mojoSucceeded(ExecutionEvent event) { - super.mojoSucceeded(event); - LOGGER.info("Mojo succeeded: " + event.getMojoExecution().getGoal()); - } - - @Override - public void projectFailed(ExecutionEvent event) { - super.projectFailed(event); - throw new RuntimeException("Exception while executing Maven project: " + event.getProject().getName(), - event.getException()); - } - }; - MavenExecutionRequest request = requestFactory.createMavenExecutionRequest(plexusContainer, baseDir); - request.setGoals(goals); - request.setExecutionListener(executionListener); - execute(request); - } - - /** - * Executes the {@code request} against Maven. - * - * @see MavenExecutionRequestFactory - */ - public void execute(MavenExecutionRequest request) { - try { - PlexusContainer plexusContainer = mavenPlexusContainer.get(); - Maven maven = plexusContainer.lookup(Maven.class); - MavenExecutionResult execute = maven.execute(request); - if (execute.hasExceptions()) { - throw new MavenExecutionResultException("Maven could not run %s on project '%s'" - .formatted(request.getGoals(), request.getBaseDirectory()), execute.getExceptions()); - } - } - catch (ComponentLookupException e) { - throw new RuntimeException(e); - } - } - -} diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenPlexusContainer.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenPlexusContainer.java deleted file mode 100644 index e33df12f..00000000 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenPlexusContainer.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright 2021 - 2023 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.rewrite.parser.maven; - -import org.codehaus.plexus.*; -import org.codehaus.plexus.classworlds.ClassWorld; -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.repository.exception.ComponentLookupException; -import org.springframework.context.annotation.Lazy; - -import java.net.URL; - -@Lazy -class MavenPlexusContainer { - - public T lookup(Class aClass) { - try { - return ContainerHolder.INSTANCE.lookup(aClass); - } - catch (ComponentLookupException e) { - throw new RuntimeException(e); - } - } - - private static class ContainerHolder { - - private static final PlexusContainer INSTANCE = create(); - - public static PlexusContainer create() { - try { - ClassLoader parent = null; - boolean isContainerAutoWiring = false; - String containerClassPathScanning = "on"; - String containerComponentVisibility = null; - URL overridingComponentsXml = null; // getClass().getClassLoader().getResource("META-INF/**/components.xml"); - - ContainerConfiguration configuration = new DefaultContainerConfiguration(); - configuration.setAutoWiring(isContainerAutoWiring) - .setClassPathScanning(containerClassPathScanning) - .setComponentVisibility(containerComponentVisibility) - .setContainerConfigurationURL(overridingComponentsXml); - - // inspired from - // https://github.com/jenkinsci/lib-jenkins-maven-embedder/blob/master/src/main/java/hudson/maven/MavenEmbedderUtils.java#L141 - ClassWorld classWorld = new ClassWorld(); - ClassRealm classRealm = new ClassRealm(classWorld, "maven", PlexusContainer.class.getClassLoader()); - classRealm.setParentRealm(new ClassRealm(classWorld, "maven-parent", - parent == null ? Thread.currentThread().getContextClassLoader() : parent)); - configuration.setRealm(classRealm); - - configuration.setClassWorld(classWorld); - return new DefaultPlexusContainer(configuration); - } - catch (PlexusContainerException e) { - throw new RuntimeException(e); - } - } - - } - - @Deprecated - public PlexusContainer get() { - return ContainerHolder.INSTANCE; - } - -} diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenProjectGraphTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenProjectGraphTest.java index c30f54f4..8959061b 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenProjectGraphTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenProjectGraphTest.java @@ -64,7 +64,9 @@ void singleModule() { """; Path baseDir = Path.of("./target").toAbsolutePath().normalize(); Resource pomResource = new DummyResource(baseDir.resolve("pom.xml"), pomCode); - MavenProject mavenProject = projectFactory.create(baseDir, pomResource, List.of(pomResource)); + MavenRuntimeInformation runtimeInformation = new MavenRuntimeInformation("3.9.1"); + MavenProject mavenProject = projectFactory.create(baseDir, pomResource, List.of(pomResource), + runtimeInformation); List allMavenProjects = List.of(mavenProject); Map> mavenProjectSetMap = sut.from(baseDir, allMavenProjects); @@ -291,7 +293,8 @@ public MavenProjectBuilder withResource(String path, String content) { } public MavenProjectBuilder afterSort() { - mavenProjects = MavenProjectGraphTest.projectFactory.create(baseDir, resources); + mavenProjects = MavenProjectGraphTest.projectFactory.create(baseDir, resources, + new MavenRuntimeInformation("3.9.1")); dependencyGraph = sut.from(baseDir, mavenProjects); return this; } @@ -300,12 +303,10 @@ public MavenProjectBuilder assertDependencies(String pomContent, String... depen MavenProject moduleProject = findMavenProject(pomContent); this.assertedProjects.add(moduleProject); List dependantProjects = getDependantProjects(dependantPomContents); - // softAssertions. - assertThat(dependencyGraph).containsKey(moduleProject); + softAssertions.assertThat(dependencyGraph).containsKey(moduleProject); MavenProject[] dependantProjectsArray = dependantProjects.toArray(MavenProject[]::new); Set actualDependantProjects = dependencyGraph.get(moduleProject); - // softAssertions. - assertThat(actualDependantProjects).containsExactlyInAnyOrder(dependantProjectsArray); + softAssertions.assertThat(actualDependantProjects).containsExactlyInAnyOrder(dependantProjectsArray); return this; } diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenProjectResolutionTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenProjectResolutionTest.java index c120d13e..44f45c0e 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenProjectResolutionTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenProjectResolutionTest.java @@ -21,6 +21,7 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; +import org.springframework.rewrite.embedder.MavenExecutor; import java.nio.file.Files; import java.nio.file.Path; @@ -101,10 +102,7 @@ void verifyMavenProjectRetrievedFromSession(@TempDir Path tempDir) throws Except Path pomFile = tempDir.resolve("pom.xml"); Files.writeString(pomFile, pomXml); - MavenPlexusContainer plexusContainerFactory = new MavenPlexusContainer(); - MavenExecutionRequestFactory requestFactory = new MavenExecutionRequestFactory(new MavenConfigFileParser()); - MavenExecutor mavenExecutor = new MavenExecutor(requestFactory, plexusContainerFactory); - mavenExecutor.onProjectSucceededEvent(tempDir, List.of("dependency:resolve"), event -> { + new MavenExecutor(event -> { MavenProject mavenProject = event.getSession().getCurrentProject(); assertThat(mavenProject.getName()).isEqualTo("the-name"); assertThat(mavenProject.getArtifactId()).isEqualTo("the-example"); @@ -142,7 +140,7 @@ void verifyMavenProjectRetrievedFromSession(@TempDir Path tempDir) throws Except catch (DependencyResolutionRequiredException e) { throw new RuntimeException(e); } - }); + }).execute(List.of("dependency:resolve"), tempDir); } private String dep(String s) { diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenProjectSorterTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenProjectSorterTest.java index 5eb2ea7d..ede9f77a 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenProjectSorterTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenProjectSorterTest.java @@ -26,6 +26,7 @@ import org.mockito.Mockito; import org.openrewrite.maven.utilities.MavenArtifactDownloader; import org.springframework.core.io.Resource; +import org.springframework.rewrite.embedder.MavenExecutor; import org.springframework.rewrite.test.util.DummyResource; import org.springframework.rewrite.utils.LinuxWindowsPathUnifier; import org.springframework.rewrite.utils.ResourceUtil; @@ -72,7 +73,8 @@ void projectWithSinglePom() { List resources = List.of(new DummyResource(Path.of("pom.xml"), singlePom)); Path baseDir = Path.of(".").toAbsolutePath().normalize(); - List mavenProjects = mavenProjectFactory.create(baseDir, resources); + List mavenProjects = mavenProjectFactory.create(baseDir, resources, + new MavenRuntimeInformation("3.9.1")); List sortedProjects = sut.sort(baseDir, mavenProjects); assertThat(sortedProjects).hasSize(1); } @@ -123,7 +125,8 @@ void getSortedProjectsWithMultiModule() { new DummyResource(exampleModuleDir.resolve("pom.xml"), modulePom) ); // @formatter:on - List mavenProjects = mavenProjectFactory.create(baseDir, resources); + List mavenProjects = mavenProjectFactory.create(baseDir, resources, + new MavenRuntimeInformation("3.9.1")); List sortedProjects = sut.sort(baseDir, mavenProjects); assertThat(sortedProjects).hasSize(2); @@ -198,7 +201,8 @@ void reactorBuildWithDanglingPom() { new DummyResource(Path.of("example/pom.xml"), modulePom), new DummyResource(Path.of("dangling/pom.xml"), danglingPom)); - List mavenProjects = mavenProjectFactory.create(baseDir, resources); + List mavenProjects = mavenProjectFactory.create(baseDir, resources, + new MavenRuntimeInformation("3.9.1")); List sortedProjects = sut.sort(baseDir, mavenProjects); assertThat(sortedProjects).hasSize(2); @@ -272,7 +276,8 @@ void reactorBuildWithDanglingPomWhichAReactorModuleDependsOn() { new DummyResource(Path.of("dangling/pom.xml"), danglingPom)); Path baseDir = Path.of(".").toAbsolutePath(); - List mavenProjects = mavenProjectFactory.create(baseDir, resources); + List mavenProjects = mavenProjectFactory.create(baseDir, resources, + new MavenRuntimeInformation("3.9.1")); List sortedProjects = sut.sort(baseDir, mavenProjects); assertThat(sortedProjects).hasSize(2); @@ -362,7 +367,8 @@ void theReactorBuildOrderIsReturned() { new DummyResource(Path.of("pom.xml"), parentPom)); Path baseDir = Path.of(".").toAbsolutePath(); - List mavenProjects = mavenProjectFactory.create(baseDir, resources); + List mavenProjects = mavenProjectFactory.create(baseDir, resources, + new MavenRuntimeInformation("3.9.1")); List sortedProjects = sut.sort(baseDir, mavenProjects); // Returned ordered @@ -469,7 +475,8 @@ void moreComplex() { new DummyResource(baseDir.resolve("pom.xml"), parentPom)); // Provided unordered - List mavenProjects = mavenProjectFactory.create(baseDir, resources); + List mavenProjects = mavenProjectFactory.create(baseDir, resources, + new MavenRuntimeInformation("3.9.1")); List sortedProjects = sut.sort(baseDir, mavenProjects); // Expected order is parent, module-b, module-c, module-a @@ -573,7 +580,8 @@ void sortModels() { new DummyResource(Path.of("pom.xml"), parentPom)); Path baseDir = Path.of(".").toAbsolutePath(); - List mavenProjects = mavenProjectFactory.create(baseDir, resources); + List mavenProjects = mavenProjectFactory.create(baseDir, resources, + new MavenRuntimeInformation("3.9.1")); List sorted = sut.sort(baseDir, mavenProjects); // Expected order is parent, module-b, module-c, module-a @@ -694,7 +702,8 @@ void compareMavenProjectGetCollectedProjects(@TempDir Path tmpDir) { List mavenSorted = mavenSession.getProjectDependencyGraph() .getSortedProjects(); - List mavenProjects = mavenProjectFactory.create(baseDir, resources); + List mavenProjects = mavenProjectFactory.create(baseDir, resources, + new MavenRuntimeInformation("3.9.1")); List sbmSorted = sut.sort(baseDir, mavenProjects); assertThat(mavenSorted).hasSize(5); @@ -731,12 +740,14 @@ private void writeToDisk(Path baseDir, List resources) { } private MavenSession startMavenSession(Path baseDir) { - List goals = List.of("clean", "package"); - MavenExecutor mavenExecutor = new MavenExecutor( - new MavenExecutionRequestFactory(new MavenConfigFileParser()), new MavenPlexusContainer()); - AtomicReference mavenSession = new AtomicReference<>(); - mavenExecutor.onProjectSucceededEvent(baseDir, goals, event -> mavenSession.set(event.getSession())); - return mavenSession.get(); + AtomicReference mavenSessionRef = new AtomicReference<>(); + + new MavenExecutor(event -> { + MavenSession mavenSession = event.getSession(); + mavenSessionRef.set(mavenSession); + }).execute(List.of("clean", "package"), baseDir); + + return mavenSessionRef.get(); } } diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/ProvenanceMarkerFactoryTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/ProvenanceMarkerFactoryTest.java index 053dadfd..73fce241 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/ProvenanceMarkerFactoryTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/ProvenanceMarkerFactoryTest.java @@ -35,6 +35,7 @@ import org.openrewrite.shaded.jgit.lib.Repository; import org.openrewrite.shaded.jgit.storage.file.FileRepositoryBuilder; import org.springframework.core.io.Resource; +import org.springframework.rewrite.embedder.MavenExecutor; import org.springframework.rewrite.parser.ParserContext; import org.springframework.rewrite.parser.SpringRewriteProperties; import org.springframework.rewrite.test.util.DummyResource; @@ -81,12 +82,7 @@ void testMavenMojoProjectParserGenerateProvenance() { MavenMojoProjectParser sut = mavenMojoProjectParserFactory.create(baseDir, runtimeInformation, settingsDecrypter); - // the sut requires a MavenProject, let's retrieve it from Maven - MavenExecutor mavenExecutor = new MavenExecutor( - new MavenExecutionRequestFactory(new MavenConfigFileParser()), new MavenPlexusContainer()); - - // doing a 'mvn clean install' - mavenExecutor.onProjectSucceededEvent(baseDir, List.of("clean", "package"), event -> { + new MavenExecutor(event -> { // and then use the MavenProject from the MavenSession org.apache.maven.project.MavenProject mavenModel = event.getSession().getCurrentProject(); @@ -131,7 +127,7 @@ void testMavenMojoProjectParserGenerateProvenance() { assertThat(countGetters(gitProvenance)).isEqualTo(10); assertThat(gitProvenance.getId()).isInstanceOf(UUID.class); if (!isGithubAction() || "main".equals(branch)) { // failed in GH build - // when not on main + // when not on main assertThat(gitProvenance.getBranch()).isEqualTo(branch); } assertThat(gitProvenance.getEol()).isEqualTo(GitProvenance.EOL.Native); @@ -158,7 +154,7 @@ void testMavenMojoProjectParserGenerateProvenance() { assertThat(buildTool.getVersion()).isEqualTo(mavenVersion); assertThat(buildTool.getType()).isEqualTo(BuildTool.Type.Maven); - }); + }).execute(List.of("clean", "package"), baseDir); } private static boolean isGithubAction() { diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/RewriteMavenProjectParser.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/RewriteMavenProjectParser.java index 2beee34e..ff62591f 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/RewriteMavenProjectParser.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/RewriteMavenProjectParser.java @@ -31,8 +31,10 @@ import org.openrewrite.tree.ParsingEventListener; import org.openrewrite.tree.ParsingExecutionContextView; import org.openrewrite.xml.tree.Xml; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.core.io.Resource; +import org.springframework.rewrite.embedder.MavenExecutor; import org.springframework.rewrite.parser.RewriteProjectParsingResult; import org.springframework.rewrite.scopes.ScanScope; @@ -54,12 +56,8 @@ */ public class RewriteMavenProjectParser { - private final MavenPlexusContainer mavenPlexusContainer; - private final ParsingEventListener parsingListener; - private final MavenExecutor mavenRunner; - private final MavenMojoProjectParserFactory mavenMojoProjectParserFactory; private final ScanScope scanScope; @@ -68,12 +66,10 @@ public class RewriteMavenProjectParser { private final ExecutionContext executionContext; - public RewriteMavenProjectParser(MavenPlexusContainer mavenPlexusContainer, ParsingEventListener parsingListener, - MavenExecutor mavenRunner, MavenMojoProjectParserFactory mavenMojoProjectParserFactory, ScanScope scanScope, + public RewriteMavenProjectParser(ParsingEventListener parsingListener, + MavenMojoProjectParserFactory mavenMojoProjectParserFactory, ScanScope scanScope, ConfigurableListableBeanFactory beanFactory, ExecutionContext executionContext) { - this.mavenPlexusContainer = mavenPlexusContainer; this.parsingListener = parsingListener; - this.mavenRunner = mavenRunner; this.mavenMojoProjectParserFactory = mavenMojoProjectParserFactory; this.scanScope = scanScope; this.beanFactory = beanFactory; @@ -92,31 +88,28 @@ public RewriteProjectParsingResult parse(Path baseDir) { @NotNull public RewriteProjectParsingResult parse(Path baseDir, ExecutionContext executionContext) { final Path absoluteBaseDir = getAbsolutePath(baseDir); - PlexusContainer plexusContainer = mavenPlexusContainer.get(); - RewriteProjectParsingResult parsingResult = parseInternal(absoluteBaseDir, executionContext, plexusContainer); + + RewriteProjectParsingResult parsingResult = parseInternal(absoluteBaseDir, executionContext); return parsingResult; } - private RewriteProjectParsingResult parseInternal(Path baseDir, ExecutionContext executionContext, - PlexusContainer plexusContainer) { + private RewriteProjectParsingResult parseInternal(Path baseDir, ExecutionContext executionContext) { clearScanScopedBeans(); AtomicReference parsingResult = new AtomicReference<>(); - mavenRunner.onProjectSucceededEvent(baseDir, List.of("clean", "package"), event -> { - try { - MavenSession session = event.getSession(); - List mavenProjects = session.getAllProjects(); - MavenMojoProjectParser rewriteProjectParser = mavenMojoProjectParserFactory.create(baseDir, - mavenProjects, plexusContainer, session); - List styles = List.of(); - List sourceFiles = parseSourceFiles(rewriteProjectParser, mavenProjects, styles, - executionContext); - parsingResult.set(new RewriteProjectParsingResult(sourceFiles, executionContext)); - } - catch (Exception e) { - throw new RuntimeException(e); - } - }); + + new MavenExecutor(LoggerFactory.getLogger(RewriteMavenProjectParser.class), event -> { + MavenSession session = event.getSession(); + List mavenProjects = session.getAllProjects(); + PlexusContainer plexusContainer = session.getContainer(); + MavenMojoProjectParser rewriteProjectParser = mavenMojoProjectParserFactory.create(baseDir, mavenProjects, + plexusContainer, session); + List styles = List.of(); + List sourceFiles = parseSourceFiles(session.getTopLevelProject(), rewriteProjectParser, + mavenProjects, styles, executionContext); + parsingResult.set(new RewriteProjectParsingResult(sourceFiles, executionContext)); + }).execute(List.of("clean", "package", "--fail-at-end"), baseDir); + return parsingResult.get(); } @@ -124,13 +117,13 @@ private void clearScanScopedBeans() { scanScope.clear(beanFactory); } - private List parseSourceFiles(MavenMojoProjectParser rewriteProjectParser, - List mavenProjects, List styles, ExecutionContext executionContext) { + private List parseSourceFiles(MavenProject rootMavenProject, + MavenMojoProjectParser rewriteProjectParser, List mavenProjects, List styles, + ExecutionContext executionContext) { try { - Stream sourceFileStream = rewriteProjectParser.listSourceFiles( - mavenProjects.get(mavenProjects.size() - 1), // FIXME: Order and - // access to root - // module + Stream sourceFileStream = rewriteProjectParser.listSourceFiles(rootMavenProject, + // access to root + // module styles, executionContext); return sourcesWithAutoDetectedStyles(sourceFileStream); } diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/SbmTestConfiguration.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/SbmTestConfiguration.java index 0753d5e5..a9559ad2 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/SbmTestConfiguration.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/SbmTestConfiguration.java @@ -41,38 +41,22 @@ MavenConfigFileParser configFileParser() { return new MavenConfigFileParser(); } - @Bean - MavenExecutionRequestFactory requestFactory(MavenConfigFileParser configFileParser) { - return new MavenExecutionRequestFactory(configFileParser); - } - - @Bean - MavenExecutor mavenExecutor(MavenExecutionRequestFactory requestFactory, MavenPlexusContainer plexusContainer) { - return new MavenExecutor(requestFactory, plexusContainer); - } - @Bean MavenMojoProjectParserFactory projectParserFactory() { return new MavenMojoProjectParserFactory(springRewriteProperties); } - @Bean - MavenPlexusContainer plexusContainer() { - return new MavenPlexusContainer(); - } - @Bean MavenModelReader modelReader() { return new MavenModelReader(); } @Bean - RewriteMavenProjectParser rewriteMavenProjectParser(MavenPlexusContainer plexusContainer, - ParsingEventListener parsingEventListenerAdapter, MavenExecutor mavenExecutor, + RewriteMavenProjectParser rewriteMavenProjectParser(ParsingEventListener parsingEventListenerAdapter, MavenMojoProjectParserFactory mavenMojoProjectParserFactory, ScanScope scanScope, ConfigurableListableBeanFactory beanFactory, ExecutionContext executionContext) { - return new RewriteMavenProjectParser(plexusContainer, parsingEventListenerAdapter, mavenExecutor, - mavenMojoProjectParserFactory, scanScope, beanFactory, executionContext); + return new RewriteMavenProjectParser(parsingEventListenerAdapter, mavenMojoProjectParserFactory, scanScope, + beanFactory, executionContext); } } diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/ParserExecutionHelper.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/ParserExecutionHelper.java index 8d9a0a24..188939ef 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/ParserExecutionHelper.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/ParserExecutionHelper.java @@ -20,17 +20,16 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.test.context.runner.ApplicationContextRunner; -import org.springframework.rewrite.boot.autoconfigure.SpringRewriteCommonsConfiguration; +import org.springframework.rewrite.OpenRewriteProjectParser; import org.springframework.rewrite.RewriteProjectParser; +import org.springframework.rewrite.boot.autoconfigure.RewriteLauncherConfiguration; import org.springframework.rewrite.parser.RewriteProjectParsingResult; import org.springframework.rewrite.parser.SpringRewriteProperties; import org.springframework.rewrite.parser.maven.ComparingParserFactory; import org.springframework.rewrite.parser.maven.RewriteMavenProjectParser; import java.nio.file.Path; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; +import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicReference; /** @@ -58,46 +57,53 @@ public ParallelParsingResult parseParallel(Path baseDir, ExecutionContext execut public ParallelParsingResult parseParallel(Path baseDir, SpringRewriteProperties springRewriteProperties, ExecutionContext executionContext) { - try { - CountDownLatch latch = new CountDownLatch(2); + CountDownLatch latch = new CountDownLatch(2); - ExecutorService threadPool = Executors.newFixedThreadPool(2); + ExecutorService threadPool = Executors.newFixedThreadPool(2); - AtomicReference actualParsingResultRef = new AtomicReference<>(); - AtomicReference expectedParsingResultRef = new AtomicReference<>(); + AtomicReference actualParsingResultRef = new AtomicReference<>(); + AtomicReference expectedParsingResultRef = new AtomicReference<>(); - threadPool.submit(() -> { - RewriteProjectParsingResult parsingResult = parseWithRewriteProjectParser(baseDir, - springRewriteProperties); - ; - actualParsingResultRef.set(parsingResult); - latch.countDown(); - }); + Future customParserResult = threadPool.submit(() -> { + RewriteProjectParsingResult parsingResult = parseWithRewriteProjectParser(baseDir, springRewriteProperties); + actualParsingResultRef.set(parsingResult); + latch.countDown(); + }); - threadPool.submit(() -> { - RewriteProjectParsingResult parsingResult = parseWithComparingParser(baseDir, springRewriteProperties, - executionContext); - expectedParsingResultRef.set(parsingResult); - latch.countDown(); - }); - latch.await(); - return new ParallelParsingResult(expectedParsingResultRef.get(), actualParsingResultRef.get()); + Future submit = threadPool.submit(() -> { + RewriteProjectParsingResult parsingResult = parseWithComparingParser(baseDir, springRewriteProperties, + executionContext); + expectedParsingResultRef.set(parsingResult); + latch.countDown(); + }); + + try { + submit.get(); + customParserResult.get(); } - catch (InterruptedException e) { - throw new RuntimeException(e); + catch (InterruptedException ie) { + Thread.currentThread().interrupt(); } + catch (ExecutionException e) { + Throwable taskException = e.getCause(); + throw new RuntimeException(taskException); + } + + return new ParallelParsingResult(expectedParsingResultRef.get(), actualParsingResultRef.get()); } public RewriteProjectParsingResult parseWithComparingParser(Path baseDir, SpringRewriteProperties springRewriteProperties, ExecutionContext executionContext) { - RewriteMavenProjectParser comparingParser = new ComparingParserFactory() + OpenRewriteProjectParser comparingParser = new ComparingParserFactory() .createComparingParser(springRewriteProperties); try { if (executionContext != null) { - return comparingParser.parse(baseDir, executionContext); + RewriteProjectParsingResult parseResult = comparingParser.parse(baseDir); + return parseResult; } else { - return comparingParser.parse(baseDir); + RewriteProjectParsingResult parseResult = comparingParser.parse(baseDir); + return parseResult; } } catch (Exception e) { @@ -109,7 +115,7 @@ public RewriteProjectParsingResult parseWithComparingParser(Path baseDir, public RewriteProjectParsingResult parseWithRewriteProjectParser(Path baseDir, SpringRewriteProperties springRewriteProperties) { AtomicReference atomicRef = new AtomicReference<>(); - new ApplicationContextRunner().withUserConfiguration(SpringRewriteCommonsConfiguration.class) + new ApplicationContextRunner().withUserConfiguration(RewriteLauncherConfiguration.class) .withBean("spring.rewrite-" + SpringRewriteProperties.class.getName(), SpringRewriteProperties.class, () -> springRewriteProperties) .run(appCtx -> { diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/ParserParityTestHelper.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/ParserParityTestHelper.java index 3f4bfe9c..260610d6 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/ParserParityTestHelper.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/ParserParityTestHelper.java @@ -238,7 +238,7 @@ static void verifyEqualSourceFileMarkers(SourceFile curExpectedSourceFile, Sourc Markers expectedMarkers = curExpectedSourceFile.getMarkers(); List expectedMarkersList = expectedMarkers.getMarkers(); - // Remove custom marker that only exists here + // Remove custom marker that were added by us Markers givenMarkers = curGivenSourceFile.getMarkers().removeByType(ClasspathDependencies.class); List actualMarkersList = givenMarkers.getMarkers(); @@ -458,7 +458,15 @@ static void compareMarker(SoftAssertions softAssertions, Marker expectedMarker, .map(JavaType.FullyQualified::getFullyQualifiedName) .sorted() .toList(); - return c1Sorted.equals(c2Sorted); + boolean equals = c1Sorted.equals(c2Sorted); + if (!equals) { + List differences = new ArrayList<>(c1Sorted); + differences.removeAll(c2Sorted); + String diff = differences.stream().collect(Collectors.joining("\n")); + System.out.println("The diff between lists:"); + System.out.println(diff); + } + return equals; }; } diff --git a/spring-rewrite-commons-launcher/testcode/maven-projects/resources/application/pom.xml b/spring-rewrite-commons-launcher/testcode/maven-projects/resources/application/pom.xml index 904d5c6d..147200cc 100644 --- a/spring-rewrite-commons-launcher/testcode/maven-projects/resources/application/pom.xml +++ b/spring-rewrite-commons-launcher/testcode/maven-projects/resources/application/pom.xml @@ -1,13 +1,19 @@ - + 4.0.0 com.acme parent 0.0.1-SNAPSHOT - ../ + ../pom.xml application + + 17 + 17 + UTF-8 + com.acme diff --git a/spring-rewrite-commons-launcher/testcode/maven-projects/resources/application/src/main/java/MainClass.java b/spring-rewrite-commons-launcher/testcode/maven-projects/resources/application/src/main/java/MainClass.java new file mode 100644 index 00000000..1bdbb308 --- /dev/null +++ b/spring-rewrite-commons-launcher/testcode/maven-projects/resources/application/src/main/java/MainClass.java @@ -0,0 +1,5 @@ +import java.util.List; + +public class MainClass { + +} \ No newline at end of file diff --git a/spring-rewrite-commons-launcher/testcode/maven-projects/resources/component/pom.xml b/spring-rewrite-commons-launcher/testcode/maven-projects/resources/component/pom.xml index 0945f51f..fc8a4524 100644 --- a/spring-rewrite-commons-launcher/testcode/maven-projects/resources/component/pom.xml +++ b/spring-rewrite-commons-launcher/testcode/maven-projects/resources/component/pom.xml @@ -1,11 +1,18 @@ - + 4.0.0 com.acme parent 0.0.1-SNAPSHOT - ../ + ../pom.xml component + + 17 + 17 + UTF-8 + + diff --git a/spring-rewrite-commons-launcher/testcode/maven-projects/resources/pom.xml b/spring-rewrite-commons-launcher/testcode/maven-projects/resources/pom.xml index 51098cd1..8dfec482 100644 --- a/spring-rewrite-commons-launcher/testcode/maven-projects/resources/pom.xml +++ b/spring-rewrite-commons-launcher/testcode/maven-projects/resources/pom.xml @@ -9,4 +9,9 @@ application component + + 17 + 17 + UTF-8 + diff --git a/spring-rewrite-commons-maven-embedder/.gitignore b/spring-rewrite-commons-maven-embedder/.gitignore new file mode 100644 index 00000000..549e00a2 --- /dev/null +++ b/spring-rewrite-commons-maven-embedder/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/spring-rewrite-commons-maven-embedder/.mvn/wrapper/maven-wrapper.jar b/spring-rewrite-commons-maven-embedder/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 00000000..cb28b0e3 Binary files /dev/null and b/spring-rewrite-commons-maven-embedder/.mvn/wrapper/maven-wrapper.jar differ diff --git a/spring-rewrite-commons-maven-embedder/.mvn/wrapper/maven-wrapper.properties b/spring-rewrite-commons-maven-embedder/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..5f0536eb --- /dev/null +++ b/spring-rewrite-commons-maven-embedder/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar diff --git a/spring-rewrite-commons-maven-embedder/mvnw b/spring-rewrite-commons-maven-embedder/mvnw new file mode 100755 index 00000000..66df2854 --- /dev/null +++ b/spring-rewrite-commons-maven-embedder/mvnw @@ -0,0 +1,308 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.2.0 +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "$(uname)" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME + else + JAVA_HOME="/Library/Java/Home"; export JAVA_HOME + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=$(java-config --jre-home) + fi +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME=$(cygpath --unix "$JAVA_HOME") + [ -n "$CLASSPATH" ] && + CLASSPATH=$(cygpath --path --unix "$CLASSPATH") +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] && + JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="$(which javac)" + if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=$(which readlink) + if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then + if $darwin ; then + javaHome="$(dirname "\"$javaExecutable\"")" + javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac" + else + javaExecutable="$(readlink -f "\"$javaExecutable\"")" + fi + javaHome="$(dirname "\"$javaExecutable\"")" + javaHome=$(expr "$javaHome" : '\(.*\)/bin') + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=$(cd "$wdir/.." || exit 1; pwd) + fi + # end of workaround + done + printf '%s' "$(cd "$basedir" || exit 1; pwd)" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + # Remove \r in case we run on Windows within Git Bash + # and check out the repository with auto CRLF management + # enabled. Otherwise, we may read lines that are delimited with + # \r\n and produce $'-Xarg\r' rather than -Xarg due to word + # splitting rules. + tr -s '\r\n' ' ' < "$1" + fi +} + +log() { + if [ "$MVNW_VERBOSE" = true ]; then + printf '%s\n' "$1" + fi +} + +BASE_DIR=$(find_maven_basedir "$(dirname "$0")") +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR +log "$MAVEN_PROJECTBASEDIR" + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" +if [ -r "$wrapperJarPath" ]; then + log "Found $wrapperJarPath" +else + log "Couldn't find $wrapperJarPath, downloading it ..." + + if [ -n "$MVNW_REPOURL" ]; then + wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + else + wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + fi + while IFS="=" read -r key value; do + # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) + safeValue=$(echo "$value" | tr -d '\r') + case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;; + esac + done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" + log "Downloading from: $wrapperUrl" + + if $cygwin; then + wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") + fi + + if command -v wget > /dev/null; then + log "Found wget ... using wget" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + log "Found curl ... using curl" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + else + curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + fi + else + log "Falling back to using Java to download" + javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" + javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaSource=$(cygpath --path --windows "$javaSource") + javaClass=$(cygpath --path --windows "$javaClass") + fi + if [ -e "$javaSource" ]; then + if [ ! -e "$javaClass" ]; then + log " - Compiling MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/javac" "$javaSource") + fi + if [ -e "$javaClass" ]; then + log " - Running MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +# If specified, validate the SHA-256 sum of the Maven wrapper jar file +wrapperSha256Sum="" +while IFS="=" read -r key value; do + case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;; + esac +done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" +if [ -n "$wrapperSha256Sum" ]; then + wrapperSha256Result=false + if command -v sha256sum > /dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then + wrapperSha256Result=true + fi + elif command -v shasum > /dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then + wrapperSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." + echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." + exit 1 + fi + if [ $wrapperSha256Result = false ]; then + echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2 + echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2 + echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2 + exit 1 + fi +fi + +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME") + [ -n "$CLASSPATH" ] && + CLASSPATH=$(cygpath --path --windows "$CLASSPATH") + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR") +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +# shellcheck disable=SC2086 # safe args +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/spring-rewrite-commons-maven-embedder/mvnw.cmd b/spring-rewrite-commons-maven-embedder/mvnw.cmd new file mode 100644 index 00000000..95ba6f54 --- /dev/null +++ b/spring-rewrite-commons-maven-embedder/mvnw.cmd @@ -0,0 +1,205 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.2.0 +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %WRAPPER_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file +SET WRAPPER_SHA_256_SUM="" +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B +) +IF NOT %WRAPPER_SHA_256_SUM%=="" ( + powershell -Command "&{"^ + "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ + "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ + " Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ + " Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ + " Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ + " exit 1;"^ + "}"^ + "}" + if ERRORLEVEL 1 goto error +) + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/spring-rewrite-commons-maven-embedder/pom.xml b/spring-rewrite-commons-maven-embedder/pom.xml new file mode 100644 index 00000000..a88a7ae8 --- /dev/null +++ b/spring-rewrite-commons-maven-embedder/pom.xml @@ -0,0 +1,98 @@ + + + 4.0.0 + + org.springframework.rewrite + spring-rewrite-commons + 0.1.0-SNAPSHOT + ../pom.xml + + spring-rewrite-commons-maven-embedder + Spring Rewrite Maven Embedder + Maven Embedder with access to Maven lifecycle events + + 17 + + + + org.springframework.boot + spring-boot-starter + + + org.openrewrite.maven + rewrite-maven-plugin + ${rewrite-maven-plugin.version} + + + org.apache.maven + maven-embedder + + + org.apache.maven.shared + maven-invoker + + + org.apache.maven.shared + maven-shared-utils + 3.4.2 + + + org.apache.maven.resolver + maven-resolver-util + ${maven-resolver.version} + + + org.apache.maven.resolver + maven-resolver-api + ${maven-resolver.version} + + + org.apache.maven.resolver + maven-resolver-impl + ${maven-resolver.version} + + + org.apache.maven.resolver + maven-resolver-transport-wagon + ${maven-resolver.version} + + + org.apache.maven.resolver + maven-resolver-connector-basic + ${maven-resolver.version} + + + org.apache.maven.wagon + wagon-http + ${maven-wagon-http.version} + + + org.apache.maven + maven-resolver-provider + ${maven.version} + + + org.apache.maven + maven-compat + ${maven.version} + + + + org.projectlombok + lombok + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.rewrite + spring-rewrite-commons-test + 0.1.0-SNAPSHOT + test + + + + diff --git a/spring-rewrite-commons-maven-embedder/src/main/java/org/springframework/rewrite/embedder/AbstractExecutionListener.java b/spring-rewrite-commons-maven-embedder/src/main/java/org/springframework/rewrite/embedder/AbstractExecutionListener.java new file mode 100644 index 00000000..a80b674e --- /dev/null +++ b/spring-rewrite-commons-maven-embedder/src/main/java/org/springframework/rewrite/embedder/AbstractExecutionListener.java @@ -0,0 +1,109 @@ +/* + * Copyright 2021 - 2023 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.rewrite.embedder; + +import org.apache.maven.eventspy.AbstractEventSpy; +import org.apache.maven.execution.ExecutionEvent; +import org.apache.maven.execution.ExecutionListener; +import org.apache.maven.project.MavenProject; +import org.codehaus.plexus.component.annotations.Component; + +import java.util.function.Consumer; + +@Component(role = AbstractEventSpy.class, hint = "customExecutionListener") +public abstract class AbstractExecutionListener extends AbstractEventSpy implements ExecutionListener { + + public AbstractExecutionListener() { + } + + @Override + public void init(Context context) throws Exception { + } + + @Override + public void onEvent(Object event) throws Exception { + } + + @Override + public void projectDiscoveryStarted(ExecutionEvent executionEvent) { + } + + @Override + public void sessionStarted(ExecutionEvent executionEvent) { + } + + @Override + public void sessionEnded(ExecutionEvent executionEvent) { + } + + @Override + public void projectSkipped(ExecutionEvent executionEvent) { + } + + @Override + public void projectStarted(ExecutionEvent executionEvent) { + } + + @Override + public void projectSucceeded(ExecutionEvent executionEvent) { + } + + @Override + public void projectFailed(ExecutionEvent executionEvent) { + } + + @Override + public void mojoSkipped(ExecutionEvent executionEvent) { + } + + @Override + public void mojoStarted(ExecutionEvent executionEvent) { + } + + @Override + public void mojoSucceeded(ExecutionEvent executionEvent) { + } + + @Override + public void mojoFailed(ExecutionEvent executionEvent) { + } + + @Override + public void forkStarted(ExecutionEvent executionEvent) { + } + + @Override + public void forkSucceeded(ExecutionEvent executionEvent) { + } + + @Override + public void forkFailed(ExecutionEvent executionEvent) { + + } + + @Override + public void forkedProjectStarted(ExecutionEvent executionEvent) { + } + + @Override + public void forkedProjectSucceeded(ExecutionEvent executionEvent) { + } + + @Override + public void forkedProjectFailed(ExecutionEvent executionEvent) { + } + +} diff --git a/spring-rewrite-commons-maven-embedder/src/main/java/org/springframework/rewrite/embedder/CLIReportingUtils.java b/spring-rewrite-commons-maven-embedder/src/main/java/org/springframework/rewrite/embedder/CLIReportingUtils.java new file mode 100644 index 00000000..01a65536 --- /dev/null +++ b/spring-rewrite-commons-maven-embedder/src/main/java/org/springframework/rewrite/embedder/CLIReportingUtils.java @@ -0,0 +1,195 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.springframework.rewrite.embedder; + +import java.io.IOException; +import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Locale; +import java.util.Properties; + +import org.apache.commons.lang3.StringUtils; +import org.apache.maven.cli.MavenCli; +import org.codehaus.plexus.util.Os; +import org.slf4j.Logger; + +import static org.apache.maven.shared.utils.logging.MessageUtils.buffer; + +/** + * Utility class used to report errors, statistics, application version info, etc. + * + * @author jdcasey + */ +public final class CLIReportingUtils { + + // CHECKSTYLE_OFF: MagicNumber + public static final long MB = 1024 * 1024; + + private static final long ONE_SECOND = 1000L; + + private static final long ONE_MINUTE = 60 * ONE_SECOND; + + private static final long ONE_HOUR = 60 * ONE_MINUTE; + + private static final long ONE_DAY = 24 * ONE_HOUR; + + // CHECKSTYLE_ON: MagicNumber + + public static final String BUILD_VERSION_PROPERTY = "version"; + + public static String showVersion() { + final String ls = System.lineSeparator(); + Properties properties = getBuildProperties(); + StringBuilder version = new StringBuilder(256); + version.append(buffer().strong(createMavenVersionString(properties))).append(ls); + version + .append(reduce(properties.getProperty("distributionShortName") + " home: " + + System.getProperty("maven.home", ""))) + .append(ls); + version.append("Java version: ") + .append(System.getProperty("java.version", "")) + .append(", vendor: ") + .append(System.getProperty("java.vendor", "")) + .append(", runtime: ") + .append(System.getProperty("java.home", "")) + .append(ls); + version.append("Default locale: ") + .append(Locale.getDefault()) + .append(", platform encoding: ") + .append(System.getProperty("file.encoding", "")) + .append(ls); + version.append("OS name: \"") + .append(Os.OS_NAME) + .append("\", version: \"") + .append(Os.OS_VERSION) + .append("\", arch: \"") + .append(Os.OS_ARCH) + .append("\", family: \"") + .append(Os.OS_FAMILY) + .append('\"'); + return version.toString(); + } + + public static String showVersionMinimal() { + Properties properties = getBuildProperties(); + String version = reduce(properties.getProperty(BUILD_VERSION_PROPERTY)); + return (version != null ? version : ""); + } + + /** + * Create a human readable string containing the Maven version, buildnumber, and time + * of build + * @param buildProperties The build properties + * @return Readable build info + */ + static String createMavenVersionString(Properties buildProperties) { + String timestamp = reduce(buildProperties.getProperty("timestamp")); + String version = reduce(buildProperties.getProperty(BUILD_VERSION_PROPERTY)); + String rev = reduce(buildProperties.getProperty("buildNumber")); + String distributionName = reduce(buildProperties.getProperty("distributionName")); + + String msg = distributionName + " "; + msg += (version != null ? version : ""); + if (rev != null || timestamp != null) { + msg += " ("; + msg += (rev != null ? rev : ""); + if (StringUtils.isNotBlank(timestamp)) { + String ts = formatTimestamp(Long.parseLong(timestamp)); + msg += (rev != null ? "; " : "") + ts; + } + msg += ")"; + } + return msg; + } + + private static String reduce(String s) { + return (s != null ? (s.startsWith("${") && s.endsWith("}") ? null : s) : null); + } + + static Properties getBuildProperties() { + Properties properties = new Properties(); + + try (InputStream resourceAsStream = MavenCli.class + .getResourceAsStream("/org/apache/maven/messages/build.properties")) { + + if (resourceAsStream != null) { + properties.load(resourceAsStream); + } + } + catch (IOException e) { + System.err.println("Unable determine version from JAR file: " + e.getMessage()); + } + + return properties; + } + + public static void showError(Logger logger, String message, Throwable e, boolean showStackTrace) { + if (showStackTrace) { + logger.error(message, e); + } + else { + logger.error(message); + + if (e != null) { + logger.error(e.getMessage()); + + for (Throwable cause = e.getCause(); cause != null; cause = cause.getCause()) { + logger.error("Caused by: {}", cause.getMessage()); + } + } + } + } + + public static String formatTimestamp(long timestamp) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX"); + return sdf.format(new Date(timestamp)); + } + + public static String formatDuration(long duration) { + // CHECKSTYLE_OFF: MagicNumber + long ms = duration % 1000; + long s = (duration / ONE_SECOND) % 60; + long m = (duration / ONE_MINUTE) % 60; + long h = (duration / ONE_HOUR) % 24; + long d = duration / ONE_DAY; + // CHECKSTYLE_ON: MagicNumber + + String format; + if (d > 0) { + // Length 11+ chars + format = "%d d %02d:%02d h"; + } + else if (h > 0) { + // Length 7 chars + format = "%2$02d:%3$02d h"; + } + else if (m > 0) { + // Length 9 chars + format = "%3$02d:%4$02d min"; + } + else { + // Length 7-8 chars + format = "%4$d.%5$03d s"; + } + + return String.format(format, d, h, m, s, ms); + } + +} diff --git a/spring-rewrite-commons-maven-embedder/src/main/java/org/springframework/rewrite/embedder/MavenExecutionResult.java b/spring-rewrite-commons-maven-embedder/src/main/java/org/springframework/rewrite/embedder/MavenExecutionResult.java new file mode 100644 index 00000000..a3bca9f9 --- /dev/null +++ b/spring-rewrite-commons-maven-embedder/src/main/java/org/springframework/rewrite/embedder/MavenExecutionResult.java @@ -0,0 +1,23 @@ +/* + * Copyright 2021 - 2023 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.rewrite.embedder; + +/** + * @author Fabian Krüger + */ +public class MavenExecutionResult { + +} diff --git a/spring-rewrite-commons-maven-embedder/src/main/java/org/springframework/rewrite/embedder/MavenExecutor.java b/spring-rewrite-commons-maven-embedder/src/main/java/org/springframework/rewrite/embedder/MavenExecutor.java new file mode 100644 index 00000000..9fccff6b --- /dev/null +++ b/spring-rewrite-commons-maven-embedder/src/main/java/org/springframework/rewrite/embedder/MavenExecutor.java @@ -0,0 +1,1727 @@ +/* + * Copyright 2021 - 2023 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.rewrite.embedder; + +import com.google.inject.AbstractModule; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.Option; +import org.apache.commons.cli.ParseException; +import org.apache.commons.cli.UnrecognizedOptionException; +import org.apache.commons.lang3.math.NumberUtils; +import org.apache.maven.BuildAbort; +import org.apache.maven.InternalErrorException; +import org.apache.maven.Maven; +import org.apache.maven.building.FileSource; +import org.apache.maven.building.Problem; +import org.apache.maven.building.Source; +import org.apache.maven.cli.CLIManager; +import org.apache.maven.cli.CliRequest; +import org.apache.maven.cli.configuration.ConfigurationProcessor; +import org.apache.maven.cli.configuration.SettingsXmlConfigurationProcessor; +import org.apache.maven.cli.event.DefaultEventSpyContext; +import org.apache.maven.cli.event.ExecutionEventLogger; +import org.apache.maven.cli.internal.BootstrapCoreExtensionManager; +import org.apache.maven.cli.internal.extension.model.CoreExtension; +import org.apache.maven.cli.internal.extension.model.io.xpp3.CoreExtensionsXpp3Reader; +import org.apache.maven.cli.logging.Slf4jConfiguration; +import org.apache.maven.cli.logging.Slf4jConfigurationFactory; +import org.apache.maven.cli.logging.Slf4jLoggerManager; +import org.apache.maven.cli.logging.Slf4jStdoutLogger; +import org.apache.maven.cli.transfer.ConsoleMavenTransferListener; +import org.apache.maven.cli.transfer.QuietMavenTransferListener; +import org.apache.maven.cli.transfer.Slf4jMavenTransferListener; +import org.apache.maven.eventspy.internal.EventSpyDispatcher; +import org.apache.maven.exception.DefaultExceptionHandler; +import org.apache.maven.exception.ExceptionHandler; +import org.apache.maven.exception.ExceptionSummary; +import org.apache.maven.execution.*; + +import java.nio.charset.Charset; +import java.nio.file.Path; +import org.apache.maven.execution.MavenExecutionResult; +import org.apache.maven.execution.scope.internal.MojoExecutionScopeModule; +import org.apache.maven.extension.internal.CoreExports; +import org.apache.maven.extension.internal.CoreExtensionEntry; +import org.apache.maven.lifecycle.LifecycleExecutionException; +import org.apache.maven.model.building.ModelProcessor; +import org.apache.maven.project.MavenProject; +import org.apache.maven.properties.internal.EnvironmentUtils; +import org.apache.maven.properties.internal.SystemProperties; +import org.apache.maven.session.scope.internal.SessionScopeModule; +import org.apache.maven.shared.utils.logging.MessageBuilder; +import org.apache.maven.shared.utils.logging.MessageUtils; +import org.apache.maven.toolchain.building.DefaultToolchainsBuildingRequest; +import org.apache.maven.toolchain.building.ToolchainsBuilder; +import org.apache.maven.toolchain.building.ToolchainsBuildingResult; +import org.codehaus.plexus.ContainerConfiguration; +import org.codehaus.plexus.DefaultContainerConfiguration; +import org.codehaus.plexus.DefaultPlexusContainer; +import org.codehaus.plexus.PlexusConstants; +import org.codehaus.plexus.PlexusContainer; +import org.codehaus.plexus.classworlds.ClassWorld; +import org.codehaus.plexus.classworlds.realm.ClassRealm; +import org.codehaus.plexus.classworlds.realm.NoSuchRealmException; +import org.codehaus.plexus.component.repository.exception.ComponentLookupException; +import org.codehaus.plexus.logging.LoggerManager; +import org.codehaus.plexus.util.StringUtils; +import org.codehaus.plexus.util.xml.pull.XmlPullParserException; +import org.eclipse.aether.transfer.TransferListener; +import org.slf4j.ILoggerFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.sonatype.plexus.components.cipher.DefaultPlexusCipher; +import org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher; +import org.sonatype.plexus.components.sec.dispatcher.SecDispatcher; +import org.sonatype.plexus.components.sec.dispatcher.SecUtil; +import org.sonatype.plexus.components.sec.dispatcher.model.SettingsSecurity; +import org.springframework.util.ReflectionUtils; + +import java.io.*; +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.nio.file.Files; +import java.util.*; +import java.util.function.Consumer; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Stream; + +import static org.apache.maven.cli.CLIManager.COLOR; +import static org.apache.maven.cli.ResolveFile.resolveFile; +import static org.apache.maven.shared.utils.logging.MessageUtils.buffer; + +// TODO push all common bits back to plexus cli and prepare for transition to Guice. We don't need 50 ways to make CLIs + +/** + * Starts a Maven build in the same process and provides API to register a listener for + * {@link ExecutionEvent}s. The {@link ExecutionListener} has access to the + * {@link MavenSession} which provides access to the required (internal) build + * information. Access to these Maven internals is required to gather the parameters + * required for {@link org.openrewrite.maven.MavenMojoProjectParser}. + * + * This class is mainly a copy of {@link org.apache.maven.cli.MavenCli} opening up access + * to the {@link MavenSession}. + * + * Author: Jason van Zyl + * + * @author Fabian Krüger + */ +public class MavenExecutor { + + public static final String LOCAL_REPO_PROPERTY = "maven.repo.local"; + + public static final String MULTIMODULE_PROJECT_DIRECTORY = "maven.multiModuleProjectDirectory"; + + public static final String USER_HOME = System.getProperty("user.home"); + + public static final File USER_MAVEN_CONFIGURATION_HOME = new File(USER_HOME, ".m2"); + + public static final File DEFAULT_USER_TOOLCHAINS_FILE = new File(USER_MAVEN_CONFIGURATION_HOME, "toolchains.xml"); + + public static final File DEFAULT_GLOBAL_TOOLCHAINS_FILE = new File(System.getProperty("maven.conf"), + "toolchains.xml"); + + private static final String EXT_CLASS_PATH = "maven.ext.class.path"; + + private static final String EXTENSIONS_FILENAME = ".mvn/extensions.xml"; + + private static final String MVN_MAVEN_CONFIG = ".mvn/maven.config"; + + public static final String STYLE_COLOR_PROPERTY = "style.color"; + + private ClassWorld classWorld; + + private LoggerManager plexusLoggerManager; + + private ILoggerFactory slf4jLoggerFactory; + + private Logger slf4jLogger; + + private EventSpyDispatcher eventSpyDispatcher; + + private ModelProcessor modelProcessor; + + private Maven maven; + + private MavenExecutionRequestPopulator executionRequestPopulator; + + private ToolchainsBuilder toolchainsBuilder; + + private DefaultSecDispatcher dispatcher; + + private Map configurationProcessors; + + private static final Pattern NEXT_LINE = Pattern.compile("\r?\n"); + + private CLIManager cliManager; + + private final ExecutionListener listener; + + public MavenExecutor(Consumer onSuccess) { + this(LoggerFactory.getLogger("MavenBuildLogger"), onSuccess); + } + + public MavenExecutor(Logger logger, Consumer onSuccess) { + this.listener = new AbstractExecutionListener() { + + @Override + public void mojoSucceeded(ExecutionEvent executionEvent) { + } + + @Override + public void forkedProjectSucceeded(ExecutionEvent executionEvent) { + } + + @Override + public void projectSucceeded(ExecutionEvent executionEvent) { + MavenProject currentProject = executionEvent.getSession().getCurrentProject(); + MavenProject topLevelProject = executionEvent.getSession().getTopLevelProject(); + if (currentProject == topLevelProject) { + onSuccess.accept(executionEvent); + } + } + + @Override + public void projectFailed(ExecutionEvent executionEvent) { + // TODO: Throw exception... ? + } + + @Override + public void sessionEnded(ExecutionEvent executionEvent) { + } + + }; + this.slf4jLogger = logger; + this.classWorld = new ClassWorld("plexus.core", Thread.currentThread().getContextClassLoader()); + } + + /** + * Create a new instance that will publish Maven {@link ExecutionEvent}s to the + * {@code listener}. + */ + public MavenExecutor(Logger logger, ExecutionListener listener) { + this.listener = listener; + this.slf4jLogger = logger; + this.classWorld = new ClassWorld("plexus.core", Thread.currentThread().getContextClassLoader()); + } + + // @Deprecated(forRemoval = true) + // public static int main(String[] args, ClassWorld classWorld) { + // MavenExecutor cli = new MavenExecutor(new AbstractExecutionListener(e -> + // System.out.println(e))); + // + // MessageUtils.systemInstall(); + // MessageUtils.registerShutdownHook(); + // CliRequest cliRequest = createCliRequest(args, classWorld); + // int result = cli.doMain(cliRequest); + // MessageUtils.systemUninstall(); + // + // return result; + // } + + private static CliRequest createCliRequest(String[] args, ClassWorld classWorld) { + try { + Constructor constructor = CliRequest.class.getDeclaredConstructor(String[].class, + ClassWorld.class); + constructor.setAccessible(true); // Make the constructor accessible + CliRequest delegate = constructor.newInstance(args, classWorld); + return delegate; + } + catch (InstantiationException e) { + throw new RuntimeException(e); + } + catch (IllegalAccessException e) { + throw new RuntimeException(e); + } + catch (InvocationTargetException e) { + throw new RuntimeException(e); + } + catch (NoSuchMethodException e) { + throw new RuntimeException(e); + } + } + + public int execute(List goals, Path baseDir) { + MessageUtils.systemInstall(); + MessageUtils.registerShutdownHook(); + int result = execute(goals, baseDir.toString(), System.out, System.err); + MessageUtils.systemUninstall(); + + return result; + } + + public int execute(List goals, String workingDirectory, PrintStream out, PrintStream err) { + System.setProperty("maven.multiModuleProjectDirectory", workingDirectory); + return doMain(goals.toArray(new String[] {}), workingDirectory, out, err); + } + + /** + * This supports painless invocation by the Verifier during embedded execution of the + * core ITs. See + * Embedded3xLauncher in maven-verifier + */ + public int doMain(String[] args, String workingDirectory, PrintStream stdout, PrintStream stderr) { + PrintStream oldout = System.out; + PrintStream olderr = System.err; + + final Set realms; + if (classWorld != null) { + realms = new HashSet<>(); + for (ClassRealm realm : classWorld.getRealms()) { + realms.add(realm.getId()); + } + } + else { + realms = Collections.emptySet(); + } + + try { + if (stdout != null) { + System.setOut(stdout); + } + if (stderr != null) { + System.setErr(stderr); + } + + CliRequest cliRequest = createCliRequest(args, classWorld); + setField(cliRequest, "workingDirectory", workingDirectory); + return doMain(cliRequest); + } + finally { + if (classWorld != null) { + for (ClassRealm realm : new ArrayList<>(classWorld.getRealms())) { + String realmId = realm.getId(); + if (!realms.contains(realmId)) { + try { + classWorld.disposeRealm(realmId); + } + catch (NoSuchRealmException ignored) { + // can't happen + } + } + } + } + System.setOut(oldout); + System.setErr(olderr); + } + } + + private void setField(Object target, String fieldName, Object value) { + try { + Field field = target.getClass().getDeclaredField(fieldName); + ReflectionUtils.makeAccessible(field); + ReflectionUtils.setField(field, target, value); + } + catch (NoSuchFieldException e) { + throw new RuntimeException("Field '%s' is not defined on type '%s'".formatted(fieldName, target.getClass()), + e); + } + } + // TODO need to externalize CliRequest + + public int doMain(CliRequest cliRequest) { + PlexusContainer localContainer = null; + try { + initialize(cliRequest); + cli(cliRequest); + properties(cliRequest); + logging(cliRequest); + informativeCommands(cliRequest); + version(cliRequest); + localContainer = container(cliRequest); + commands(cliRequest); + configure(cliRequest); + toolchains(cliRequest); + populateRequest(cliRequest); + encryption(cliRequest); + + cliRequest.getRequest().setExecutionListener(listener); + + return execute(cliRequest); + } + catch (ExitException e) { + return e.exitCode; + } + catch (UnrecognizedOptionException e) { + // pure user error, suppress stack trace + return 1; + } + catch (BuildAbort e) { + CLIReportingUtils.showError(slf4jLogger, "ABORTED", e, cliRequest.isShowErrors()); + + return 2; + } + catch (Exception e) { + Boolean showErrors = cliRequest.isShowErrors(); + CLIReportingUtils.showError(slf4jLogger, "Error executing Maven.", e, showErrors); + + return 1; + } + finally { + if (localContainer != null) { + localContainer.dispose(); + } + } + } + + void initialize(CliRequest cliRequest) throws MavenExecutor.ExitException { + if (cliRequest.getWorkingDirectory() == null) { + setField(cliRequest, "workingDirectory", System.getProperty("user.dir")); + } + + File multiModuleProjectDirectory = cliRequest.getMultiModuleProjectDirectory(); + if (multiModuleProjectDirectory == null) { + String basedirProperty = System.getProperty(MULTIMODULE_PROJECT_DIRECTORY); + if (basedirProperty == null) { + System.err.format("-D%s system property is not set.", MULTIMODULE_PROJECT_DIRECTORY); + throw new MavenExecutor.ExitException(1); + } + File basedir = basedirProperty != null ? new File(basedirProperty) : new File(""); + try { + setField(cliRequest, "multiModuleProjectDirectory", basedir.getCanonicalFile()); + } + catch (IOException e) { + setField(cliRequest, "multiModuleProjectDirectory", basedir.getAbsoluteFile()); + } + } + + // + // Make sure the Maven home directory is an absolute path to save us from + // confusion with say drive-relative + // Windows paths. + // + String mavenHome = System.getProperty("maven.home"); + + if (mavenHome != null) { + System.setProperty("maven.home", new File(mavenHome).getAbsolutePath()); + } + } + + void cli(CliRequest cliRequest) throws Exception { + // + // Parsing errors can happen during the processing of the arguments and we prefer + // not having to check if + // the logger is null and construct this so we can use an SLF4J logger everywhere. + // + slf4jLogger = new Slf4jStdoutLogger(); + + cliManager = new CLIManager(); + + CommandLine mavenConfig = null; + try { + File multiModuleProjectDirectory = cliRequest.getMultiModuleProjectDirectory(); + File configFile = new File(multiModuleProjectDirectory, MVN_MAVEN_CONFIG); + + if (configFile.isFile()) { + try (Stream lines = Files.lines(configFile.toPath(), Charset.defaultCharset())) { + String[] args = lines.filter(arg -> !arg.isEmpty()).toArray(String[]::new); + mavenConfig = cliManager.parse(args); + List unrecognized = mavenConfig.getArgList(); + if (!unrecognized.isEmpty()) { + // This file can only contain options, not args (goals or phases) + throw new ParseException("Unrecognized maven.config file entries: " + unrecognized); + } + } + } + } + catch (ParseException e) { + System.err.println("Unable to parse maven.config file options: " + e.getMessage()); + cliManager.displayHelp(System.out); + throw e; + } + + try { + CommandLine mavenCli = cliManager.parse(cliRequest.getArgs()); + if (mavenConfig == null) { + setField(cliRequest, "commandLine", mavenCli); + } + else { + setField(cliRequest, "commandLine", cliMerge(mavenConfig, mavenCli)); + } + } + catch (ParseException e) { + System.err.println("Unable to parse command line options: " + e.getMessage()); + cliManager.displayHelp(System.out); + throw e; + } + + // check for presence of unsupported command line options + try { + if (cliRequest.getCommandLine().hasOption("llr")) { + throw new UnrecognizedOptionException("Option '-llr' is not supported starting with Maven 3.9.1"); + } + } + catch (ParseException e) { + System.err.println("Unsupported options: " + e.getMessage()); + cliManager.displayHelp(System.out); + throw e; + } + } + + private void informativeCommands(CliRequest cliRequest) throws ExitException { + if (cliRequest.getCommandLine().hasOption(CLIManager.HELP)) { + cliManager.displayHelp(System.out); + throw new MavenExecutor.ExitException(0); + } + + if (cliRequest.getCommandLine().hasOption(CLIManager.VERSION)) { + if (cliRequest.getCommandLine().hasOption(CLIManager.QUIET)) { + System.out.println(CLIReportingUtils.showVersionMinimal()); + } + else { + System.out.println(CLIReportingUtils.showVersion()); + } + throw new MavenExecutor.ExitException(0); + } + } + + private CommandLine cliMerge(CommandLine mavenConfig, CommandLine mavenCli) { + CommandLine.Builder commandLineBuilder = new CommandLine.Builder(); + + // the args are easy, CLI only since maven.config file can only contain options + for (String arg : mavenCli.getArgs()) { + commandLineBuilder.addArg(arg); + } + + /* + * Although this looks wrong in terms of order Commons CLI stores the value of + * options in an array and when a value is potentionally overriden it is added to + * the array. The single arg option value is retrieved and instead of returning + * values[values.length-1] it returns values[0] which means that the original + * value instead of the overridden one is returned (first wins). With properties + * values are truely overriden since at the end a map is used to merge which means + * last wins. + * + * TODO Report this behavioral bug with Commons CLI + */ + // now add all options, except for user properties with CLI first then + // maven.config file + List