홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Brian O'Connor
Committed by Gerrit Code Review
69e37d92 1 parent d27d4375

Updating BUCK plugin to latest buck-api 

Change-Id: I7e40808946d8999bb60ddf958665b9a610abcf8d
Inline Side-by-side
Showing 3 changed files with 17 additions and 6 deletions
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
2 remote_jar ( 2 remote_jar (
3 name = 'buck-api', 3 name = 'buck-api',
4 out = 'buck.jar', 4 out = 'buck.jar',
5 - url = 'https://github.com/bocon13/buck/releases/download/v2016.09.13.01/buck.jar', 5 + url = 'https://oss.sonatype.org/content/repositories/snapshots/org/onosproject/buck-api/0.1-SNAPSHOT/buck-api-0.1-20161012.212306-4.jar',
6 - sha1 = 'd5415b4326e5316675532a8cd48001a8456e8c9e', 6 + sha1 = 'c9cca7ae74ad77dbcbd8e58fc2c6f8ed2b435305',
7 visibility = [], 7 visibility = [],
8 ) 8 )
9 9
......
...@@ -74,6 +74,7 @@ public class OnosJar extends DefaultJavaLibrary ...@@ -74,6 +74,7 @@ public class OnosJar extends DefaultJavaLibrary
74 ImmutableSet<Path> additionalClasspathEntries, 74 ImmutableSet<Path> additionalClasspathEntries,
75 CompileToJarStepFactory compileStepFactory, 75 CompileToJarStepFactory compileStepFactory,
76 Optional<Path> resourcesRoot, 76 Optional<Path> resourcesRoot,
77 + Optional<SourcePath> manifestFile,
77 Optional<String> mavenCoords, 78 Optional<String> mavenCoords,
78 ImmutableSortedSet<BuildTarget> tests, 79 ImmutableSortedSet<BuildTarget> tests,
79 ImmutableSet<Pattern> classesToRemoveFromJar, 80 ImmutableSet<Pattern> classesToRemoveFromJar,
...@@ -85,8 +86,8 @@ public class OnosJar extends DefaultJavaLibrary ...@@ -85,8 +86,8 @@ public class OnosJar extends DefaultJavaLibrary
85 super(params, resolver, srcs, resources, generatedSourceFolder, 86 super(params, resolver, srcs, resources, generatedSourceFolder,
86 proguardConfig, postprocessClassesCommands, exportedDeps, 87 proguardConfig, postprocessClassesCommands, exportedDeps,
87 providedDeps, abiJar, trackClassUsage, additionalClasspathEntries, 88 providedDeps, abiJar, trackClassUsage, additionalClasspathEntries,
88 - compileStepFactory, resourcesRoot, mavenCoords, tests, 89 + compileStepFactory, resourcesRoot, manifestFile, mavenCoords,
89 - classesToRemoveFromJar); 90 + tests, classesToRemoveFromJar);
90 this.webContext = webContext; 91 this.webContext = webContext;
91 this.apiTitle = apiTitle; 92 this.apiTitle = apiTitle;
92 this.apiVersion = apiVersion; 93 this.apiVersion = apiVersion;
...@@ -120,4 +121,10 @@ public class OnosJar extends DefaultJavaLibrary ...@@ -120,4 +121,10 @@ public class OnosJar extends DefaultJavaLibrary
120 //FIXME this is not supported at the moment 121 //FIXME this is not supported at the moment
121 return ImmutableList.of(); 122 return ImmutableList.of();
122 } 123 }
124 +
125 + @Override
126 + public Optional<Path> getPomTemplate() {
127 + //FIXME we should consider supporting this
128 + return Optional.absent();
129 + }
123 } 130 }
......
...@@ -138,7 +138,8 @@ public class OnosJarDescription implements Description<OnosJarDescription.Arg>, ...@@ -138,7 +138,8 @@ public class OnosJarDescription implements Description<OnosJarDescription.Arg>,
138 Preconditions.checkNotNull(paramsWithMavenFlavor), 138 Preconditions.checkNotNull(paramsWithMavenFlavor),
139 pathResolver, 139 pathResolver,
140 args.srcs.get(), 140 args.srcs.get(),
141 - args.mavenCoords); 141 + args.mavenCoords,
142 + Optional.absent()); //FIXME
142 } 143 }
143 } 144 }
144 145
...@@ -180,7 +181,8 @@ public class OnosJarDescription implements Description<OnosJarDescription.Arg>, ...@@ -180,7 +181,8 @@ public class OnosJarDescription implements Description<OnosJarDescription.Arg>,
180 args.srcs.get(), 181 args.srcs.get(),
181 javadocFiles.build(), 182 javadocFiles.build(),
182 javadocArgs.build(), 183 javadocArgs.build(),
183 - args.mavenCoords); 184 + args.mavenCoords,
185 + Optional.absent()); //FIXME
184 } 186 }
185 } 187 }
186 188
...@@ -232,6 +234,7 @@ public class OnosJarDescription implements Description<OnosJarDescription.Arg>, ...@@ -232,6 +234,7 @@ public class OnosJarDescription implements Description<OnosJarDescription.Arg>,
232 args.bundleLicense, args.bundleDescription, args.importPackages, 234 args.bundleLicense, args.bundleDescription, args.importPackages,
233 args.exportPackages, args.includeResources, args.dynamicimportPackages), 235 args.exportPackages, args.includeResources, args.dynamicimportPackages),
234 args.resourcesRoot, 236 args.resourcesRoot,
237 + args.manifestFile,
235 args.mavenCoords, 238 args.mavenCoords,
236 args.tests.get(), 239 args.tests.get(),
237 javacOptions.getClassesToRemoveFromJar(), 240 javacOptions.getClassesToRemoveFromJar(),
...@@ -270,6 +273,7 @@ public class OnosJarDescription implements Description<OnosJarDescription.Arg>, ...@@ -270,6 +273,7 @@ public class OnosJarDescription implements Description<OnosJarDescription.Arg>,
270 /* additionalClasspathEntries */ ImmutableSet.<Path>of(), 273 /* additionalClasspathEntries */ ImmutableSet.<Path>of(),
271 new JavacToJarStepFactory(javacOptions, JavacOptionsAmender.IDENTITY), 274 new JavacToJarStepFactory(javacOptions, JavacOptionsAmender.IDENTITY),
272 args.resourcesRoot, 275 args.resourcesRoot,
276 + args.manifestFile,
273 args.mavenCoords, 277 args.mavenCoords,
274 args.tests.get(), 278 args.tests.get(),
275 javacOptions.getClassesToRemoveFromJar())); 279 javacOptions.getClassesToRemoveFromJar()));
......