From 195609870a26864a9f83d7ff5b325a632d140a28 Mon Sep 17 00:00:00 2001 From: Rob Spieldenner Date: Thu, 17 Sep 2015 14:37:22 -0700 Subject: [PATCH 1/3] Fix application wiring to work in 2.6/2.7. Update for 3.x release --- CHANGELOG.md | 7 + LICENSE | 202 ++++++++++++++++++ README.md | 20 +- build.gradle | 44 ++-- .../OspackageApplicationPlugin.groovy | 21 +- ...a.ospackage-application-daemon.properties} | 0 ...> nebula.ospackage-application.properties} | 0 ...ies => nebula.ospackage-daemon.properties} | 0 ...ackageApplicationPluginLauncherSpec.groovy | 2 +- .../OspackageApplicationPluginSpec.groovy | 15 -- 10 files changed, 255 insertions(+), 56 deletions(-) create mode 100644 LICENSE rename src/main/resources/META-INF/gradle-plugins/{nebula-ospackage-application-daemon.properties => nebula.ospackage-application-daemon.properties} (100%) rename src/main/resources/META-INF/gradle-plugins/{nebula-ospackage-application.properties => nebula.ospackage-application.properties} (100%) rename src/main/resources/META-INF/gradle-plugins/{nebula-ospackage-daemon.properties => nebula.ospackage-daemon.properties} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index d298975..e8796ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +3.0.0 - 2015/09/17 +================== + +* Gradle 2.7 +* Move to travis +* Update nebula plugins to 3.x + 2.2.0 ================== diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..e06d208 --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + 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 + + 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. + diff --git a/README.md b/README.md index 1c81fad..9632935 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ nebula-ospackage-plugin Opinionated plugins that wraps the gradle-ospackage-plugin. -nebula-ospackage-daemon +nebula.ospackage-daemon ======================= Builds the proper scripts for running a daemon (with daemontools) on CentOS and Ubuntu. @@ -21,11 +21,11 @@ To include, add the following to your build.gradle repositories { jcenter() } dependencies { - classpath 'com.netflix.nebula:nebula-ospackage-plugin:2.2.+' + classpath 'com.netflix.nebula:nebula-ospackage-plugin:3.0.0' } } - apply plugin: 'nebula-ospackage-daemon' + apply plugin: 'nebula.ospackage-daemon' ## Usage @@ -80,7 +80,7 @@ a daemon called Foobar, a Rpm task, and a Deb task, there would also be a buildD task. -nebula-ospackage-application +nebula.ospackage-application ======================= Takes the output of the [Application plugin](http://www.gradle.org/docs/current/userguide/application_plugin.html) and @@ -94,11 +94,11 @@ To include, add the following to your build.gradle repositories { jcenter() } dependencies { - classpath 'com.netflix.nebula:nebula-ospackage-plugin:2.0.+' + classpath 'com.netflix.nebula:nebula-ospackage-plugin:3.0.0' } } - apply plugin: 'nebula-ospackage-application' + apply plugin: 'nebula.ospackage-application' ## Usage @@ -117,7 +117,7 @@ Once configured with a system packaging task, the project will produce a DEB or gradlew buildDeb -nebula-ospackage-application-daemon +nebula.ospackage-application-daemon ======================= Combine the above two plugins to create a self-running daemon out of a [Application plugin](http://www.gradle.org/docs/current/userguide/application_plugin.html) @@ -131,11 +131,11 @@ To include, add the following to your build.gradle repositories { jcenter() } dependencies { - classpath 'com.netflix.nebula:nebula-ospackage-plugin:2.0.+' + classpath 'com.netflix.nebula:nebula-ospackage-plugin:3.0.0' } } - apply plugin: 'nebula-ospackage-application-daemon' + apply plugin: 'nebula.ospackage-application-daemon' ## Usage @@ -149,3 +149,5 @@ alleviate this, there's a extension provided for configuring the application dae Once configured, the project will produce a DEB and a RPM with the context of the application and the relevant daemon scripts: gradlew buildDeb buildRpm + + diff --git a/build.gradle b/build.gradle index 8bd7c5b..3674fc5 100644 --- a/build.gradle +++ b/build.gradle @@ -50,6 +50,14 @@ contacts { moniker 'Justin Ryan' github 'quidryan' } + 'rob.spieldenner@gmail.com' { + moniker 'Rob Spieldenner' + github 'rspieldenner' + } + 'dmthomas@gmail.com' { + moniker 'Danny Thomas' + github 'DanielThomas' + } } test { @@ -58,29 +66,23 @@ test { pluginBundle { plugins { - ospackage { - id = 'nebula.ospackage' - displayName = 'Nebula OS Package Plugin' - description = project.description - tags = ['nebula', 'os', 'package', 'rpm', 'deb'] - } - ospackageBase { - id = 'nebula.ospackage-base' - displayName = 'Nebula OS Package Plugin' - description = project.description - tags = ['nebula', 'os', 'package', 'rpm', 'deb'] + ospackageApplication { + id = 'nebula.ospackage-application' + displayName = 'Nebula OS Package Application Plugin' + description = 'Packages output of application plugin into a debian or rpm' + tags = ['nebula', 'os', 'package', 'rpm', 'deb', 'application'] } - ospackageDocker { - id = 'nebula.ospackage-docker' - displayName = 'Nebula OS Package Plugin' - description = project.description - tags = ['nebula', 'docker'] + ospackageApplicationDaemon { + id = 'nebula.ospackage-application-daemon' + displayName = 'Nebula OS Package Application Daemon Plugin' + description = 'Creates daemontools setup to run output from application plugin' + tags = ['nebula', 'os', 'package', 'rpm', 'deb', 'application', 'daemon'] } - ospackageDockerBase { - id = 'nebula.ospackage-docker-base' - displayName = 'Nebula Docker Base Plugin' - description = project.description - tags = ['nebula', 'docker'] + ospackageDaemon { + id = 'nebula.ospackage-daemon' + displayName = 'Nebula OS Package Daemon Plugin' + description = 'Create daemontools runner' + tags = ['nebula', 'os', 'package', 'rpm', 'deb', 'daemon'] } } } diff --git a/src/main/groovy/nebula/plugin/ospackage/application/OspackageApplicationPlugin.groovy b/src/main/groovy/nebula/plugin/ospackage/application/OspackageApplicationPlugin.groovy index f7c9e50..5233d32 100644 --- a/src/main/groovy/nebula/plugin/ospackage/application/OspackageApplicationPlugin.groovy +++ b/src/main/groovy/nebula/plugin/ospackage/application/OspackageApplicationPlugin.groovy @@ -1,10 +1,13 @@ package nebula.plugin.ospackage.application +import com.netflix.gradle.plugins.deb.Deb import com.netflix.gradle.plugins.packaging.ProjectPackagingExtension import com.netflix.gradle.plugins.packaging.SystemPackagingBasePlugin import com.netflix.gradle.plugins.packaging.SystemPackagingPlugin +import com.netflix.gradle.plugins.rpm.Rpm import org.gradle.api.Plugin import org.gradle.api.Project +import org.gradle.api.distribution.plugins.DistributionPlugin import org.gradle.api.internal.IConventionAware import org.gradle.api.plugins.ApplicationPlugin import org.gradle.api.plugins.ApplicationPluginConvention @@ -28,25 +31,23 @@ class OspackageApplicationPlugin implements Plugin { @Override void apply(Project project) { - extension = project.extensions.create('ospackage_application', OspackageApplicationExtension) ((IConventionAware) extension).conventionMapping.map('prefix') { '/opt'} project.plugins.apply(ApplicationPlugin) - ApplicationPluginConvention appConvention = project.convention.getPlugin(ApplicationPluginConvention) - CreateStartScripts startScripts = (CreateStartScripts) project.tasks.getByName(ApplicationPlugin.TASK_START_SCRIPTS_NAME) - project.plugins.apply(SystemPackagingBasePlugin.class) def packagingExt = project.extensions.getByType(ProjectPackagingExtension) - packagingExt.with(appConvention.applicationDistribution) + packagingExt.from { project.zipTree(project.tasks.distZip.outputs.files.singleFile) } // Using a closure here to delay evaluation of prefix - packagingExt.into { "${extension.getPrefix()}/${startScripts.applicationName}" } + packagingExt.into { extension.getPrefix() } - // Use post-install to fix permissions - - // Maybe stepping over the line, but it'll make it much easier to use. project.plugins.apply(SystemPackagingPlugin) - + project.tasks.withType(Deb) { task -> + task.dependsOn(project.tasks.distZip) + } + project.tasks.withType(Rpm) { task -> + task.dependsOn(project.tasks.distZip) + } } } \ No newline at end of file diff --git a/src/main/resources/META-INF/gradle-plugins/nebula-ospackage-application-daemon.properties b/src/main/resources/META-INF/gradle-plugins/nebula.ospackage-application-daemon.properties similarity index 100% rename from src/main/resources/META-INF/gradle-plugins/nebula-ospackage-application-daemon.properties rename to src/main/resources/META-INF/gradle-plugins/nebula.ospackage-application-daemon.properties diff --git a/src/main/resources/META-INF/gradle-plugins/nebula-ospackage-application.properties b/src/main/resources/META-INF/gradle-plugins/nebula.ospackage-application.properties similarity index 100% rename from src/main/resources/META-INF/gradle-plugins/nebula-ospackage-application.properties rename to src/main/resources/META-INF/gradle-plugins/nebula.ospackage-application.properties diff --git a/src/main/resources/META-INF/gradle-plugins/nebula-ospackage-daemon.properties b/src/main/resources/META-INF/gradle-plugins/nebula.ospackage-daemon.properties similarity index 100% rename from src/main/resources/META-INF/gradle-plugins/nebula-ospackage-daemon.properties rename to src/main/resources/META-INF/gradle-plugins/nebula.ospackage-daemon.properties diff --git a/src/test/groovy/nebula/plugin/ospackage/application/OspackageApplicationPluginLauncherSpec.groovy b/src/test/groovy/nebula/plugin/ospackage/application/OspackageApplicationPluginLauncherSpec.groovy index 5dd7c1a..4b844ef 100644 --- a/src/test/groovy/nebula/plugin/ospackage/application/OspackageApplicationPluginLauncherSpec.groovy +++ b/src/test/groovy/nebula/plugin/ospackage/application/OspackageApplicationPluginLauncherSpec.groovy @@ -36,7 +36,7 @@ class OspackageApplicationPluginLauncherSpec extends IntegrationSpec { ospackage_application { prefix = '/usr/local' } - startScripts.applicationName = 'myapp' + applicationName = 'myapp' """.stripIndent() when: diff --git a/src/test/groovy/nebula/plugin/ospackage/application/OspackageApplicationPluginSpec.groovy b/src/test/groovy/nebula/plugin/ospackage/application/OspackageApplicationPluginSpec.groovy index 21626c2..5b11fef 100644 --- a/src/test/groovy/nebula/plugin/ospackage/application/OspackageApplicationPluginSpec.groovy +++ b/src/test/groovy/nebula/plugin/ospackage/application/OspackageApplicationPluginSpec.groovy @@ -1,25 +1,10 @@ package nebula.plugin.ospackage.application -import com.netflix.gradle.plugins.packaging.ProjectPackagingExtension -import com.netflix.gradle.plugins.packaging.SystemPackagingPlugin import nebula.test.PluginProjectSpec -import org.gradle.api.plugins.ApplicationPlugin class OspackageApplicationPluginSpec extends PluginProjectSpec { @Override String getPluginName() { 'nebula-ospackage-application' } - - def 'project modified by plugin'() { - when: - project.plugins.apply OspackageApplicationPlugin - - then: - project.plugins.getPlugin(ApplicationPlugin) - project.plugins.getPlugin(SystemPackagingPlugin) - - def children = project.extensions.getByType(ProjectPackagingExtension).getChildren().collect() - children.size() > 0 - } } From 0ef7266e5e1fe348eca31b84815bcc396f4c75ca Mon Sep 17 00:00:00 2001 From: Rob Spieldenner Date: Thu, 17 Sep 2015 14:40:15 -0700 Subject: [PATCH 2/3] Add license statements --- README.md | 30 +++++++++++++++++++ ...ApplicationDaemonPluginLauncherSpec.groovy | 15 ++++++++++ ...spackageApplicationDaemonPluginSpec.groovy | 15 ++++++++++ ...ackageApplicationPluginLauncherSpec.groovy | 15 ++++++++++ .../OspackageApplicationPluginSpec.groovy | 15 ++++++++++ .../daemon/DaemonExtensionSpec.groovy | 15 ++++++++++ .../OspackageDaemonPluginLauncherSpec.groovy | 15 ++++++++++ .../daemon/TemplateSyntaxSpec.groovy | 15 ++++++++++ 8 files changed, 135 insertions(+) diff --git a/README.md b/README.md index 9632935..95a5517 100644 --- a/README.md +++ b/README.md @@ -150,4 +150,34 @@ Once configured, the project will produce a DEB and a RPM with the context of th gradlew buildDeb buildRpm +Gradle Compatibility Tested +--------------------------- +Built with Oracle JDK7 +Tested with Oracle JDK8 + +| Gradle Version | Works | +| :------------: | :---: | +| 2.2.1 | ? | +| 2.3 | ? | +| 2.4 | ? | +| 2.5 | ? | +| 2.6 | yes | +| 2.7 | yes | + +LICENSE +======= + +Copyright 2014-2015 Netflix, Inc. + +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 + + + +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. diff --git a/src/test/groovy/nebula/plugin/ospackage/application/OspackageApplicationDaemonPluginLauncherSpec.groovy b/src/test/groovy/nebula/plugin/ospackage/application/OspackageApplicationDaemonPluginLauncherSpec.groovy index 565ce44..91ffa86 100644 --- a/src/test/groovy/nebula/plugin/ospackage/application/OspackageApplicationDaemonPluginLauncherSpec.groovy +++ b/src/test/groovy/nebula/plugin/ospackage/application/OspackageApplicationDaemonPluginLauncherSpec.groovy @@ -1,3 +1,18 @@ +/* + * Copyright 2014-2015 Netflix, Inc. + * + * 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 + * + * + * + * 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 nebula.plugin.ospackage.application import nebula.test.IntegrationSpec diff --git a/src/test/groovy/nebula/plugin/ospackage/application/OspackageApplicationDaemonPluginSpec.groovy b/src/test/groovy/nebula/plugin/ospackage/application/OspackageApplicationDaemonPluginSpec.groovy index 6d940ee..3ae0485 100644 --- a/src/test/groovy/nebula/plugin/ospackage/application/OspackageApplicationDaemonPluginSpec.groovy +++ b/src/test/groovy/nebula/plugin/ospackage/application/OspackageApplicationDaemonPluginSpec.groovy @@ -1,3 +1,18 @@ +/* + * Copyright 2014-2015 Netflix, Inc. + * + * 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 + * + * + * + * 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 nebula.plugin.ospackage.application import nebula.plugin.ospackage.daemon.DaemonExtension diff --git a/src/test/groovy/nebula/plugin/ospackage/application/OspackageApplicationPluginLauncherSpec.groovy b/src/test/groovy/nebula/plugin/ospackage/application/OspackageApplicationPluginLauncherSpec.groovy index 4b844ef..fad855b 100644 --- a/src/test/groovy/nebula/plugin/ospackage/application/OspackageApplicationPluginLauncherSpec.groovy +++ b/src/test/groovy/nebula/plugin/ospackage/application/OspackageApplicationPluginLauncherSpec.groovy @@ -1,3 +1,18 @@ +/* + * Copyright 2014-2015 Netflix, Inc. + * + * 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 + * + * + * + * 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 nebula.plugin.ospackage.application import nebula.test.IntegrationSpec diff --git a/src/test/groovy/nebula/plugin/ospackage/application/OspackageApplicationPluginSpec.groovy b/src/test/groovy/nebula/plugin/ospackage/application/OspackageApplicationPluginSpec.groovy index 5b11fef..803f802 100644 --- a/src/test/groovy/nebula/plugin/ospackage/application/OspackageApplicationPluginSpec.groovy +++ b/src/test/groovy/nebula/plugin/ospackage/application/OspackageApplicationPluginSpec.groovy @@ -1,3 +1,18 @@ +/* + * Copyright 2014-2015 Netflix, Inc. + * + * 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 + * + * + * + * 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 nebula.plugin.ospackage.application import nebula.test.PluginProjectSpec diff --git a/src/test/groovy/nebula/plugin/ospackage/daemon/DaemonExtensionSpec.groovy b/src/test/groovy/nebula/plugin/ospackage/daemon/DaemonExtensionSpec.groovy index 579c7ea..d2c74f4 100644 --- a/src/test/groovy/nebula/plugin/ospackage/daemon/DaemonExtensionSpec.groovy +++ b/src/test/groovy/nebula/plugin/ospackage/daemon/DaemonExtensionSpec.groovy @@ -1,3 +1,18 @@ +/* + * Copyright 2014-2015 Netflix, Inc. + * + * 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 + * + * + * + * 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 nebula.plugin.ospackage.daemon import org.gradle.api.internal.DefaultDomainObjectCollection diff --git a/src/test/groovy/nebula/plugin/ospackage/daemon/OspackageDaemonPluginLauncherSpec.groovy b/src/test/groovy/nebula/plugin/ospackage/daemon/OspackageDaemonPluginLauncherSpec.groovy index a297be1..dea20fa 100644 --- a/src/test/groovy/nebula/plugin/ospackage/daemon/OspackageDaemonPluginLauncherSpec.groovy +++ b/src/test/groovy/nebula/plugin/ospackage/daemon/OspackageDaemonPluginLauncherSpec.groovy @@ -1,3 +1,18 @@ +/* + * Copyright 2014-2015 Netflix, Inc. + * + * 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 + * + * + * + * 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 nebula.plugin.ospackage.daemon import com.netflix.gradle.plugins.packaging.SystemPackagingPlugin diff --git a/src/test/groovy/nebula/plugin/ospackage/daemon/TemplateSyntaxSpec.groovy b/src/test/groovy/nebula/plugin/ospackage/daemon/TemplateSyntaxSpec.groovy index 69dfa11..328351a 100644 --- a/src/test/groovy/nebula/plugin/ospackage/daemon/TemplateSyntaxSpec.groovy +++ b/src/test/groovy/nebula/plugin/ospackage/daemon/TemplateSyntaxSpec.groovy @@ -1,3 +1,18 @@ +/* + * Copyright 2014-2015 Netflix, Inc. + * + * 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 + * + * + * + * 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 nebula.plugin.ospackage.daemon import nebula.test.ProjectSpec From 229a977030ba68f68f502c652678bd7cf90843dd Mon Sep 17 00:00:00 2001 From: Rob Spieldenner Date: Thu, 17 Sep 2015 14:52:57 -0700 Subject: [PATCH 3/3] Fix tests for plugin renaming --- .../application/OspackageApplicationDaemonPluginSpec.groovy | 2 +- .../ospackage/application/OspackageApplicationPluginSpec.groovy | 2 +- .../plugin/ospackage/daemon/OspackageDaemonPluginSpec.groovy | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/groovy/nebula/plugin/ospackage/application/OspackageApplicationDaemonPluginSpec.groovy b/src/test/groovy/nebula/plugin/ospackage/application/OspackageApplicationDaemonPluginSpec.groovy index 3ae0485..193d1c2 100644 --- a/src/test/groovy/nebula/plugin/ospackage/application/OspackageApplicationDaemonPluginSpec.groovy +++ b/src/test/groovy/nebula/plugin/ospackage/application/OspackageApplicationDaemonPluginSpec.groovy @@ -23,7 +23,7 @@ import org.gradle.api.plugins.ApplicationPlugin class OspackageApplicationDaemonPluginSpec extends PluginProjectSpec { @Override String getPluginName() { - 'nebula-ospackage-application-daemon' + 'nebula.ospackage-application-daemon' } def 'project modified by plugin'() { diff --git a/src/test/groovy/nebula/plugin/ospackage/application/OspackageApplicationPluginSpec.groovy b/src/test/groovy/nebula/plugin/ospackage/application/OspackageApplicationPluginSpec.groovy index 803f802..a2c3ddb 100644 --- a/src/test/groovy/nebula/plugin/ospackage/application/OspackageApplicationPluginSpec.groovy +++ b/src/test/groovy/nebula/plugin/ospackage/application/OspackageApplicationPluginSpec.groovy @@ -20,6 +20,6 @@ import nebula.test.PluginProjectSpec class OspackageApplicationPluginSpec extends PluginProjectSpec { @Override String getPluginName() { - 'nebula-ospackage-application' + 'nebula.ospackage-application' } } diff --git a/src/test/groovy/nebula/plugin/ospackage/daemon/OspackageDaemonPluginSpec.groovy b/src/test/groovy/nebula/plugin/ospackage/daemon/OspackageDaemonPluginSpec.groovy index bd1bcb5..beb0633 100644 --- a/src/test/groovy/nebula/plugin/ospackage/daemon/OspackageDaemonPluginSpec.groovy +++ b/src/test/groovy/nebula/plugin/ospackage/daemon/OspackageDaemonPluginSpec.groovy @@ -22,7 +22,7 @@ import org.codehaus.groovy.runtime.StackTraceUtils class OspackageDaemonPluginSpec extends PluginProjectSpec { @Override String getPluginName() { - 'nebula-ospackage-daemon' + 'nebula.ospackage-daemon' } def 'if no daemonName is assigned use the name of the project'() {