> On Dec. 4, 2014, 1:12 a.m., Kevin Sweeney wrote: > > buildSrc/src/main/groovy/org/apache/aurora/build/ThriftPlugin.groovy, line > > 124 > > <https://reviews.apache.org/r/28682/diff/1/?file=782159#file782159line124> > > > > Override this in the thriftEntities block in the build.gradle, not in > > the source for the plugin. > > > > ``` > > thriftEntities { > > inputFiles = fileTree(...) > > } > > ``` > > > > But is this just here to exclude thermos? In that case you might > > consider adding an explicit exclude (in the build.gradle).
I've gone for the short-term fix, using the inputFiles override. - Bill ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/28682/#review63796 ----------------------------------------------------------- On Dec. 4, 2014, 12:36 a.m., Bill Farner wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/28682/ > ----------------------------------------------------------- > > (Updated Dec. 4, 2014, 12:36 a.m.) > > > Review request for Aurora, Kevin Sweeney and Zameer Manji. > > > Bugs: AURORA-947 > https://issues.apache.org/jira/browse/AURORA-947 > > > Repository: aurora > > > Description > ------- > > There's a subtle change in > `buildSrc/src/main/groovy/org/apache/aurora/build/ThriftPlugin.groovy` to > avoid generating thermos' thrift for the scheduler. This prevents a conflict > on index.html. > > > Diffs > ----- > > > buildSrc/src/main/groovy/org/apache/aurora/build/ThriftEntitiesPlugin.groovy > 31934f551da808951144cd474255105a9d198854 > buildSrc/src/main/groovy/org/apache/aurora/build/ThriftPlugin.groovy > e6114cf0ec557b8d365140b5f413c69a61dc1563 > src/main/java/org/apache/aurora/scheduler/http/JettyServerModule.java > 022b9f452e8f7c129b8c202c5f2fff5547f71b0d > src/main/python/apache/aurora/tools/java/thrift_wrapper_codegen.py > ca2581cfc38a5873143e2ca8dc6e23b8ec389421 > src/main/resources/scheduler/assets/index.html > cc62d9ea9eb5923c7bd926e1e1a45ebbeaeb0287 > > Diff: https://reviews.apache.org/r/28682/diff/ > > > Testing > ------- > > ./gradlew run, clicked around. > > > Thanks, > > Bill Farner > >