From 1c7c7365e8804f81855de870f8e6f9f2a819ce2d Mon Sep 17 00:00:00 2001 From: Bartosz Zbytniewski Date: Tue, 2 Feb 2021 15:25:46 +0100 Subject: [PATCH 01/15] feature: Initial gradle build --- .gitignore | 13 ++ api/communication-api/build.gradle | 21 ++ api/datastorage-api/build.gradle | 18 ++ api/jobs-api/build.gradle | 19 ++ api/validation-api/build.gradle | 13 ++ buildSrc/build.gradle | 14 ++ .../com.cognifide.aet.java-conventions.gradle | 36 ++++ client/aet-maven-plugin/build.gradle | 30 +++ client/client-core/build.gradle | 27 +++ core/accessibility-report/build.gradle | 28 +++ core/cleaner/build.gradle | 35 ++++ core/communication/build.gradle | 21 ++ core/datastorage/build.gradle | 31 +++ core/jobs/build.gradle | 39 ++++ core/runner/build.gradle | 28 +++ core/validation/build.gradle | 20 ++ core/worker/build.gradle | 33 ++++ gradle.properties | 1 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59203 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 185 ++++++++++++++++++ gradlew.bat | 89 +++++++++ integration-tests/cleaner-test/build.gradle | 35 ++++ integration-tests/sample-site/build.gradle | 16 ++ osgi-dependencies/proxy/build.gradle | 22 +++ osgi-dependencies/selenium/build.gradle | 50 +++++ .../w3chtml5validator/build.gradle | 33 ++++ pom.xml | 6 + report/src/main/webapp/package-lock.json | 41 ++-- rest-endpoint/build.gradle | 33 ++++ settings.gradle | 62 ++++++ test-executor/build.gradle | 33 ++++ 32 files changed, 1007 insertions(+), 30 deletions(-) create mode 100644 api/communication-api/build.gradle create mode 100644 api/datastorage-api/build.gradle create mode 100644 api/jobs-api/build.gradle create mode 100644 api/validation-api/build.gradle create mode 100644 buildSrc/build.gradle create mode 100644 buildSrc/src/main/groovy/com.cognifide.aet.java-conventions.gradle create mode 100644 client/aet-maven-plugin/build.gradle create mode 100644 client/client-core/build.gradle create mode 100644 core/accessibility-report/build.gradle create mode 100644 core/cleaner/build.gradle create mode 100644 core/communication/build.gradle create mode 100644 core/datastorage/build.gradle create mode 100644 core/jobs/build.gradle create mode 100644 core/runner/build.gradle create mode 100644 core/validation/build.gradle create mode 100644 core/worker/build.gradle create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 integration-tests/cleaner-test/build.gradle create mode 100644 integration-tests/sample-site/build.gradle create mode 100644 osgi-dependencies/proxy/build.gradle create mode 100644 osgi-dependencies/selenium/build.gradle create mode 100644 osgi-dependencies/w3chtml5validator/build.gradle create mode 100644 rest-endpoint/build.gradle create mode 100644 settings.gradle create mode 100644 test-executor/build.gradle diff --git a/.gitignore b/.gitignore index 8874d3323..3395fa5e3 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,16 @@ atlassian-ide-plugin.xml # aet-vagrant /vagrant/.vagrant /vagrant/Berksfile.lock + +### Gradle ### +.gradle +build/ + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar + +# Cache of project +.gradletasknamecache + +### Gradle Patch ### +**/build/ diff --git a/api/communication-api/build.gradle b/api/communication-api/build.gradle new file mode 100644 index 000000000..d412d4a2e --- /dev/null +++ b/api/communication-api/build.gradle @@ -0,0 +1,21 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'com.cognifide.aet.java-conventions' +} + +dependencies { + testImplementation 'com.googlecode.zohhak:zohhak:1.1.1' + compileOnly 'com.google.guava:guava:25.1-jre' + compileOnly 'org.apache.activemq:activemq-osgi:5.15.2' + compileOnly 'org.apache.commons:commons-lang3:3.7' + compileOnly 'javax.validation:validation-api:1.1.0.Final' + compileOnly 'org.hibernate:hibernate-validator:4.3.2.Final' + compileOnly 'org.jboss.logging:jboss-logging:3.3.2.Final' + compileOnly 'commons-io:commons-io:2.6' + compileOnly 'com.google.code.gson:gson:2.8.5' +} + +description = 'AET :: API :: Communication API' diff --git a/api/datastorage-api/build.gradle b/api/datastorage-api/build.gradle new file mode 100644 index 000000000..44caf49b7 --- /dev/null +++ b/api/datastorage-api/build.gradle @@ -0,0 +1,18 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'com.cognifide.aet.java-conventions' +} + +dependencies { + providedCompile project(':communication-api') + compileOnly 'com.google.guava:guava:25.1-jre' + compileOnly 'javax.validation:validation-api:1.1.0.Final' + compileOnly 'org.hibernate:hibernate-validator:4.3.2.Final' + compileOnly 'org.jboss.logging:jboss-logging:3.3.2.Final' + compileOnly 'com.google.code.gson:gson:2.8.5' +} + +description = 'AET :: API :: Data Storage API' diff --git a/api/jobs-api/build.gradle b/api/jobs-api/build.gradle new file mode 100644 index 000000000..95022a5dc --- /dev/null +++ b/api/jobs-api/build.gradle @@ -0,0 +1,19 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'com.cognifide.aet.java-conventions' +} + +dependencies { + providedCompile project(':communication-api') + providedCompile project(':datastorage-api') + providedCompile project(':selenium') + implementation 'com.google.guava:guava:25.1-jre' + compileOnly 'org.apache.commons:commons-lang3:3.7' + compileOnly 'org.apache.httpcomponents:fluent-hc:4.5.5' + compileOnly 'org.codehaus.jackson:jackson-mapper-asl:1.9.13' +} + +description = 'AET :: API :: Jobs API' diff --git a/api/validation-api/build.gradle b/api/validation-api/build.gradle new file mode 100644 index 000000000..0a8a8d59a --- /dev/null +++ b/api/validation-api/build.gradle @@ -0,0 +1,13 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'com.cognifide.aet.java-conventions' +} + +dependencies { + compileOnly 'org.apache.commons:commons-lang3:3.7' +} + +description = 'AET :: API :: Validation API' diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle new file mode 100644 index 000000000..66a0569cd --- /dev/null +++ b/buildSrc/build.gradle @@ -0,0 +1,14 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + // Support convention plugins written in Groovy. Convention plugins are build scripts in 'src/main' that automatically become available as plugins in the main build. + id 'groovy-gradle-plugin' +} + +repositories { + // Use the plugin portal to apply community plugins in convention plugins. + gradlePluginPortal() +} + diff --git a/buildSrc/src/main/groovy/com.cognifide.aet.java-conventions.gradle b/buildSrc/src/main/groovy/com.cognifide.aet.java-conventions.gradle new file mode 100644 index 000000000..fa7887ea0 --- /dev/null +++ b/buildSrc/src/main/groovy/com.cognifide.aet.java-conventions.gradle @@ -0,0 +1,36 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'java-library' + id 'maven-publish' +} + +repositories { + mavenCentral() + jcenter() +} + +group = 'com.cognifide.aet' +version = '3.4.1-SNAPSHOT' +java.sourceCompatibility = JavaVersion.VERSION_1_8 + +publishing { + publications { + maven(MavenPublication) { + from(components.java) + } + } +} + +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' +} + +configurations { providedCompile } + +sourceSets.main.compileClasspath += configurations.providedCompile +sourceSets.test.compileClasspath += configurations.providedCompile +sourceSets.test.runtimeClasspath += configurations.providedCompile + diff --git a/client/aet-maven-plugin/build.gradle b/client/aet-maven-plugin/build.gradle new file mode 100644 index 000000000..c47e795f2 --- /dev/null +++ b/client/aet-maven-plugin/build.gradle @@ -0,0 +1,30 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'com.cognifide.aet.java-conventions' +} + +dependencies { + providedCompile project(':communication-api') + providedCompile project(':client-core') + implementation 'org.apache.maven:maven-plugin-api:2.0' + implementation 'org.apache.maven:maven-project:2.2.1' + implementation 'org.codehaus.plexus:plexus-utils:3.0.8' + implementation 'com.google.guava:guava:23.6-jre' + implementation 'org.apache.commons:commons-lang3:3.3.2' + implementation 'commons-io:commons-io:2.4' + implementation 'com.jcabi:jcabi-log:0.12.2' + implementation 'org.slf4j:slf4j-api:1.7.10' + implementation 'org.slf4j:slf4j-log4j12:1.7.10' + implementation 'org.simpleframework:simple-xml:2.7.1' + implementation 'javax.validation:validation-api:1.1.0.Final' + implementation 'org.hibernate:hibernate-validator:4.3.2.Final' + testImplementation 'junit:junit:4.11' + testImplementation 'org.hamcrest:hamcrest-all:1.3' + testImplementation 'org.mockito:mockito-all:1.9.5' + compileOnly 'org.apache.maven.plugin-tools:maven-plugin-annotations:3.2' +} + +description = 'AET :: Client :: Maven Plugin' diff --git a/client/client-core/build.gradle b/client/client-core/build.gradle new file mode 100644 index 000000000..ee94b1f59 --- /dev/null +++ b/client/client-core/build.gradle @@ -0,0 +1,27 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'com.cognifide.aet.java-conventions' +} + +dependencies { + providedCompile project(':communication-api') + implementation 'org.codehaus.plexus:plexus-utils:3.0.8' + implementation 'com.google.guava:guava:23.6-jre' + implementation 'org.apache.commons:commons-lang3:3.3.2' + implementation 'org.apache.httpcomponents:fluent-hc:4.5.2' + implementation 'org.apache.httpcomponents:httpmime:4.5.2' + implementation 'commons-io:commons-io:2.4' + implementation 'com.jcabi:jcabi-log:0.12.2' + implementation 'org.slf4j:slf4j-api:1.7.10' + implementation 'org.slf4j:slf4j-log4j12:1.7.10' + implementation 'com.google.code.gson:gson:2.6.1' + implementation 'org.simpleframework:simple-xml:2.7.1' + testImplementation 'junit:junit:4.11' + testImplementation 'org.hamcrest:hamcrest-all:1.3' + testImplementation 'org.mockito:mockito-all:1.9.5' +} + +description = 'AET :: Client :: Client Core' diff --git a/core/accessibility-report/build.gradle b/core/accessibility-report/build.gradle new file mode 100644 index 000000000..e32d783b5 --- /dev/null +++ b/core/accessibility-report/build.gradle @@ -0,0 +1,28 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'com.cognifide.aet.java-conventions' + id "org.jetbrains.kotlin.jvm" version "1.4.21-2" +} + +dependencies { + implementation 'org.apache.poi:ooxml-schemas:1.4' + implementation 'org.jetbrains:annotations:19.0.0' + providedCompile project(':communication-api') + providedCompile project(':datastorage-api') + compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0' + compileOnly 'org.osgi:org.osgi.annotation:6.0.0' + compileOnly 'org.osgi:org.osgi.service.metatype.annotations:1.3.0' + compileOnly 'org.slf4j:slf4j-api:1.7.7' + compileOnly 'org.mongodb:mongo-java-driver:3.8.0' + compileOnly 'com.google.code.gson:gson:2.8.5' + compileOnly 'commons-io:commons-io:2.6' + compileOnly 'org.apache.commons:commons-text:1.8' + compileOnly 'org.apache.commons:commons-collections4:4.4' + compileOnly 'org.apache.poi:poi-ooxml:4.1.2' + compileOnly 'org.jetbrains.kotlin:kotlin-osgi-bundle:1.3.72' +} + +description = 'AET :: Core :: Accessibility Report' diff --git a/core/cleaner/build.gradle b/core/cleaner/build.gradle new file mode 100644 index 000000000..98cb3886b --- /dev/null +++ b/core/cleaner/build.gradle @@ -0,0 +1,35 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'com.cognifide.aet.java-conventions' +} + +configurations { + testCompile.extendsFrom compileOnly +} + +dependencies { + testImplementation 'junit:junit:4.11' + testImplementation 'org.mockito:mockito-all:1.9.5' + testImplementation 'org.hamcrest:hamcrest-all:1.3' + testImplementation 'com.googlecode.zohhak:zohhak:1.1.1' + testImplementation 'com.google.code.gson:gson:2.8.5' + providedCompile project(':communication-api') + providedCompile project(':datastorage-api') + providedCompile project(':validation-api') + providedCompile project(':datastorage') + providedCompile project(':validation') + compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0' + compileOnly 'org.osgi:org.osgi.annotation:6.0.0' + compileOnly 'org.osgi:org.osgi.service.metatype.annotations:1.3.0' + compileOnly 'com.google.guava:guava:25.1-jre' + compileOnly 'org.apache.commons:commons-lang3:3.7' + compileOnly 'org.apache.activemq:activemq-osgi:5.15.2' + compileOnly 'org.apache.servicemix.bundles:org.apache.servicemix.bundles.quartz:2.3.0_2' + compileOnly 'org.apache.camel:camel-core:2.24.0' + compileOnly 'com.google.code.findbugs:jsr305:3.0.2' +} + +description = 'AET :: Core :: Cleaner' diff --git a/core/communication/build.gradle b/core/communication/build.gradle new file mode 100644 index 000000000..de9c03ab8 --- /dev/null +++ b/core/communication/build.gradle @@ -0,0 +1,21 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'com.cognifide.aet.java-conventions' +} + +dependencies { + testImplementation 'junit:junit:4.11' + testImplementation 'org.hamcrest:hamcrest-all:1.3' + testImplementation 'org.mockito:mockito-all:1.9.5' + providedCompile project(':communication-api') + compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0' + compileOnly 'org.osgi:org.osgi.annotation:6.0.0' + compileOnly 'org.osgi:org.osgi.service.metatype.annotations:1.3.0' + compileOnly 'org.apache.activemq:activemq-osgi:5.15.2' + compileOnly 'org.apache.felix:org.apache.felix.configadmin:1.8.16' +} + +description = 'AET :: Core :: Communication' diff --git a/core/datastorage/build.gradle b/core/datastorage/build.gradle new file mode 100644 index 000000000..9ed386dff --- /dev/null +++ b/core/datastorage/build.gradle @@ -0,0 +1,31 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'com.cognifide.aet.java-conventions' +} + +dependencies { + testImplementation 'junit:junit:4.11' + testImplementation 'org.hamcrest:hamcrest-all:1.3' + testImplementation 'org.mockito:mockito-all:1.9.5' + testImplementation 'com.github.stefanbirkner:system-rules:1.18.0' + providedCompile project(':communication-api') + providedCompile project(':datastorage-api') + providedCompile project(':validation-api') + providedCompile project(':validation') + compileOnly 'com.google.guava:guava:25.1-jre' + compileOnly 'commons-codec:commons-codec:1.11' + compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0' + compileOnly 'org.osgi:org.osgi.annotation:6.0.0' + compileOnly 'org.osgi:org.osgi.service.metatype.annotations:1.3.0' + compileOnly 'com.google.code.gson:gson:2.8.5' + compileOnly 'org.osgi:org.osgi.compendium:4.2.0' + compileOnly 'commons-io:commons-io:2.6' + compileOnly 'org.apache.commons:commons-lang3:3.7' + compileOnly 'org.apache.servicemix.bundles:org.apache.servicemix.bundles.quartz:2.3.0_2' + compileOnly 'org.mongodb:mongo-java-driver:3.8.0' +} + +description = 'AET :: Core :: Data Storage' diff --git a/core/jobs/build.gradle b/core/jobs/build.gradle new file mode 100644 index 000000000..1f0a4141e --- /dev/null +++ b/core/jobs/build.gradle @@ -0,0 +1,39 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'com.cognifide.aet.java-conventions' +} + +dependencies { + testImplementation 'junit:junit:4.11' + testImplementation 'org.hamcrest:hamcrest-all:1.3' + testImplementation 'org.mockito:mockito-all:1.9.5' + testImplementation 'com.googlecode.zohhak:zohhak:1.1.1' + testImplementation 'xmlunit:xmlunit:1.2' + testImplementation 'uk.co.jemos.podam:podam:3.6.0.RELEASE' + testImplementation 'com.googlecode.catch-exception:catch-exception:1.2.0' + testImplementation 'org.skyscreamer:jsonassert:1.3.0' + testImplementation 'org.slf4j:slf4j-simple:1.7.7' + testImplementation 'org.assertj:assertj-core:3.11.1' + compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0' + compileOnly 'org.osgi:org.osgi.annotation:6.0.0' + compileOnly 'org.osgi:org.osgi.service.metatype.annotations:1.3.0' + compileOnly 'org.osgi:org.osgi.core:4.3.0' + compileOnly 'org.jsoup:jsoup:1.11.3' + compileOnly 'com.googlecode.java-diff-utils:diffutils:1.3.0' + compileOnly 'org.apache.httpcomponents:fluent-hc:4.5.5' + compileOnly 'com.google.code.gson:gson:2.8.5' + compileOnly 'org.slf4j:slf4j-api:1.7.7' + compileOnly 'com.google.code.findbugs:jsr305:3.0.2' + providedCompile project(':communication-api') + providedCompile project(':jobs-api') + providedCompile project(':datastorage-api') + providedCompile project(':validation-api') + providedCompile project(':proxy') + providedCompile project(':selenium') + providedCompile project(':w3chtml5validator') +} + +description = 'AET :: Core :: Jobs' diff --git a/core/runner/build.gradle b/core/runner/build.gradle new file mode 100644 index 000000000..8b5cf56e2 --- /dev/null +++ b/core/runner/build.gradle @@ -0,0 +1,28 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'com.cognifide.aet.java-conventions' +} + +dependencies { + testImplementation 'junit:junit:4.11' + testImplementation 'org.hamcrest:hamcrest-all:1.3' + testImplementation 'org.mockito:mockito-all:1.9.5' + testImplementation 'com.googlecode.zohhak:zohhak:1.1.1' + providedCompile project(':communication-api') + providedCompile project(':datastorage-api') + providedCompile project(':communication') + compileOnly 'com.google.code.gson:gson:2.8.5' + compileOnly 'commons-io:commons-io:2.6' + compileOnly 'com.google.guava:guava:25.1-jre' + compileOnly 'org.apache.commons:commons-lang3:3.7' + compileOnly 'org.apache.activemq:activemq-osgi:5.15.2' + compileOnly 'javax.validation:validation-api:1.1.0.Final' + compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0' + compileOnly 'org.osgi:org.osgi.annotation:6.0.0' + compileOnly 'org.osgi:org.osgi.service.metatype.annotations:1.3.0' +} + +description = 'AET :: Core :: Runner' diff --git a/core/validation/build.gradle b/core/validation/build.gradle new file mode 100644 index 000000000..b4c5f1bbc --- /dev/null +++ b/core/validation/build.gradle @@ -0,0 +1,20 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'com.cognifide.aet.java-conventions' +} + +dependencies { + testImplementation 'junit:junit:4.11' + testImplementation 'org.hamcrest:hamcrest-all:1.3' + testImplementation 'org.mockito:mockito-all:1.9.5' + providedCompile project(':validation-api') + compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0' + compileOnly 'org.osgi:org.osgi.annotation:6.0.0' + compileOnly 'org.osgi:org.osgi.service.metatype.annotations:1.3.0' + compileOnly 'org.apache.commons:commons-lang3:3.7' +} + +description = 'AET :: Core :: Validation' diff --git a/core/worker/build.gradle b/core/worker/build.gradle new file mode 100644 index 000000000..c79c0fe01 --- /dev/null +++ b/core/worker/build.gradle @@ -0,0 +1,33 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'com.cognifide.aet.java-conventions' +} + +dependencies { + testImplementation 'junit:junit:4.11' + testImplementation 'org.hamcrest:hamcrest-all:1.3' + testImplementation 'org.mockito:mockito-all:1.9.5' + providedCompile project(':jobs-api') + providedCompile project(':communication-api') + providedCompile project(':datastorage-api') + providedCompile project(':communication') + providedCompile project(':proxy') + providedCompile project(':selenium') + compileOnly 'com.google.guava:guava:25.1-jre' + compileOnly('org.apache.activemq:activemq-osgi:5.15.2') { + exclude group: 'com.google.guava', module: 'guava' + } + compileOnly 'org.osgi:org.osgi.core:4.3.0' + compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0' + compileOnly 'org.osgi:org.osgi.annotation:6.0.0' + compileOnly 'org.osgi:org.osgi.service.metatype.annotations:1.3.0' + compileOnly 'javax.validation:validation-api:1.1.0.Final' + compileOnly 'org.apache.httpcomponents:fluent-hc:4.5.5' + compileOnly 'org.apache.httpcomponents:httpclient:4.4' + compileOnly 'com.google.code.findbugs:jsr305:3.0.2' +} + +description = 'AET :: Core :: Worker' diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 000000000..befa61a8d --- /dev/null +++ b/gradle.properties @@ -0,0 +1 @@ +seleniumVersion=3.8.1 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f GIT binary patch literal 59203 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

K7UpUK$>l@ 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 E2O(~oYXATM literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..28ff446a2 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 000000000..4f906e0c8 --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 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. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +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 + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 000000000..ac1b06f93 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem 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, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/integration-tests/cleaner-test/build.gradle b/integration-tests/cleaner-test/build.gradle new file mode 100644 index 000000000..95f784505 --- /dev/null +++ b/integration-tests/cleaner-test/build.gradle @@ -0,0 +1,35 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'com.cognifide.aet.java-conventions' +} + +configurations { + testCompile.extendsFrom compileOnly +} + +dependencies { + testImplementation 'junit:junit:4.11' + testImplementation 'org.mockito:mockito-all:1.9.5' + testImplementation 'org.hamcrest:hamcrest-all:1.3' + testImplementation 'com.googlecode.zohhak:zohhak:1.1.1' + testImplementation 'com.google.code.gson:gson:2.8.5' + testImplementation 'de.bwaldvogel:mongo-java-server:1.12.0' + testImplementation 'org.mongodb:mongo-java-driver:3.8.0' + testImplementation 'org.apache.sling:org.apache.sling.testing.osgi-mock.junit4:2.4.6' + providedCompile project(':communication-api') + providedCompile project(':cleaner') + providedCompile project(':datastorage-api') + providedCompile project(':datastorage') + compileOnly 'org.osgi:org.osgi.core:4.3.0' + compileOnly 'org.osgi:org.osgi.compendium:4.2.0' + compileOnly 'com.google.guava:guava:25.1-jre' + compileOnly 'org.apache.commons:commons-lang3:3.7' + compileOnly 'org.apache.servicemix.bundles:org.apache.servicemix.bundles.quartz:2.3.0_2' + compileOnly 'org.apache.camel:camel-core:2.24.0' + compileOnly 'com.google.code.findbugs:jsr305:3.0.2' +} + +description = 'AET :: Integration Tests :: Cleaner Test' diff --git a/integration-tests/sample-site/build.gradle b/integration-tests/sample-site/build.gradle new file mode 100644 index 000000000..a91361f1c --- /dev/null +++ b/integration-tests/sample-site/build.gradle @@ -0,0 +1,16 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'com.cognifide.aet.java-conventions' +} + +dependencies { + implementation 'taglibs:standard:1.1.2' + implementation 'javax.servlet:jstl:1.2' + testImplementation 'junit:junit:4.11' + implementation 'javax.servlet:javax.servlet-api:3.0.1' +} + +description = 'AET :: Integration Tests :: Sample Site' diff --git a/osgi-dependencies/proxy/build.gradle b/osgi-dependencies/proxy/build.gradle new file mode 100644 index 000000000..aa50082b3 --- /dev/null +++ b/osgi-dependencies/proxy/build.gradle @@ -0,0 +1,22 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'com.cognifide.aet.java-conventions' +} + +dependencies { + implementation 'com.github.detro:browsermob-proxy-client:0.1.3' + providedCompile project(':jobs-api') + providedCompile project(':selenium') + compileOnly 'org.osgi:org.osgi.core:4.3.0' + compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0' + compileOnly 'org.osgi:org.osgi.annotation:6.0.0' + compileOnly 'org.osgi:org.osgi.service.metatype.annotations:1.3.0' + compileOnly 'org.json:json:20180130' + compileOnly 'com.google.code.gson:gson:2.8.5' + compileOnly 'org.apache.httpcomponents:httpclient:4.4' +} + +description = 'AET :: OSGi Dependencies :: Proxy' diff --git a/osgi-dependencies/selenium/build.gradle b/osgi-dependencies/selenium/build.gradle new file mode 100644 index 000000000..71ad849a0 --- /dev/null +++ b/osgi-dependencies/selenium/build.gradle @@ -0,0 +1,50 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'com.cognifide.aet.java-conventions' +// id 'biz.aQute.bnd.builder' +} + +dependencies { + implementation 'org.seleniumhq.selenium:jetty-repacked:7.6.1.1' + implementation "org.seleniumhq.selenium:selenium-java:${seleniumVersion}" + implementation "org.seleniumhq.selenium:selenium-api:${seleniumVersion}" + implementation "org.seleniumhq.selenium:selenium-chrome-driver:${seleniumVersion}" + implementation "org.seleniumhq.selenium:selenium-firefox-driver:${seleniumVersion}" + implementation 'org.seleniumhq.selenium:selenium-htmlunit-driver:2.52.0' + implementation "org.seleniumhq.selenium:selenium-ie-driver:${seleniumVersion}" + implementation "org.seleniumhq.selenium:selenium-remote-driver:${seleniumVersion}" + implementation "org.seleniumhq.selenium:selenium-support:${seleniumVersion}" + implementation "org.seleniumhq.selenium:selenium-server:${seleniumVersion}" + implementation 'org.apache.commons:commons-exec:1.3' + implementation 'com.sun.jna:jna:3.0.9' + implementation 'net.java.dev.jna:jna:3.3.0' + implementation 'net.java.dev.jna:platform:3.5.2' +} + +//jar { +// manifest { +// attributes( +// 'Manifest-Version': '1.0', +// 'Bundle-ClassPath': ".,OSGI-INF/lib/jetty-repacked-7.6.1.1.jar,OSGI-INF/lib/selenium-java-${seleniumVersion}.jar,OSGI-INF/lib/selenium-api-${seleniumVersion}.jar,OSGI-INF/lib/selenium-chrome-driver-${seleniumVersion}.jar,OSGI-INF/lib/selenium-firefox-driver-${seleniumVersion}.jar,OSGI-INF/lib/selenium-htmlunit-driver-2.52.0.jar,OSGI-INF/lib/selenium-ie-driver-${seleniumVersion}.jar,OSGI-INF/lib/selenium-remote-driver-${seleniumVersion}.jar,OSGI-INF/lib/selenium-support-${seleniumVersion}.jar,OSGI-INF/lib/selenium-server-${seleniumVersion}.jar,OSGI-INF/lib/commons-exec-1.3.jar,OSGI-INF/lib/jna-3.0.9.jar,OSGI-INF/lib/jna-3.3.0.jar,OSGI-INF/lib/platform-3.5.2.jar", +// 'Bundle-Description': 'Wraps Selenium library into OSGi bundle', +// 'Bundle-DocURL': 'http://www.cognifide.com', +// 'Bundle-License': 'http://www.apache.org/licenses/LICENSE-2.0.txt', +// 'Bundle-ManifestVersion': '2', +// 'Bundle-Name': 'AET :=OSGi Dependencies :=Selenium', +// 'Bundle-SymbolicName': 'com.cognifide.aet.selenium', +// 'Bundle-Vendor': 'Cognifide Ltd.', +// 'Bundle-Version': '3.4.1.SNAPSHOT', +// 'Created-By': 'Apache Maven Bundle Plugin', +// 'Embed-Dependency': '*;scope=compile|runtime|optional', +// 'Embed-Directory': 'OSGI-INF/lib', +// 'Embed-Transitive': 'false', +// 'Embedded-Artifacts': 'OSGI-INF/lib/jetty-repacked-7.6.1.1.jar;g="org.seleniumhq.selenium";a="jetty-repacked";v="7.6.1.1",OSGI-INF/lib/selenium-java-${seleniumVersion}.jar;g="org.seleniumhq.selenium";a="selenium-java";v="${seleniumVersion}",OSGI-INF/lib/selenium-api-${seleniumVersion}.jar;g="org.seleniumhq.selenium";a="selenium-api";v="${seleniumVersion}",OSGI-INF/lib/selenium-chrome-driver-${seleniumVersion}.jar;g="org.seleniumhq.selenium";a="selenium-chrome-driver";v="${seleniumVersion}",OSGI-INF/lib/selenium-firefox-driver-${seleniumVersion}.jar;g="org.seleniumhq.selenium";a="selenium-firefox-driver";v="${seleniumVersion}",OSGI-INF/lib/selenium-htmlunit-driver-2.52.0.jar;g="org.seleniumhq.selenium";a="selenium-htmlunit-driver";v="2.52.0",OSGI-INF/lib/selenium-ie-driver-${seleniumVersion}.jar;g="org.seleniumhq.selenium";a="selenium-ie-driver";v="${seleniumVersion}",OSGI-INF/lib/selenium-remote-driver-${seleniumVersion}.jar;g="org.seleniumhq.selenium";a="selenium-remote-driver";v="${seleniumVersion}",OSGI-INF/lib/selenium-support-${seleniumVersion}.jar;g="org.seleniumhq.selenium";a="selenium-support";v="${seleniumVersion}",OSGI-INF/lib/selenium-server-${seleniumVersion}.jar;g="org.seleniumhq.selenium";a="selenium-server";v="${seleniumVersion}",OSGI-INF/lib/commons-exec-1.3.jar;g="org.apache.commons";a="commons-exec";v="1.3",OSGI-INF/lib/jna-3.0.9.jar;g="com.sun.jna";a="jna";v="3.0.9",OSGI-INF/lib/jna-3.3.0.jar;g="net.java.dev.jna";a="jna";v="3.3.0",OSGI-INF/lib/platform-3.5.2.jar;g="net.java.dev.jna";a="platform";v="3.5.2"', +// 'Export-Package': "org.openqa.grid.common;version=\"${seleniumVersion}\";uses:=\"com.google.gson,org.openqa.grid.common.exception,org.openqa.grid.internal.utils.configuration\",org.openqa.grid.common.defaults;version=\"${seleniumVersion}\",org.openqa.grid.common.exception;version=\"${seleniumVersion}\",org.openqa.grid.images;version=\"${seleniumVersion}\",org.openqa.grid.internal;version=\"${seleniumVersion}\";uses:=\"com.google.gson,javax.management,javax.servlet.http,net.jcip.annotations,org.openqa.grid.common,org.openqa.grid.common.exception,org.openqa.grid.internal.exception,org.openqa.grid.internal.listeners,org.openqa.grid.internal.utils,org.openqa.grid.internal.utils.configuration,org.openqa.grid.web,org.openqa.grid.web.servlet.handler,org.openqa.selenium.remote,org.openqa.selenium.remote.internal,org.openqa.selenium.remote.server.jmx\",org.openqa.grid.internal.exception;version=\"${seleniumVersion}\";uses:=\"org.openqa.grid.common.exception\",org.openqa.grid.internal.listeners;version=\"${seleniumVersion}\";uses:=\"javax.servlet.http,org.openqa.grid.common.exception,org.openqa.grid.internal\",org.openqa.grid.internal.utils;version=\"${seleniumVersion}\";uses:=\"javax.servlet,org.openqa.grid.common,org.openqa.grid.internal,org.openqa.grid.internal.utils.configuration,org.openqa.grid.shared,org.openqa.selenium.remote\",org.openqa.grid.internal.utils.configuration;version=\"${seleniumVersion}\";uses:=\"com.beust.jcommander,com.beust.jcommander.converters,com.google.gson,com.google.gson.annotations,com.google.gson.stream,org.openqa.grid.internal.listeners,org.openqa.grid.internal.utils,org.openqa.grid.internal.utils.configuration.converters,org.openqa.grid.internal.utils.configuration.validators,org.openqa.selenium\",org.openqa.grid.internal.utils.configuration.converters;version=\"${seleniumVersion}\";uses:=\"com.beust.jcommander,com.beust.jcommander.converters,org.openqa.grid.internal.listeners,org.openqa.grid.internal.utils,org.openqa.selenium.remote\",org.openqa.grid.internal.utils.configuration.validators;version=\"${seleniumVersion}\";uses:=\"com.beust.jcommander\",org.openqa.grid.selenium;version=\"${seleniumVersion}\",org.openqa.grid.selenium.node;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium\",org.openqa.grid.selenium.proxy;version=\"${seleniumVersion}\";uses:=\"javax.management,javax.servlet.http,org.openqa.grid.common,org.openqa.grid.common.exception,org.openqa.grid.internal,org.openqa.grid.internal.listeners,org.openqa.grid.internal.utils,org.openqa.selenium.remote.server.jmx\",org.openqa.grid.shared;version=\"${seleniumVersion}\";uses:=\"javax.servlet,org.openqa.grid.internal.utils.configuration\",org.openqa.grid.web;version=\"${seleniumVersion}\";uses:=\"org.openqa.grid.internal,org.openqa.grid.internal.utils.configuration,org.openqa.selenium.remote.server.jmx\",org.openqa.grid.web.servlet;version=\"${seleniumVersion}\";uses:=\"javax.servlet,javax.servlet.http,org.openqa.grid.internal\",org.openqa.grid.web.servlet.beta;version=\"${seleniumVersion}\";uses:=\"javax.servlet,javax.servlet.http,org.openqa.grid.internal,org.openqa.grid.internal.utils,org.openqa.grid.web.servlet\",org.openqa.grid.web.servlet.handler;version=\"${seleniumVersion}\";uses:=\"javax.servlet,javax.servlet.http,org.openqa.grid.internal,org.openqa.grid.internal.exception\",org.openqa.grid.web.utils;version=\"${seleniumVersion}\";uses:=\"javax.servlet,org.openqa.grid.internal,org.openqa.selenium.remote\",org.openqa.selenium;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium.internal,org.openqa.selenium.logging\",org.openqa.selenium.chrome;version=\"${seleniumVersion}\";uses:=\"com.google.common.collect,org.openqa.selenium,org.openqa.selenium.html5,org.openqa.selenium.interactions,org.openqa.selenium.mobile,org.openqa.selenium.remote,org.openqa.selenium.remote.service\",org.openqa.selenium.firefox;version=\"${seleniumVersion}\";uses:=\"com.google.common.collect,org.openqa.selenium,org.openqa.selenium.firefox.internal,org.openqa.selenium.logging,org.openqa.selenium.os,org.openqa.selenium.remote,org.openqa.selenium.remote.service\",org.openqa.selenium.firefox.amd64;version=\"${seleniumVersion}\",org.openqa.selenium.firefox.internal;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium,org.openqa.selenium.firefox\",org.openqa.selenium.firefox.x86;version=\"${seleniumVersion}\",org.openqa.selenium.html5;version=\"${seleniumVersion}\",org.openqa.selenium.htmlunit;version=\"${seleniumVersion}\";uses:=\"com.gargoylesoftware.htmlunit,com.gargoylesoftware.htmlunit.html,org.openqa.selenium,org.openqa.selenium.interactions,org.openqa.selenium.interactions.internal,org.openqa.selenium.internal\",org.openqa.selenium.ie;version=\"${seleniumVersion}\";uses:=\"com.google.common.collect,org.openqa.selenium,org.openqa.selenium.internal,org.openqa.selenium.remote,org.openqa.selenium.remote.service\",org.openqa.selenium.interactions;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium,org.openqa.selenium.interactions.internal\",org.openqa.selenium.interactions.internal;version=\"${seleniumVersion}\";uses:=\"com.google.common.collect,org.openqa.selenium,org.openqa.selenium.interactions\",org.openqa.selenium.interactions.touch;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium,org.openqa.selenium.interactions,org.openqa.selenium.interactions.internal\",org.openqa.selenium.internal;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium,org.openqa.selenium.interactions.internal\",org.openqa.selenium.io;version=\"${seleniumVersion}\",org.openqa.selenium.json;version=\"${seleniumVersion}\";uses:=\"com.google.gson,org.openqa.selenium\",org.openqa.selenium.logging;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium\",org.openqa.selenium.logging.profiler;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium.logging\",org.openqa.selenium.mobile;version=\"${seleniumVersion}\",org.openqa.selenium.net;version=\"${seleniumVersion}\",org.openqa.selenium.os;version=\"${seleniumVersion}\";uses:=\"com.google.common.collect\",org.openqa.selenium.remote;version=\"${seleniumVersion}\";uses:=\"com.google.common.collect,org.openqa.selenium,org.openqa.selenium.interactions,org.openqa.selenium.interactions.internal,org.openqa.selenium.internal,org.openqa.selenium.json,org.openqa.selenium.logging,org.openqa.selenium.remote.http,org.openqa.selenium.remote.internal\",org.openqa.selenium.remote.html5;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium.html5,org.openqa.selenium.remote\",org.openqa.selenium.remote.http;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium.remote\",org.openqa.selenium.remote.internal;version=\"${seleniumVersion}\";uses:=\"com.google.common.base,org.apache.http.auth,org.apache.http.client,org.apache.http.client.config,org.apache.http.config,org.apache.http.conn,org.apache.http.conn.routing,org.apache.http.impl.client,org.apache.http.protocol,org.openqa.selenium.remote,org.openqa.selenium.remote.http\",org.openqa.selenium.remote.mobile;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium.mobile,org.openqa.selenium.remote\",org.openqa.selenium.remote.server;version=\"${seleniumVersion}\";uses:=\"javax.management,javax.servlet,javax.servlet.http,org.openqa.grid.internal.utils.configuration,org.openqa.grid.shared,org.openqa.selenium,org.openqa.selenium.internal,org.openqa.selenium.io,org.openqa.selenium.remote,org.openqa.selenium.remote.http,org.openqa.selenium.remote.server.jmx,org.openqa.selenium.remote.server.rest,org.openqa.selenium.remote.service\",org.openqa.selenium.remote.server.commandhandler;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium.json,org.openqa.selenium.remote,org.openqa.selenium.remote.http,org.openqa.selenium.remote.server\",org.openqa.selenium.remote.server.handler;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium,org.openqa.selenium.logging,org.openqa.selenium.remote,org.openqa.selenium.remote.server,org.openqa.selenium.remote.server.rest\",org.openqa.selenium.remote.server.handler.html5;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium,org.openqa.selenium.html5,org.openqa.selenium.mobile,org.openqa.selenium.remote.server,org.openqa.selenium.remote.server.handler\",org.openqa.selenium.remote.server.handler.interactions;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium.remote.server,org.openqa.selenium.remote.server.handler\",org.openqa.selenium.remote.server.handler.interactions.touch;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium.remote.server,org.openqa.selenium.remote.server.handler\",org.openqa.selenium.remote.server.handler.internal;version=\"${seleniumVersion}\";uses:=\"com.google.common.base,org.openqa.selenium.remote.server\",org.openqa.selenium.remote.server.handler.mobile;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium.mobile,org.openqa.selenium.remote.server,org.openqa.selenium.remote.server.handler\",org.openqa.selenium.remote.server.jmx;version=\"${seleniumVersion}\";uses:=\"javax.management\",org.openqa.selenium.remote.server.log;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium,org.openqa.selenium.logging,org.openqa.selenium.remote\",org.openqa.selenium.remote.server.rest;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium.remote,org.openqa.selenium.remote.server\",org.openqa.selenium.remote.server.xdrpc;version=\"${seleniumVersion}\";uses:=\"javax.servlet.http\",org.openqa.selenium.remote.service;version=\"${seleniumVersion}\";uses:=\"com.google.common.collect,org.openqa.selenium,org.openqa.selenium.remote\",org.openqa.selenium.remote.session;version=\"${seleniumVersion}\",org.openqa.selenium.support;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium,org.openqa.selenium.support.pagefactory\",org.openqa.selenium.support.events;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium,org.openqa.selenium.interactions,org.openqa.selenium.internal\",org.openqa.selenium.support.events.internal;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium,org.openqa.selenium.interactions,org.openqa.selenium.interactions.internal,org.openqa.selenium.support.events\",org.openqa.selenium.support.pagefactory;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium,org.openqa.selenium.support.ui\",org.openqa.selenium.support.pagefactory.internal;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium.support.pagefactory\",org.openqa.selenium.support.ui;version=\"${seleniumVersion}\";uses:=\"com.google.common.base,org.openqa.selenium\"Import-Package=com.beust.jcommander;resolution:=optional;version=\"[1.48,2)\",com.beust.jcommander.converters;resolution:=optional;version=\"[1.48,2)\",com.gargoylesoftware.htmlunit.javascript.host;resolution:=optional,com.gargoylesoftware.htmlunit.javascript.host.dom;resolution:=optional,com.gargoylesoftware.htmlunit.javascript.host.event;resolution:=optional,com.gargoylesoftware.htmlunit.javascript.host.html;resolution:=optional,javax.servlet;resolution:=optional;version=\"[3.1,4)\",javax.servlet.http;resolution:=optional;version=\"[3.1,4)\",org.eclipse.jetty.client;resolution:=optional;version=\"[9.4,10)\",org.eclipse.jetty.client.security;resolution:=optional,org.eclipse.jetty.client.webdav;resolution:=optional,org.eclipse.jetty.continuation;resolution:=optional,org.eclipse.jetty.http;resolution:=optional;version=\"[9.4,10)\",org.eclipse.jetty.http.gzip;resolution:=optional,org.eclipse.jetty.io;resolution:=optional;version=\"[9.4,10)\",org.eclipse.jetty.io.bio;resolution:=optional,org.eclipse.jetty.io.nio;resolution:=optional,org.eclipse.jetty.jmx;resolution:=optional,org.eclipse.jetty.security;resolution:=optional,org.eclipse.jetty.security.authentication;resolution:=optional,org.eclipse.jetty.server;resolution:=optional,org.eclipse.jetty.server.bio;resolution:=optional,org.eclipse.jetty.server.handler;resolution:=optional,org.eclipse.jetty.server.handler.jmx;resolution:=optional,org.eclipse.jetty.server.jmx;resolution:=optional,org.eclipse.jetty.server.nio;resolution:=optional,org.eclipse.jetty.server.session;resolution:=optional,org.eclipse.jetty.server.session.jmx;resolution:=optional,org.eclipse.jetty.server.ssl;resolution:=optional,org.eclipse.jetty.servlet;resolution:=optional,org.eclipse.jetty.servlet.api;resolution:=optional,org.eclipse.jetty.servlet.jmx;resolution:=optional,org.eclipse.jetty.servlet.listener;resolution:=optional,org.eclipse.jetty.servlets;resolution:=optional,org.eclipse.jetty.util;resolution:=optional;version=\"[9.4,10)\",org.eclipse.jetty.util.ajax;resolution:=optional,org.eclipse.jetty.util.component;resolution:=optional;version=\"[9.4,10)\",org.eclipse.jetty.util.log;resolution:=optional;version=\"[9.4,10)\",org.eclipse.jetty.util.resource;resolution:=optional;version=\"[9.4,10)\",org.eclipse.jetty.util.security;resolution:=optional;version=\"[9.4,10)\",org.eclipse.jetty.util.ssl;resolution:=optional;version=\"[9.4,10)\",org.eclipse.jetty.util.statistic;resolution:=optional;version=\"[9.4,10)\",org.eclipse.jetty.util.thread;resolution:=optional;version=\"[9.4,10)\",org.eclipse.jetty.webapp;resolution:=optional,org.eclipse.jetty.xml;resolution:=optional;version=\"[9.4,10)\",org.mortbay.log;resolution:=optional,org.mortbay.util.ajax;resolution:=optional,org.seleniumhq.jetty7.jmx;resolution:=optional,org.seleniumhq.jetty9.security;resolution:=optional,org.seleniumhq.jetty9.server;resolution:=optional,org.seleniumhq.jetty9.servlet;resolution:=optional,org.seleniumhq.jetty9.util.security;resolution:=optional,org.seleniumhq.jetty9.util.thread;resolution:=optional,net.bytebuddy;resolution:=optional;version=\"[1.7,2)\",net.bytebuddy.description.annotation;resolution:=optional;version=\"[1.7,2)\",net.bytebuddy.dynamic;resolution:=optional;version=\"[1.7,2)\",net.bytebuddy.implementation;resolution:=optional;version=\"[1.7,2)\",net.bytebuddy.matcher;resolution:=optional;version=\"[1.7,2)\",org.openqa.selenium.safari;resolution:=optional,org.openqa.selenium.security;resolution:=optional,com.gargoylesoftware.htmlunit,com.gargoylesoftware.htmlunit.html,com.gargoylesoftware.htmlunit.javascript,com.gargoylesoftware.htmlunit.util,com.google.common.base;version=\"[25.1,26)\",com.google.common.cache;version=\"[25.1,26)\",com.google.common.collect;version=\"[25.1,26)\",com.google.common.io;version=\"[25.1,26)\",com.google.common.net;version=\"[25.1,26)\",com.google.common.primitives;version=\"[25.1,26)\",com.google.common.reflect;version=\"[25.1,26)\",com.google.common.util.concurrent;version=\"[25.1,26)\",com.google.gson;version=\"[2.8,3)\",com.google.gson.annotations;version=\"[2.8,3)\",com.google.gson.reflect;version=\"[2.8,3)\",com.google.gson.stream;version=\"[2.8,3)\",javax.imageio,javax.management,javax.naming,javax.net,javax.net.ssl,javax.security.auth,javax.security.cert,javax.sql,javax.swing,javax.swing.text,javax.xml.namespace,javax.xml.parsers,javax.xml.xpath,net.jcip.annotations,net.sourceforge.htmlunit.corejs.javascript,org.apache.http,org.apache.http.auth,org.apache.http.client,org.apache.http.client.config,org.apache.http.client.methods,org.apache.http.config,org.apache.http.conn,org.apache.http.conn.routing,org.apache.http.conn.socket,org.apache.http.conn.ssl,org.apache.http.entity,org.apache.http.impl.client,org.apache.http.impl.conn,org.apache.http.message,org.apache.http.protocol,org.apache.http.util,org.ietf.jgss,org.openqa.grid.common;version=\"[3.8,4)\",org.openqa.grid.common.exception;version=\"[3.8,4)\",org.openqa.grid.internal;version=\"[3.8,4)\",org.openqa.grid.internal.exception;version=\"[3.8,4)\",org.openqa.grid.internal.listeners;version=\"[3.8,4)\",org.openqa.grid.internal.utils;version=\"[3.8,4)\",org.openqa.grid.internal.utils.configuration;version=\"[3.8,4)\",org.openqa.grid.internal.utils.configuration.converters;version=\"[3.8,4)\",org.openqa.grid.internal.utils.configuration.validators;version=\"[3.8,4)\",org.openqa.grid.selenium.node;version=\"[3.8,4)\",org.openqa.grid.shared;version=\"[3.8,4)\",org.openqa.grid.web;version=\"[3.8,4)\",org.openqa.grid.web.servlet;version=\"[3.8,4)\",org.openqa.grid.web.servlet.beta;version=\"[3.8,4)\",org.openqa.grid.web.servlet.handler;version=\"[3.8,4)\",org.openqa.grid.web.utils;version=\"[3.8,4)\",org.openqa.selenium;version=\"[3.8,4)\",org.openqa.selenium.firefox;version=\"[3.8,4)\",org.openqa.selenium.firefox.internal;version=\"[3.8,4)\",org.openqa.selenium.html5;version=\"[3.8,4)\",org.openqa.selenium.interactions;version=\"[3.8,4)\",org.openqa.selenium.interactions.internal;version=\"[3.8,4)\",org.openqa.selenium.internal;version=\"[3.8,4)\",org.openqa.selenium.io;version=\"[3.8,4)\",org.openqa.selenium.json;version=\"[3.8,4)\",org.openqa.selenium.logging;version=\"[3.8,4)\",org.openqa.selenium.logging.profiler;version=\"[3.8,4)\",org.openqa.selenium.mobile;version=\"[3.8,4)\",org.openqa.selenium.net;version=\"[3.8,4)\",org.openqa.selenium.remote;version=\"[3.8,4)\",org.openqa.selenium.remote.html5;version=\"[3.8,4)\",org.openqa.selenium.remote.http;version=\"[3.8,4)\",org.openqa.selenium.remote.internal;version=\"[3.8,4)\",org.openqa.selenium.remote.mobile;version=\"[3.8,4)\",org.openqa.selenium.remote.server;version=\"[3.8,4)\",org.openqa.selenium.remote.server.commandhandler;version=\"[3.8,4)\",org.openqa.selenium.remote.server.handler;version=\"[3.8,4)\",org.openqa.selenium.remote.server.handler.html5;version=\"[3.8,4)\",org.openqa.selenium.remote.server.handler.interactions;version=\"[3.8,4)\",org.openqa.selenium.remote.server.handler.interactions.touch;version=\"[3.8,4)\",org.openqa.selenium.remote.server.handler.internal;version=\"[3.8,4)\",org.openqa.selenium.remote.server.handler.mobile;version=\"[3.8,4)\",org.openqa.selenium.remote.server.jmx;version=\"[3.8,4)\",org.openqa.selenium.remote.server.log;version=\"[3.8,4)\",org.openqa.selenium.remote.server.rest;version=\"[3.8,4)\",org.openqa.selenium.remote.server.xdrpc;version=\"[3.8,4)\",org.openqa.selenium.remote.service;version=\"[3.8,4)\",org.openqa.selenium.remote.session;version=\"[3.8,4)\",org.openqa.selenium.support;version=\"[3.8,4)\",org.openqa.selenium.support.events;version=\"[3.8,4)\",org.openqa.selenium.support.events.internal;version=\"[3.8,4)\",org.openqa.selenium.support.pagefactory;version=\"[3.8,4)\",org.openqa.selenium.support.pagefactory.internal;version=\"[3.8,4)\",org.openqa.selenium.support.ui;version=\"[3.8,4)\",org.slf4j,org.slf4j.helpers,org.slf4j.spi,org.w3c.css.sac,org.w3c.dom,org.xml.sax,org.xml.sax.helpersRequire-Capability=osgi.ee;filter:=\"(&(osgi.ee=JavaSE)(version=1.8))\"Tool=Bnd-4.0.0.201805111645" +// ) +// } +//} + +description = 'AET :: OSGi Dependencies :: Selenium' diff --git a/osgi-dependencies/w3chtml5validator/build.gradle b/osgi-dependencies/w3chtml5validator/build.gradle new file mode 100644 index 000000000..c34b107b8 --- /dev/null +++ b/osgi-dependencies/w3chtml5validator/build.gradle @@ -0,0 +1,33 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'com.cognifide.aet.java-conventions' +} + +dependencies { + implementation 'nu.validator:validator:17.11.1' + implementation 'com.cybozu.labs:langdetect:1.1-20120112' + implementation 'com.shapesecurity:salvation:2.3.0' + implementation 'net.arnx:jsonic:1.3.9' + implementation 'org.eclipse.jetty:jetty-util-ajax:9.2.9.v20150224' + implementation 'com.ibm.icu:icu4j:58.2' + implementation 'nu.validator:galimatias:0.1.2' + implementation 'isorelax:isorelax:20030108' + implementation 'net.sf.saxon:Saxon-HE:9.6.0-4' + implementation 'nu.validator:htmlparser:1.4.7' + implementation 'nu.validator:jing:20171006VNU' + implementation 'org.mozilla:rhino:1.7R5' + implementation 'xom:xom:1.1' + implementation 'net.sourceforge.jchardet:jchardet:1.0' + compileOnly 'commons-fileupload:commons-fileupload:1.3.3' + compileOnly 'org.eclipse.jetty:jetty-http:9.3.14.v20161028' + compileOnly 'org.eclipse.jetty:jetty-io:9.3.14.v20161028' + compileOnly 'org.eclipse.jetty:jetty-security:9.3.14.v20161028' + compileOnly 'org.eclipse.jetty:jetty-server:9.3.14.v20161028' + compileOnly 'org.eclipse.jetty:jetty-servlets:9.3.14.v20161028' + compileOnly 'org.eclipse.jetty:jetty-util:9.3.14.v20161028' +} + +description = 'AET :: OSGi Dependencies :: HTML validator' diff --git a/pom.xml b/pom.xml index 4827109ab..24934109f 100644 --- a/pom.xml +++ b/pom.xml @@ -685,6 +685,12 @@ **/.idea/** **/*.iml + + + **/*.gradle + **/.gradle/** + **/gradle.properties + **/gradle-wrapper.properties diff --git a/report/src/main/webapp/package-lock.json b/report/src/main/webapp/package-lock.json index 16e719795..ea5ad21d3 100644 --- a/report/src/main/webapp/package-lock.json +++ b/report/src/main/webapp/package-lock.json @@ -4309,8 +4309,7 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -4331,14 +4330,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -4353,20 +4350,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -4483,8 +4477,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -4496,7 +4489,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -4511,7 +4503,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -4519,14 +4510,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -4545,7 +4534,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -4626,8 +4614,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -4639,7 +4626,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -4725,8 +4711,7 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -4762,7 +4747,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -4782,7 +4766,6 @@ "version": "3.0.1", "bundled": true, "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -4826,14 +4809,12 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true } } }, diff --git a/rest-endpoint/build.gradle b/rest-endpoint/build.gradle new file mode 100644 index 000000000..d1e1be9f9 --- /dev/null +++ b/rest-endpoint/build.gradle @@ -0,0 +1,33 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'com.cognifide.aet.java-conventions' +} + +dependencies { + testImplementation 'junit:junit:4.11' + testImplementation 'org.hamcrest:hamcrest-all:1.3' + testImplementation 'org.mockito:mockito-all:1.9.5' + testImplementation 'com.github.stefanbirkner:system-rules:1.18.0' + providedCompile project(':communication-api') + providedCompile project(':datastorage-api') + providedCompile project(':accessibility-report') + compileOnly 'org.osgi:org.osgi.compendium:4.2.0' + compileOnly 'org.ops4j.pax.web:pax-web-runtime:1.1.17' + compileOnly 'com.google.guava:guava:25.1-jre' + compileOnly 'commons-io:commons-io:2.6' + compileOnly 'org.apache.commons:commons-lang3:3.7' + compileOnly 'javax.validation:validation-api:1.1.0.Final' + compileOnly 'org.apache.geronimo.specs:geronimo-servlet_2.5_spec:1.2' + compileOnly 'com.google.code.gson:gson:2.8.5' + compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0' + compileOnly 'org.osgi:org.osgi.annotation:6.0.0' + compileOnly 'org.osgi:org.osgi.service.metatype.annotations:1.3.0' + compileOnly 'org.freemarker:freemarker:2.3.29' + compileOnly 'org.slf4j:slf4j-api:1.7.7' + compileOnly 'org.osgi:org.osgi.core:4.3.0' +} + +description = 'AET :: Rest Endpoint' diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 000000000..6ed50b885 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,62 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +pluginManagement { + plugins { + id 'biz.aQute.bnd.builder' version '5.2.0' + } +} + +rootProject.name = 'aet-root' +include(':accessibility-report') +include(':validation') +include(':runner') +include(':rest-endpoint') +include(':datastorage-api') +include(':test-suite') +include(':core') +include(':cleaner') +include(':validation-api') +include(':sample-site') +include(':documentation') +include(':osgi-dependencies') +include(':client-core') +include(':test-executor') +include(':api') +include(':w3chtml5validator') +include(':zip') +include(':configs') +include(':jobs-api') +include(':report') +include(':aet-maven-plugin') +include(':client') +include(':cleaner-test') +include(':datastorage') +include(':selenium') +include(':proxy') +include(':worker') +include(':communication') +include(':communication-api') +include(':jobs') +project(":accessibility-report").projectDir = file('core/accessibility-report') +project(":validation").projectDir = file('core/validation') +project(":runner").projectDir = file('core/runner') +project(":datastorage-api").projectDir = file('api/datastorage-api') +project(":test-suite").projectDir = file('integration-tests/test-suite') +project(":cleaner").projectDir = file('core/cleaner') +project(":validation-api").projectDir = file('api/validation-api') +project(":sample-site").projectDir = file('integration-tests/sample-site') +project(":client-core").projectDir = file('client/client-core') +project(":w3chtml5validator").projectDir = file('osgi-dependencies/w3chtml5validator') +project(":configs").projectDir = file('osgi-dependencies/configs') +project(":jobs-api").projectDir = file('api/jobs-api') +project(":aet-maven-plugin").projectDir = file('client/aet-maven-plugin') +project(":cleaner-test").projectDir = file('integration-tests/cleaner-test') +project(":datastorage").projectDir = file('core/datastorage') +project(":selenium").projectDir = file('osgi-dependencies/selenium') +project(":proxy").projectDir = file('osgi-dependencies/proxy') +project(":worker").projectDir = file('core/worker') +project(":communication").projectDir = file('core/communication') +project(":communication-api").projectDir = file('api/communication-api') +project(":jobs").projectDir = file('core/jobs') diff --git a/test-executor/build.gradle b/test-executor/build.gradle new file mode 100644 index 000000000..4332d0b2b --- /dev/null +++ b/test-executor/build.gradle @@ -0,0 +1,33 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'com.cognifide.aet.java-conventions' + } + +dependencies { + testImplementation 'junit:junit:4.11' + testImplementation 'org.hamcrest:hamcrest-all:1.3' + testImplementation 'org.mockito:mockito-all:1.9.5' + providedCompile project(':communication-api') + providedCompile project(':datastorage-api') + providedCompile project(':rest-endpoint') + compileOnly 'org.osgi:org.osgi.compendium:4.2.0' + compileOnly 'org.ops4j.pax.web:pax-web-runtime:1.1.17' + compileOnly 'com.google.guava:guava:25.1-jre' + compileOnly 'commons-io:commons-io:2.6' + compileOnly 'commons-fileupload:commons-fileupload:1.3.3' + compileOnly 'org.apache.commons:commons-lang3:3.7' + compileOnly 'javax.validation:validation-api:1.1.0.Final' + compileOnly 'org.apache.geronimo.specs:geronimo-servlet_2.5_spec:1.2' + compileOnly 'com.google.code.gson:gson:2.8.5' + compileOnly 'org.simpleframework:simple-xml:2.7.1' + compileOnly 'org.apache.activemq:activemq-osgi:5.15.2' + compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0' + compileOnly 'org.osgi:org.osgi.annotation:6.0.0' + compileOnly 'org.osgi:org.osgi.service.metatype.annotations:1.3.0' + compileOnly 'org.slf4j:slf4j-api:1.7.7' +} + +description = 'AET :: Test Executor' From 915dd9ff4eab8d9ae8c81bdf965ee7fbc8abbed1 Mon Sep 17 00:00:00 2001 From: Bartosz Zbytniewski Date: Wed, 3 Feb 2021 14:29:29 +0100 Subject: [PATCH 02/15] fix: Fix tests --- api/communication-api/build.gradle | 21 ++++++++--- api/datastorage-api/build.gradle | 10 ++++++ api/jobs-api/build.gradle | 13 +++++++ api/validation-api/build.gradle | 10 ++++++ .../com.cognifide.aet.java-conventions.gradle | 3 ++ core/accessibility-report/build.gradle | 11 ++++++ core/cleaner/build.gradle | 11 ++++++ core/communication/build.gradle | 12 +++++++ core/datastorage/build.gradle | 15 ++++++-- core/jobs/build.gradle | 16 +++++++-- core/runner/build.gradle | 13 ++++++- core/validation/build.gradle | 12 ++++++- core/worker/build.gradle | 11 ++++++ osgi-dependencies/proxy/build.gradle | 12 +++++++ osgi-dependencies/selenium/build.gradle | 36 +++++++------------ .../w3chtml5validator/build.gradle | 12 +++++++ rest-endpoint/build.gradle | 12 ++++++- test-executor/build.gradle | 18 ++++++++-- 18 files changed, 211 insertions(+), 37 deletions(-) diff --git a/api/communication-api/build.gradle b/api/communication-api/build.gradle index d412d4a2e..608408f82 100644 --- a/api/communication-api/build.gradle +++ b/api/communication-api/build.gradle @@ -4,18 +4,31 @@ plugins { id 'com.cognifide.aet.java-conventions' + id 'biz.aQute.bnd.builder' } dependencies { testImplementation 'com.googlecode.zohhak:zohhak:1.1.1' - compileOnly 'com.google.guava:guava:25.1-jre' + testImplementation 'junit:junit:4.11' + testImplementation 'org.hamcrest:hamcrest-all:1.3' + testImplementation 'commons-io:commons-io:2.6' + testImplementation 'com.google.guava:guava:25.1-jre' + implementation 'javax.validation:validation-api:1.1.0.Final' + implementation 'org.hibernate:hibernate-validator:4.3.2.Final' + implementation 'com.google.code.gson:gson:2.8.5' compileOnly 'org.apache.activemq:activemq-osgi:5.15.2' compileOnly 'org.apache.commons:commons-lang3:3.7' - compileOnly 'javax.validation:validation-api:1.1.0.Final' - compileOnly 'org.hibernate:hibernate-validator:4.3.2.Final' compileOnly 'org.jboss.logging:jboss-logging:3.3.2.Final' compileOnly 'commons-io:commons-io:2.6' - compileOnly 'com.google.code.gson:gson:2.8.5' +} + +jar { + manifest { + attributes( + 'Bundle-Vendor': 'Cognifide Ltd.', + 'Export-Package': 'com.cognifide.aet.communication.api.*' + ) + } } description = 'AET :: API :: Communication API' diff --git a/api/datastorage-api/build.gradle b/api/datastorage-api/build.gradle index 44caf49b7..6b224a02f 100644 --- a/api/datastorage-api/build.gradle +++ b/api/datastorage-api/build.gradle @@ -4,6 +4,7 @@ plugins { id 'com.cognifide.aet.java-conventions' + id 'biz.aQute.bnd.builder' } dependencies { @@ -15,4 +16,13 @@ dependencies { compileOnly 'com.google.code.gson:gson:2.8.5' } +jar { + manifest { + attributes( + 'Bundle-Vendor': 'Cognifide Ltd.', + 'Export-Package': 'com.cognifide.aet.vs.*' + ) + } +} + description = 'AET :: API :: Data Storage API' diff --git a/api/jobs-api/build.gradle b/api/jobs-api/build.gradle index 95022a5dc..a0aa333cf 100644 --- a/api/jobs-api/build.gradle +++ b/api/jobs-api/build.gradle @@ -4,9 +4,11 @@ plugins { id 'com.cognifide.aet.java-conventions' + id 'biz.aQute.bnd.builder' } dependencies { + testImplementation 'junit:junit:4.11' providedCompile project(':communication-api') providedCompile project(':datastorage-api') providedCompile project(':selenium') @@ -16,4 +18,15 @@ dependencies { compileOnly 'org.codehaus.jackson:jackson-mapper-asl:1.9.13' } +jar { + manifest { + attributes( + 'Bundle-SymbolicName': "${project.name}", + 'Bundle-Name': "${project.name}", + 'Bundle-Vendor': 'Cognifide Ltd.', + 'Export-Package': 'com.cognifide.aet.job.api.*,org.browsermob.core.*' + ) + } +} + description = 'AET :: API :: Jobs API' diff --git a/api/validation-api/build.gradle b/api/validation-api/build.gradle index 0a8a8d59a..43b826845 100644 --- a/api/validation-api/build.gradle +++ b/api/validation-api/build.gradle @@ -4,10 +4,20 @@ plugins { id 'com.cognifide.aet.java-conventions' + id 'biz.aQute.bnd.builder' } dependencies { compileOnly 'org.apache.commons:commons-lang3:3.7' } +jar { + manifest { + attributes( + 'Bundle-Vendor': 'Cognifide Ltd.', + 'Export-Package': 'com.cognifide.aet.validation' + ) + } +} + description = 'AET :: API :: Validation API' diff --git a/buildSrc/src/main/groovy/com.cognifide.aet.java-conventions.gradle b/buildSrc/src/main/groovy/com.cognifide.aet.java-conventions.gradle index fa7887ea0..b6bb292a2 100644 --- a/buildSrc/src/main/groovy/com.cognifide.aet.java-conventions.gradle +++ b/buildSrc/src/main/groovy/com.cognifide.aet.java-conventions.gradle @@ -8,6 +8,9 @@ plugins { } repositories { + maven { + url = 'http://repository.jboss.org/nexus/content/groups/public' + } mavenCentral() jcenter() } diff --git a/core/accessibility-report/build.gradle b/core/accessibility-report/build.gradle index e32d783b5..71fd38a03 100644 --- a/core/accessibility-report/build.gradle +++ b/core/accessibility-report/build.gradle @@ -5,6 +5,7 @@ plugins { id 'com.cognifide.aet.java-conventions' id "org.jetbrains.kotlin.jvm" version "1.4.21-2" + id 'biz.aQute.bnd.builder' } dependencies { @@ -25,4 +26,14 @@ dependencies { compileOnly 'org.jetbrains.kotlin:kotlin-osgi-bundle:1.3.72' } +jar { + manifest { + attributes( + 'Bundle-Vendor': 'Cognifide Ltd.', + 'Import-Package': 'javax.annotation;resolution:=optional,*', + 'Export-Package': 'com.cognifide.aet.accessibility.report.service.*' + ) + } +} + description = 'AET :: Core :: Accessibility Report' diff --git a/core/cleaner/build.gradle b/core/cleaner/build.gradle index 98cb3886b..183fb1fff 100644 --- a/core/cleaner/build.gradle +++ b/core/cleaner/build.gradle @@ -4,6 +4,7 @@ plugins { id 'com.cognifide.aet.java-conventions' + id 'biz.aQute.bnd.builder' } configurations { @@ -32,4 +33,14 @@ dependencies { compileOnly 'com.google.code.findbugs:jsr305:3.0.2' } +jar { + manifest { + attributes( + 'Bundle-Vendor': 'Cognifide Ltd.', + 'Import-Package': 'javax.annotation;resolution:=optional,*', + 'Export-Package': 'com.cognifide.aet.cleaner.*' + ) + } +} + description = 'AET :: Core :: Cleaner' diff --git a/core/communication/build.gradle b/core/communication/build.gradle index de9c03ab8..64d24343e 100644 --- a/core/communication/build.gradle +++ b/core/communication/build.gradle @@ -4,6 +4,7 @@ plugins { id 'com.cognifide.aet.java-conventions' + id 'biz.aQute.bnd.builder' } dependencies { @@ -11,6 +12,8 @@ dependencies { testImplementation 'org.hamcrest:hamcrest-all:1.3' testImplementation 'org.mockito:mockito-all:1.9.5' providedCompile project(':communication-api') + implementation 'javax.jms:jms:1.1' + implementation 'org.slf4j:slf4j-api:1.7.7' compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0' compileOnly 'org.osgi:org.osgi.annotation:6.0.0' compileOnly 'org.osgi:org.osgi.service.metatype.annotations:1.3.0' @@ -18,4 +21,13 @@ dependencies { compileOnly 'org.apache.felix:org.apache.felix.configadmin:1.8.16' } +jar { + manifest { + attributes( + 'Bundle-Vendor': 'Cognifide Ltd.', + 'Export-Package': 'com.cognifide.aet.queues.*' + ) + } +} + description = 'AET :: Core :: Communication' diff --git a/core/datastorage/build.gradle b/core/datastorage/build.gradle index 9ed386dff..3f53fa3cf 100644 --- a/core/datastorage/build.gradle +++ b/core/datastorage/build.gradle @@ -4,6 +4,7 @@ plugins { id 'com.cognifide.aet.java-conventions' + id 'biz.aQute.bnd.builder' } dependencies { @@ -15,6 +16,9 @@ dependencies { providedCompile project(':datastorage-api') providedCompile project(':validation-api') providedCompile project(':validation') + implementation 'org.mongodb:mongo-java-driver:3.8.0' + implementation 'org.slf4j:slf4j-api:1.7.7' + implementation 'org.apache.commons:commons-lang3:3.7' compileOnly 'com.google.guava:guava:25.1-jre' compileOnly 'commons-codec:commons-codec:1.11' compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0' @@ -23,9 +27,16 @@ dependencies { compileOnly 'com.google.code.gson:gson:2.8.5' compileOnly 'org.osgi:org.osgi.compendium:4.2.0' compileOnly 'commons-io:commons-io:2.6' - compileOnly 'org.apache.commons:commons-lang3:3.7' compileOnly 'org.apache.servicemix.bundles:org.apache.servicemix.bundles.quartz:2.3.0_2' - compileOnly 'org.mongodb:mongo-java-driver:3.8.0' +} + +jar { + manifest { + attributes( + 'Bundle-Vendor': 'Cognifide Ltd.', + 'Export-Package': "com.cognifide.aet.vs.metadata.*,com.cognifide.aet.vs.mongodb.*" + ) + } } description = 'AET :: Core :: Data Storage' diff --git a/core/jobs/build.gradle b/core/jobs/build.gradle index 1f0a4141e..20f33267b 100644 --- a/core/jobs/build.gradle +++ b/core/jobs/build.gradle @@ -4,6 +4,7 @@ plugins { id 'com.cognifide.aet.java-conventions' + id 'biz.aQute.bnd.builder' } dependencies { @@ -17,12 +18,13 @@ dependencies { testImplementation 'org.skyscreamer:jsonassert:1.3.0' testImplementation 'org.slf4j:slf4j-simple:1.7.7' testImplementation 'org.assertj:assertj-core:3.11.1' + implementation 'com.googlecode.java-diff-utils:diffutils:1.3.0' + implementation 'org.apache.commons:commons-lang3:3.7' + implementation 'org.jsoup:jsoup:1.11.3' compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0' compileOnly 'org.osgi:org.osgi.annotation:6.0.0' compileOnly 'org.osgi:org.osgi.service.metatype.annotations:1.3.0' compileOnly 'org.osgi:org.osgi.core:4.3.0' - compileOnly 'org.jsoup:jsoup:1.11.3' - compileOnly 'com.googlecode.java-diff-utils:diffutils:1.3.0' compileOnly 'org.apache.httpcomponents:fluent-hc:4.5.5' compileOnly 'com.google.code.gson:gson:2.8.5' compileOnly 'org.slf4j:slf4j-api:1.7.7' @@ -36,4 +38,14 @@ dependencies { providedCompile project(':w3chtml5validator') } +jar { + manifest { + attributes( + 'Bundle-Vendor': 'Cognifide Ltd.', + 'Import-Package': 'javax.annotation;resolution:=optional,*', + 'Export-Package': 'com.cognifide.aet.job.common.*,collectors.*' + ) + } +} + description = 'AET :: Core :: Jobs' diff --git a/core/runner/build.gradle b/core/runner/build.gradle index 8b5cf56e2..da67a5fc0 100644 --- a/core/runner/build.gradle +++ b/core/runner/build.gradle @@ -4,6 +4,7 @@ plugins { id 'com.cognifide.aet.java-conventions' + id 'biz.aQute.bnd.builder' } dependencies { @@ -11,12 +12,13 @@ dependencies { testImplementation 'org.hamcrest:hamcrest-all:1.3' testImplementation 'org.mockito:mockito-all:1.9.5' testImplementation 'com.googlecode.zohhak:zohhak:1.1.1' + testImplementation 'commons-io:commons-io:2.6' + implementation 'com.google.guava:guava:25.1-jre' providedCompile project(':communication-api') providedCompile project(':datastorage-api') providedCompile project(':communication') compileOnly 'com.google.code.gson:gson:2.8.5' compileOnly 'commons-io:commons-io:2.6' - compileOnly 'com.google.guava:guava:25.1-jre' compileOnly 'org.apache.commons:commons-lang3:3.7' compileOnly 'org.apache.activemq:activemq-osgi:5.15.2' compileOnly 'javax.validation:validation-api:1.1.0.Final' @@ -25,4 +27,13 @@ dependencies { compileOnly 'org.osgi:org.osgi.service.metatype.annotations:1.3.0' } +jar { + manifest { + attributes( + 'Bundle-Vendor': 'Cognifide Ltd.', + 'Export-Package': 'com.cognifide.aet.runner*' + ) + } +} + description = 'AET :: Core :: Runner' diff --git a/core/validation/build.gradle b/core/validation/build.gradle index b4c5f1bbc..3e69b94a7 100644 --- a/core/validation/build.gradle +++ b/core/validation/build.gradle @@ -4,17 +4,27 @@ plugins { id 'com.cognifide.aet.java-conventions' + id 'biz.aQute.bnd.builder' } dependencies { testImplementation 'junit:junit:4.11' testImplementation 'org.hamcrest:hamcrest-all:1.3' testImplementation 'org.mockito:mockito-all:1.9.5' + implementation 'org.apache.commons:commons-lang3:3.7' providedCompile project(':validation-api') compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0' compileOnly 'org.osgi:org.osgi.annotation:6.0.0' compileOnly 'org.osgi:org.osgi.service.metatype.annotations:1.3.0' - compileOnly 'org.apache.commons:commons-lang3:3.7' +} + +jar { + manifest { + attributes( + 'Bundle-Vendor': 'Cognifide Ltd.', + 'Export-Package': 'com.cognifide.aet.validation.impl.*' + ) + } } description = 'AET :: Core :: Validation' diff --git a/core/worker/build.gradle b/core/worker/build.gradle index c79c0fe01..240a6f109 100644 --- a/core/worker/build.gradle +++ b/core/worker/build.gradle @@ -4,6 +4,7 @@ plugins { id 'com.cognifide.aet.java-conventions' + id 'biz.aQute.bnd.builder' } dependencies { @@ -30,4 +31,14 @@ dependencies { compileOnly 'com.google.code.findbugs:jsr305:3.0.2' } +jar { + manifest { + attributes( + 'Bundle-Vendor': 'Cognifide Ltd.', + 'Import-Package': 'javax.annotation;resolution:=optional,*', + 'Export-Package': 'com.cognifide.aet.worker.*' + ) + } +} + description = 'AET :: Core :: Worker' diff --git a/osgi-dependencies/proxy/build.gradle b/osgi-dependencies/proxy/build.gradle index aa50082b3..fb400679e 100644 --- a/osgi-dependencies/proxy/build.gradle +++ b/osgi-dependencies/proxy/build.gradle @@ -4,6 +4,7 @@ plugins { id 'com.cognifide.aet.java-conventions' + id 'biz.aQute.bnd.builder' } dependencies { @@ -19,4 +20,15 @@ dependencies { compileOnly 'org.apache.httpcomponents:httpclient:4.4' } +jar { + manifest { + attributes( + 'Bundle-Vendor': 'Cognifide Ltd.', + 'Export-Package': 'com.cognifide.aet.proxy.*', + 'Embed-Dependency': 'browsermob-proxy-client', + 'Import-Package': 'com.sun.net.ssl.*;resolution:=optional,sun.net.spi.*;resolution:=optional,com.sun.*;resolution:=optional,*' + ) + } +} + description = 'AET :: OSGi Dependencies :: Proxy' diff --git a/osgi-dependencies/selenium/build.gradle b/osgi-dependencies/selenium/build.gradle index 71ad849a0..fa7584d5e 100644 --- a/osgi-dependencies/selenium/build.gradle +++ b/osgi-dependencies/selenium/build.gradle @@ -4,7 +4,7 @@ plugins { id 'com.cognifide.aet.java-conventions' -// id 'biz.aQute.bnd.builder' + id 'biz.aQute.bnd.builder' } dependencies { @@ -24,27 +24,17 @@ dependencies { implementation 'net.java.dev.jna:platform:3.5.2' } -//jar { -// manifest { -// attributes( -// 'Manifest-Version': '1.0', -// 'Bundle-ClassPath': ".,OSGI-INF/lib/jetty-repacked-7.6.1.1.jar,OSGI-INF/lib/selenium-java-${seleniumVersion}.jar,OSGI-INF/lib/selenium-api-${seleniumVersion}.jar,OSGI-INF/lib/selenium-chrome-driver-${seleniumVersion}.jar,OSGI-INF/lib/selenium-firefox-driver-${seleniumVersion}.jar,OSGI-INF/lib/selenium-htmlunit-driver-2.52.0.jar,OSGI-INF/lib/selenium-ie-driver-${seleniumVersion}.jar,OSGI-INF/lib/selenium-remote-driver-${seleniumVersion}.jar,OSGI-INF/lib/selenium-support-${seleniumVersion}.jar,OSGI-INF/lib/selenium-server-${seleniumVersion}.jar,OSGI-INF/lib/commons-exec-1.3.jar,OSGI-INF/lib/jna-3.0.9.jar,OSGI-INF/lib/jna-3.3.0.jar,OSGI-INF/lib/platform-3.5.2.jar", -// 'Bundle-Description': 'Wraps Selenium library into OSGi bundle', -// 'Bundle-DocURL': 'http://www.cognifide.com', -// 'Bundle-License': 'http://www.apache.org/licenses/LICENSE-2.0.txt', -// 'Bundle-ManifestVersion': '2', -// 'Bundle-Name': 'AET :=OSGi Dependencies :=Selenium', -// 'Bundle-SymbolicName': 'com.cognifide.aet.selenium', -// 'Bundle-Vendor': 'Cognifide Ltd.', -// 'Bundle-Version': '3.4.1.SNAPSHOT', -// 'Created-By': 'Apache Maven Bundle Plugin', -// 'Embed-Dependency': '*;scope=compile|runtime|optional', -// 'Embed-Directory': 'OSGI-INF/lib', -// 'Embed-Transitive': 'false', -// 'Embedded-Artifacts': 'OSGI-INF/lib/jetty-repacked-7.6.1.1.jar;g="org.seleniumhq.selenium";a="jetty-repacked";v="7.6.1.1",OSGI-INF/lib/selenium-java-${seleniumVersion}.jar;g="org.seleniumhq.selenium";a="selenium-java";v="${seleniumVersion}",OSGI-INF/lib/selenium-api-${seleniumVersion}.jar;g="org.seleniumhq.selenium";a="selenium-api";v="${seleniumVersion}",OSGI-INF/lib/selenium-chrome-driver-${seleniumVersion}.jar;g="org.seleniumhq.selenium";a="selenium-chrome-driver";v="${seleniumVersion}",OSGI-INF/lib/selenium-firefox-driver-${seleniumVersion}.jar;g="org.seleniumhq.selenium";a="selenium-firefox-driver";v="${seleniumVersion}",OSGI-INF/lib/selenium-htmlunit-driver-2.52.0.jar;g="org.seleniumhq.selenium";a="selenium-htmlunit-driver";v="2.52.0",OSGI-INF/lib/selenium-ie-driver-${seleniumVersion}.jar;g="org.seleniumhq.selenium";a="selenium-ie-driver";v="${seleniumVersion}",OSGI-INF/lib/selenium-remote-driver-${seleniumVersion}.jar;g="org.seleniumhq.selenium";a="selenium-remote-driver";v="${seleniumVersion}",OSGI-INF/lib/selenium-support-${seleniumVersion}.jar;g="org.seleniumhq.selenium";a="selenium-support";v="${seleniumVersion}",OSGI-INF/lib/selenium-server-${seleniumVersion}.jar;g="org.seleniumhq.selenium";a="selenium-server";v="${seleniumVersion}",OSGI-INF/lib/commons-exec-1.3.jar;g="org.apache.commons";a="commons-exec";v="1.3",OSGI-INF/lib/jna-3.0.9.jar;g="com.sun.jna";a="jna";v="3.0.9",OSGI-INF/lib/jna-3.3.0.jar;g="net.java.dev.jna";a="jna";v="3.3.0",OSGI-INF/lib/platform-3.5.2.jar;g="net.java.dev.jna";a="platform";v="3.5.2"', -// 'Export-Package': "org.openqa.grid.common;version=\"${seleniumVersion}\";uses:=\"com.google.gson,org.openqa.grid.common.exception,org.openqa.grid.internal.utils.configuration\",org.openqa.grid.common.defaults;version=\"${seleniumVersion}\",org.openqa.grid.common.exception;version=\"${seleniumVersion}\",org.openqa.grid.images;version=\"${seleniumVersion}\",org.openqa.grid.internal;version=\"${seleniumVersion}\";uses:=\"com.google.gson,javax.management,javax.servlet.http,net.jcip.annotations,org.openqa.grid.common,org.openqa.grid.common.exception,org.openqa.grid.internal.exception,org.openqa.grid.internal.listeners,org.openqa.grid.internal.utils,org.openqa.grid.internal.utils.configuration,org.openqa.grid.web,org.openqa.grid.web.servlet.handler,org.openqa.selenium.remote,org.openqa.selenium.remote.internal,org.openqa.selenium.remote.server.jmx\",org.openqa.grid.internal.exception;version=\"${seleniumVersion}\";uses:=\"org.openqa.grid.common.exception\",org.openqa.grid.internal.listeners;version=\"${seleniumVersion}\";uses:=\"javax.servlet.http,org.openqa.grid.common.exception,org.openqa.grid.internal\",org.openqa.grid.internal.utils;version=\"${seleniumVersion}\";uses:=\"javax.servlet,org.openqa.grid.common,org.openqa.grid.internal,org.openqa.grid.internal.utils.configuration,org.openqa.grid.shared,org.openqa.selenium.remote\",org.openqa.grid.internal.utils.configuration;version=\"${seleniumVersion}\";uses:=\"com.beust.jcommander,com.beust.jcommander.converters,com.google.gson,com.google.gson.annotations,com.google.gson.stream,org.openqa.grid.internal.listeners,org.openqa.grid.internal.utils,org.openqa.grid.internal.utils.configuration.converters,org.openqa.grid.internal.utils.configuration.validators,org.openqa.selenium\",org.openqa.grid.internal.utils.configuration.converters;version=\"${seleniumVersion}\";uses:=\"com.beust.jcommander,com.beust.jcommander.converters,org.openqa.grid.internal.listeners,org.openqa.grid.internal.utils,org.openqa.selenium.remote\",org.openqa.grid.internal.utils.configuration.validators;version=\"${seleniumVersion}\";uses:=\"com.beust.jcommander\",org.openqa.grid.selenium;version=\"${seleniumVersion}\",org.openqa.grid.selenium.node;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium\",org.openqa.grid.selenium.proxy;version=\"${seleniumVersion}\";uses:=\"javax.management,javax.servlet.http,org.openqa.grid.common,org.openqa.grid.common.exception,org.openqa.grid.internal,org.openqa.grid.internal.listeners,org.openqa.grid.internal.utils,org.openqa.selenium.remote.server.jmx\",org.openqa.grid.shared;version=\"${seleniumVersion}\";uses:=\"javax.servlet,org.openqa.grid.internal.utils.configuration\",org.openqa.grid.web;version=\"${seleniumVersion}\";uses:=\"org.openqa.grid.internal,org.openqa.grid.internal.utils.configuration,org.openqa.selenium.remote.server.jmx\",org.openqa.grid.web.servlet;version=\"${seleniumVersion}\";uses:=\"javax.servlet,javax.servlet.http,org.openqa.grid.internal\",org.openqa.grid.web.servlet.beta;version=\"${seleniumVersion}\";uses:=\"javax.servlet,javax.servlet.http,org.openqa.grid.internal,org.openqa.grid.internal.utils,org.openqa.grid.web.servlet\",org.openqa.grid.web.servlet.handler;version=\"${seleniumVersion}\";uses:=\"javax.servlet,javax.servlet.http,org.openqa.grid.internal,org.openqa.grid.internal.exception\",org.openqa.grid.web.utils;version=\"${seleniumVersion}\";uses:=\"javax.servlet,org.openqa.grid.internal,org.openqa.selenium.remote\",org.openqa.selenium;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium.internal,org.openqa.selenium.logging\",org.openqa.selenium.chrome;version=\"${seleniumVersion}\";uses:=\"com.google.common.collect,org.openqa.selenium,org.openqa.selenium.html5,org.openqa.selenium.interactions,org.openqa.selenium.mobile,org.openqa.selenium.remote,org.openqa.selenium.remote.service\",org.openqa.selenium.firefox;version=\"${seleniumVersion}\";uses:=\"com.google.common.collect,org.openqa.selenium,org.openqa.selenium.firefox.internal,org.openqa.selenium.logging,org.openqa.selenium.os,org.openqa.selenium.remote,org.openqa.selenium.remote.service\",org.openqa.selenium.firefox.amd64;version=\"${seleniumVersion}\",org.openqa.selenium.firefox.internal;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium,org.openqa.selenium.firefox\",org.openqa.selenium.firefox.x86;version=\"${seleniumVersion}\",org.openqa.selenium.html5;version=\"${seleniumVersion}\",org.openqa.selenium.htmlunit;version=\"${seleniumVersion}\";uses:=\"com.gargoylesoftware.htmlunit,com.gargoylesoftware.htmlunit.html,org.openqa.selenium,org.openqa.selenium.interactions,org.openqa.selenium.interactions.internal,org.openqa.selenium.internal\",org.openqa.selenium.ie;version=\"${seleniumVersion}\";uses:=\"com.google.common.collect,org.openqa.selenium,org.openqa.selenium.internal,org.openqa.selenium.remote,org.openqa.selenium.remote.service\",org.openqa.selenium.interactions;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium,org.openqa.selenium.interactions.internal\",org.openqa.selenium.interactions.internal;version=\"${seleniumVersion}\";uses:=\"com.google.common.collect,org.openqa.selenium,org.openqa.selenium.interactions\",org.openqa.selenium.interactions.touch;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium,org.openqa.selenium.interactions,org.openqa.selenium.interactions.internal\",org.openqa.selenium.internal;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium,org.openqa.selenium.interactions.internal\",org.openqa.selenium.io;version=\"${seleniumVersion}\",org.openqa.selenium.json;version=\"${seleniumVersion}\";uses:=\"com.google.gson,org.openqa.selenium\",org.openqa.selenium.logging;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium\",org.openqa.selenium.logging.profiler;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium.logging\",org.openqa.selenium.mobile;version=\"${seleniumVersion}\",org.openqa.selenium.net;version=\"${seleniumVersion}\",org.openqa.selenium.os;version=\"${seleniumVersion}\";uses:=\"com.google.common.collect\",org.openqa.selenium.remote;version=\"${seleniumVersion}\";uses:=\"com.google.common.collect,org.openqa.selenium,org.openqa.selenium.interactions,org.openqa.selenium.interactions.internal,org.openqa.selenium.internal,org.openqa.selenium.json,org.openqa.selenium.logging,org.openqa.selenium.remote.http,org.openqa.selenium.remote.internal\",org.openqa.selenium.remote.html5;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium.html5,org.openqa.selenium.remote\",org.openqa.selenium.remote.http;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium.remote\",org.openqa.selenium.remote.internal;version=\"${seleniumVersion}\";uses:=\"com.google.common.base,org.apache.http.auth,org.apache.http.client,org.apache.http.client.config,org.apache.http.config,org.apache.http.conn,org.apache.http.conn.routing,org.apache.http.impl.client,org.apache.http.protocol,org.openqa.selenium.remote,org.openqa.selenium.remote.http\",org.openqa.selenium.remote.mobile;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium.mobile,org.openqa.selenium.remote\",org.openqa.selenium.remote.server;version=\"${seleniumVersion}\";uses:=\"javax.management,javax.servlet,javax.servlet.http,org.openqa.grid.internal.utils.configuration,org.openqa.grid.shared,org.openqa.selenium,org.openqa.selenium.internal,org.openqa.selenium.io,org.openqa.selenium.remote,org.openqa.selenium.remote.http,org.openqa.selenium.remote.server.jmx,org.openqa.selenium.remote.server.rest,org.openqa.selenium.remote.service\",org.openqa.selenium.remote.server.commandhandler;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium.json,org.openqa.selenium.remote,org.openqa.selenium.remote.http,org.openqa.selenium.remote.server\",org.openqa.selenium.remote.server.handler;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium,org.openqa.selenium.logging,org.openqa.selenium.remote,org.openqa.selenium.remote.server,org.openqa.selenium.remote.server.rest\",org.openqa.selenium.remote.server.handler.html5;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium,org.openqa.selenium.html5,org.openqa.selenium.mobile,org.openqa.selenium.remote.server,org.openqa.selenium.remote.server.handler\",org.openqa.selenium.remote.server.handler.interactions;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium.remote.server,org.openqa.selenium.remote.server.handler\",org.openqa.selenium.remote.server.handler.interactions.touch;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium.remote.server,org.openqa.selenium.remote.server.handler\",org.openqa.selenium.remote.server.handler.internal;version=\"${seleniumVersion}\";uses:=\"com.google.common.base,org.openqa.selenium.remote.server\",org.openqa.selenium.remote.server.handler.mobile;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium.mobile,org.openqa.selenium.remote.server,org.openqa.selenium.remote.server.handler\",org.openqa.selenium.remote.server.jmx;version=\"${seleniumVersion}\";uses:=\"javax.management\",org.openqa.selenium.remote.server.log;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium,org.openqa.selenium.logging,org.openqa.selenium.remote\",org.openqa.selenium.remote.server.rest;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium.remote,org.openqa.selenium.remote.server\",org.openqa.selenium.remote.server.xdrpc;version=\"${seleniumVersion}\";uses:=\"javax.servlet.http\",org.openqa.selenium.remote.service;version=\"${seleniumVersion}\";uses:=\"com.google.common.collect,org.openqa.selenium,org.openqa.selenium.remote\",org.openqa.selenium.remote.session;version=\"${seleniumVersion}\",org.openqa.selenium.support;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium,org.openqa.selenium.support.pagefactory\",org.openqa.selenium.support.events;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium,org.openqa.selenium.interactions,org.openqa.selenium.internal\",org.openqa.selenium.support.events.internal;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium,org.openqa.selenium.interactions,org.openqa.selenium.interactions.internal,org.openqa.selenium.support.events\",org.openqa.selenium.support.pagefactory;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium,org.openqa.selenium.support.ui\",org.openqa.selenium.support.pagefactory.internal;version=\"${seleniumVersion}\";uses:=\"org.openqa.selenium.support.pagefactory\",org.openqa.selenium.support.ui;version=\"${seleniumVersion}\";uses:=\"com.google.common.base,org.openqa.selenium\"Import-Package=com.beust.jcommander;resolution:=optional;version=\"[1.48,2)\",com.beust.jcommander.converters;resolution:=optional;version=\"[1.48,2)\",com.gargoylesoftware.htmlunit.javascript.host;resolution:=optional,com.gargoylesoftware.htmlunit.javascript.host.dom;resolution:=optional,com.gargoylesoftware.htmlunit.javascript.host.event;resolution:=optional,com.gargoylesoftware.htmlunit.javascript.host.html;resolution:=optional,javax.servlet;resolution:=optional;version=\"[3.1,4)\",javax.servlet.http;resolution:=optional;version=\"[3.1,4)\",org.eclipse.jetty.client;resolution:=optional;version=\"[9.4,10)\",org.eclipse.jetty.client.security;resolution:=optional,org.eclipse.jetty.client.webdav;resolution:=optional,org.eclipse.jetty.continuation;resolution:=optional,org.eclipse.jetty.http;resolution:=optional;version=\"[9.4,10)\",org.eclipse.jetty.http.gzip;resolution:=optional,org.eclipse.jetty.io;resolution:=optional;version=\"[9.4,10)\",org.eclipse.jetty.io.bio;resolution:=optional,org.eclipse.jetty.io.nio;resolution:=optional,org.eclipse.jetty.jmx;resolution:=optional,org.eclipse.jetty.security;resolution:=optional,org.eclipse.jetty.security.authentication;resolution:=optional,org.eclipse.jetty.server;resolution:=optional,org.eclipse.jetty.server.bio;resolution:=optional,org.eclipse.jetty.server.handler;resolution:=optional,org.eclipse.jetty.server.handler.jmx;resolution:=optional,org.eclipse.jetty.server.jmx;resolution:=optional,org.eclipse.jetty.server.nio;resolution:=optional,org.eclipse.jetty.server.session;resolution:=optional,org.eclipse.jetty.server.session.jmx;resolution:=optional,org.eclipse.jetty.server.ssl;resolution:=optional,org.eclipse.jetty.servlet;resolution:=optional,org.eclipse.jetty.servlet.api;resolution:=optional,org.eclipse.jetty.servlet.jmx;resolution:=optional,org.eclipse.jetty.servlet.listener;resolution:=optional,org.eclipse.jetty.servlets;resolution:=optional,org.eclipse.jetty.util;resolution:=optional;version=\"[9.4,10)\",org.eclipse.jetty.util.ajax;resolution:=optional,org.eclipse.jetty.util.component;resolution:=optional;version=\"[9.4,10)\",org.eclipse.jetty.util.log;resolution:=optional;version=\"[9.4,10)\",org.eclipse.jetty.util.resource;resolution:=optional;version=\"[9.4,10)\",org.eclipse.jetty.util.security;resolution:=optional;version=\"[9.4,10)\",org.eclipse.jetty.util.ssl;resolution:=optional;version=\"[9.4,10)\",org.eclipse.jetty.util.statistic;resolution:=optional;version=\"[9.4,10)\",org.eclipse.jetty.util.thread;resolution:=optional;version=\"[9.4,10)\",org.eclipse.jetty.webapp;resolution:=optional,org.eclipse.jetty.xml;resolution:=optional;version=\"[9.4,10)\",org.mortbay.log;resolution:=optional,org.mortbay.util.ajax;resolution:=optional,org.seleniumhq.jetty7.jmx;resolution:=optional,org.seleniumhq.jetty9.security;resolution:=optional,org.seleniumhq.jetty9.server;resolution:=optional,org.seleniumhq.jetty9.servlet;resolution:=optional,org.seleniumhq.jetty9.util.security;resolution:=optional,org.seleniumhq.jetty9.util.thread;resolution:=optional,net.bytebuddy;resolution:=optional;version=\"[1.7,2)\",net.bytebuddy.description.annotation;resolution:=optional;version=\"[1.7,2)\",net.bytebuddy.dynamic;resolution:=optional;version=\"[1.7,2)\",net.bytebuddy.implementation;resolution:=optional;version=\"[1.7,2)\",net.bytebuddy.matcher;resolution:=optional;version=\"[1.7,2)\",org.openqa.selenium.safari;resolution:=optional,org.openqa.selenium.security;resolution:=optional,com.gargoylesoftware.htmlunit,com.gargoylesoftware.htmlunit.html,com.gargoylesoftware.htmlunit.javascript,com.gargoylesoftware.htmlunit.util,com.google.common.base;version=\"[25.1,26)\",com.google.common.cache;version=\"[25.1,26)\",com.google.common.collect;version=\"[25.1,26)\",com.google.common.io;version=\"[25.1,26)\",com.google.common.net;version=\"[25.1,26)\",com.google.common.primitives;version=\"[25.1,26)\",com.google.common.reflect;version=\"[25.1,26)\",com.google.common.util.concurrent;version=\"[25.1,26)\",com.google.gson;version=\"[2.8,3)\",com.google.gson.annotations;version=\"[2.8,3)\",com.google.gson.reflect;version=\"[2.8,3)\",com.google.gson.stream;version=\"[2.8,3)\",javax.imageio,javax.management,javax.naming,javax.net,javax.net.ssl,javax.security.auth,javax.security.cert,javax.sql,javax.swing,javax.swing.text,javax.xml.namespace,javax.xml.parsers,javax.xml.xpath,net.jcip.annotations,net.sourceforge.htmlunit.corejs.javascript,org.apache.http,org.apache.http.auth,org.apache.http.client,org.apache.http.client.config,org.apache.http.client.methods,org.apache.http.config,org.apache.http.conn,org.apache.http.conn.routing,org.apache.http.conn.socket,org.apache.http.conn.ssl,org.apache.http.entity,org.apache.http.impl.client,org.apache.http.impl.conn,org.apache.http.message,org.apache.http.protocol,org.apache.http.util,org.ietf.jgss,org.openqa.grid.common;version=\"[3.8,4)\",org.openqa.grid.common.exception;version=\"[3.8,4)\",org.openqa.grid.internal;version=\"[3.8,4)\",org.openqa.grid.internal.exception;version=\"[3.8,4)\",org.openqa.grid.internal.listeners;version=\"[3.8,4)\",org.openqa.grid.internal.utils;version=\"[3.8,4)\",org.openqa.grid.internal.utils.configuration;version=\"[3.8,4)\",org.openqa.grid.internal.utils.configuration.converters;version=\"[3.8,4)\",org.openqa.grid.internal.utils.configuration.validators;version=\"[3.8,4)\",org.openqa.grid.selenium.node;version=\"[3.8,4)\",org.openqa.grid.shared;version=\"[3.8,4)\",org.openqa.grid.web;version=\"[3.8,4)\",org.openqa.grid.web.servlet;version=\"[3.8,4)\",org.openqa.grid.web.servlet.beta;version=\"[3.8,4)\",org.openqa.grid.web.servlet.handler;version=\"[3.8,4)\",org.openqa.grid.web.utils;version=\"[3.8,4)\",org.openqa.selenium;version=\"[3.8,4)\",org.openqa.selenium.firefox;version=\"[3.8,4)\",org.openqa.selenium.firefox.internal;version=\"[3.8,4)\",org.openqa.selenium.html5;version=\"[3.8,4)\",org.openqa.selenium.interactions;version=\"[3.8,4)\",org.openqa.selenium.interactions.internal;version=\"[3.8,4)\",org.openqa.selenium.internal;version=\"[3.8,4)\",org.openqa.selenium.io;version=\"[3.8,4)\",org.openqa.selenium.json;version=\"[3.8,4)\",org.openqa.selenium.logging;version=\"[3.8,4)\",org.openqa.selenium.logging.profiler;version=\"[3.8,4)\",org.openqa.selenium.mobile;version=\"[3.8,4)\",org.openqa.selenium.net;version=\"[3.8,4)\",org.openqa.selenium.remote;version=\"[3.8,4)\",org.openqa.selenium.remote.html5;version=\"[3.8,4)\",org.openqa.selenium.remote.http;version=\"[3.8,4)\",org.openqa.selenium.remote.internal;version=\"[3.8,4)\",org.openqa.selenium.remote.mobile;version=\"[3.8,4)\",org.openqa.selenium.remote.server;version=\"[3.8,4)\",org.openqa.selenium.remote.server.commandhandler;version=\"[3.8,4)\",org.openqa.selenium.remote.server.handler;version=\"[3.8,4)\",org.openqa.selenium.remote.server.handler.html5;version=\"[3.8,4)\",org.openqa.selenium.remote.server.handler.interactions;version=\"[3.8,4)\",org.openqa.selenium.remote.server.handler.interactions.touch;version=\"[3.8,4)\",org.openqa.selenium.remote.server.handler.internal;version=\"[3.8,4)\",org.openqa.selenium.remote.server.handler.mobile;version=\"[3.8,4)\",org.openqa.selenium.remote.server.jmx;version=\"[3.8,4)\",org.openqa.selenium.remote.server.log;version=\"[3.8,4)\",org.openqa.selenium.remote.server.rest;version=\"[3.8,4)\",org.openqa.selenium.remote.server.xdrpc;version=\"[3.8,4)\",org.openqa.selenium.remote.service;version=\"[3.8,4)\",org.openqa.selenium.remote.session;version=\"[3.8,4)\",org.openqa.selenium.support;version=\"[3.8,4)\",org.openqa.selenium.support.events;version=\"[3.8,4)\",org.openqa.selenium.support.events.internal;version=\"[3.8,4)\",org.openqa.selenium.support.pagefactory;version=\"[3.8,4)\",org.openqa.selenium.support.pagefactory.internal;version=\"[3.8,4)\",org.openqa.selenium.support.ui;version=\"[3.8,4)\",org.slf4j,org.slf4j.helpers,org.slf4j.spi,org.w3c.css.sac,org.w3c.dom,org.xml.sax,org.xml.sax.helpersRequire-Capability=osgi.ee;filter:=\"(&(osgi.ee=JavaSE)(version=1.8))\"Tool=Bnd-4.0.0.201805111645" -// ) -// } -//} +jar { + manifest { + attributes( + 'Bundle-Vendor': 'Cognifide Ltd.', + 'Export-Package': "org.openqa.*;version=\"${seleniumVersion}\"", + 'Embed-Dependency': '*;scope=compile|runtime|optional', + 'Import-Package': 'com.beust.jcommander.*;resolution:=optional,com.gargoylesoftware.htmlunit.javascript.host.*;resolution:=optional,javax.servlet.*;resolution:=optional,javax.servlet.http.*;resolution:=optional,junit.*;resolution:=optional,org.apache.commons.logging.*;resolution:=optional,org.eclipse.jetty.*;resolution:=optional,org.junit.*;resolution:=optional,org.mortbay.*;resolution:=optional,org.openqa.jetty.*;resolution:=optional,org.seleniumhq.*;resolution:=optional,com.sun.jna.platform.*;resolution:=optional,net.bytebuddy.*;resolution:=optional,org.objectweb.asm.*;resolution:=optional,org.openqa.selenium.safari.*;resolution:=optional,org.openqa.selenium.security.*;resolution:=optional,*', + 'Embed-Directory': 'OSGI-INF/lib', + 'Embed-Transitive': 'false' + ) + } +} description = 'AET :: OSGi Dependencies :: Selenium' diff --git a/osgi-dependencies/w3chtml5validator/build.gradle b/osgi-dependencies/w3chtml5validator/build.gradle index c34b107b8..934300d62 100644 --- a/osgi-dependencies/w3chtml5validator/build.gradle +++ b/osgi-dependencies/w3chtml5validator/build.gradle @@ -4,6 +4,7 @@ plugins { id 'com.cognifide.aet.java-conventions' + id 'biz.aQute.bnd.builder' } dependencies { @@ -30,4 +31,15 @@ dependencies { compileOnly 'org.eclipse.jetty:jetty-util:9.3.14.v20161028' } +jar { + manifest { + attributes( + 'Bundle-Vendor': 'Cognifide Ltd.', + 'Export-Package': 'nu.validator.*', + 'Embed-Dependency': '*;scope=compile|runtime', + 'Import-Package': 'com.icl.saxon;resolution:=optional,com.sun.org.apache.xerces.internal.*;resolution:=optional,javax.portlet;resolution:=optional,jp.co.swiftinc.relax.*;resolution:=optional,junit.framework;resolution:=optional,org.gjt.xpp;resolution:=optional,org.xmlpull.v1;resolution:=optional,org.apache.xmlbeans;resolution:=optional,org.apache.xerces.*;resolution:=optional,com.google.inject;resolution:=optional,org.fest.assertions;resolution:=optional,org.junit.*;resolution:=optional,org.seasar.framework.*;resolution:=optional,org.springframework.web.context.*;resolution:=optional,*' + ) + } +} + description = 'AET :: OSGi Dependencies :: HTML validator' diff --git a/rest-endpoint/build.gradle b/rest-endpoint/build.gradle index d1e1be9f9..6ababcc4a 100644 --- a/rest-endpoint/build.gradle +++ b/rest-endpoint/build.gradle @@ -4,6 +4,7 @@ plugins { id 'com.cognifide.aet.java-conventions' + id 'biz.aQute.bnd.builder' } dependencies { @@ -14,11 +15,11 @@ dependencies { providedCompile project(':communication-api') providedCompile project(':datastorage-api') providedCompile project(':accessibility-report') + implementation 'org.apache.commons:commons-lang3:3.7' compileOnly 'org.osgi:org.osgi.compendium:4.2.0' compileOnly 'org.ops4j.pax.web:pax-web-runtime:1.1.17' compileOnly 'com.google.guava:guava:25.1-jre' compileOnly 'commons-io:commons-io:2.6' - compileOnly 'org.apache.commons:commons-lang3:3.7' compileOnly 'javax.validation:validation-api:1.1.0.Final' compileOnly 'org.apache.geronimo.specs:geronimo-servlet_2.5_spec:1.2' compileOnly 'com.google.code.gson:gson:2.8.5' @@ -30,4 +31,13 @@ dependencies { compileOnly 'org.osgi:org.osgi.core:4.3.0' } +jar { + manifest { + attributes( + 'Bundle-Vendor': 'Cognifide Ltd.', + 'Export-Package': 'com.cognifide.aet.rest.*' + ) + } +} + description = 'AET :: Rest Endpoint' diff --git a/test-executor/build.gradle b/test-executor/build.gradle index 4332d0b2b..867ce5715 100644 --- a/test-executor/build.gradle +++ b/test-executor/build.gradle @@ -4,7 +4,8 @@ plugins { id 'com.cognifide.aet.java-conventions' - } + id 'biz.aQute.bnd.builder' +} dependencies { testImplementation 'junit:junit:4.11' @@ -13,16 +14,18 @@ dependencies { providedCompile project(':communication-api') providedCompile project(':datastorage-api') providedCompile project(':rest-endpoint') + implementation 'javax.jms:jms:1.1' + implementation 'com.google.guava:guava:25.1-jre' + implementation 'org.simpleframework:simple-xml:2.7.1' + implementation 'org.slf4j:slf4j-api:1.7.7' compileOnly 'org.osgi:org.osgi.compendium:4.2.0' compileOnly 'org.ops4j.pax.web:pax-web-runtime:1.1.17' - compileOnly 'com.google.guava:guava:25.1-jre' compileOnly 'commons-io:commons-io:2.6' compileOnly 'commons-fileupload:commons-fileupload:1.3.3' compileOnly 'org.apache.commons:commons-lang3:3.7' compileOnly 'javax.validation:validation-api:1.1.0.Final' compileOnly 'org.apache.geronimo.specs:geronimo-servlet_2.5_spec:1.2' compileOnly 'com.google.code.gson:gson:2.8.5' - compileOnly 'org.simpleframework:simple-xml:2.7.1' compileOnly 'org.apache.activemq:activemq-osgi:5.15.2' compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0' compileOnly 'org.osgi:org.osgi.annotation:6.0.0' @@ -30,4 +33,13 @@ dependencies { compileOnly 'org.slf4j:slf4j-api:1.7.7' } +jar { + manifest { + attributes( + 'Bundle-Vendor': 'Cognifide Ltd.', + 'Export-Package': '' + ) + } +} + description = 'AET :: Test Executor' From 5d9b9273b36d30e3b2c93ef3be26597e76a3f941 Mon Sep 17 00:00:00 2001 From: Bartosz Zbytniewski Date: Fri, 5 Feb 2021 09:48:33 +0100 Subject: [PATCH 03/15] feature: Initial version of util tasks --- build.gradle | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 build.gradle diff --git a/build.gradle b/build.gradle new file mode 100644 index 000000000..4b7e030b3 --- /dev/null +++ b/build.gradle @@ -0,0 +1,31 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'com.cognifide.aet.java-conventions' +} + +subprojects { Project subproject -> + task copyJar { + dependsOn getTasksByName('build', true) + doLast { + copy { + from("${buildDir}/libs") { + include "**/*.jar" + } + into "${rootDir}/build/jars" + } + } + } +} + +task zip(type: Zip) { + dependsOn getTasksByName('copyJar', true) + archiveFileName = "${project.name}-${project.version}.zip" + destinationDirectory = file("${buildDir}") + + from { "${buildDir}/jars" } +} + +description = 'AET' From fd6bd23d7722a53c7bd08f027128743d046c6bb7 Mon Sep 17 00:00:00 2001 From: Bartosz Zbytniewski Date: Fri, 5 Feb 2021 14:20:43 +0100 Subject: [PATCH 04/15] feature: Initial artifact creation --- build.gradle | 31 ------------------------------- zip/build.gradle | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 31 deletions(-) delete mode 100644 build.gradle create mode 100644 zip/build.gradle diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 4b7e030b3..000000000 --- a/build.gradle +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - -plugins { - id 'com.cognifide.aet.java-conventions' -} - -subprojects { Project subproject -> - task copyJar { - dependsOn getTasksByName('build', true) - doLast { - copy { - from("${buildDir}/libs") { - include "**/*.jar" - } - into "${rootDir}/build/jars" - } - } - } -} - -task zip(type: Zip) { - dependsOn getTasksByName('copyJar', true) - archiveFileName = "${project.name}-${project.version}.zip" - destinationDirectory = file("${buildDir}") - - from { "${buildDir}/jars" } -} - -description = 'AET' diff --git a/zip/build.gradle b/zip/build.gradle new file mode 100644 index 000000000..8db02cb76 --- /dev/null +++ b/zip/build.gradle @@ -0,0 +1,45 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'com.cognifide.aet.java-conventions' +} + +task copyFeaturesXmlFile(type: Copy) { + includeEmptyDirs = false + from("${rootDir}/osgi-dependencies") { + include "**/aet-features.xml" + include "**/aet-webconsole.xml" + } + into "${buildDir}" +} + +task zipConfigs(type: Zip) { + archiveFileName = "${project.group}.configs.zip" + destinationDirectory = file("$buildDir/packages") + from "${rootDir}/osgi-dependencies/configs/src/main/resources" +} + +task copyArtifacts { + dependsOn rootProject.getTasksByName('build', true) + doLast { + delete "${buildDir}/jars" + copy { + includeEmptyDirs = false + rootProject.subprojects { subproject -> + from("${subproject.buildDir}/libs") { + include "**/${subproject.name}*.jar" + exclude "*aet-maven-plugin*.jar" + exclude "*-test*.jar" + exclude "*client*.jar" + exclude "*zip*" + rename { "${project.group}.${subproject.name}.jar" } + } + } + into "${buildDir}/packages" + } + } +} + +description = 'AET' From c58343ccf06fd9730c2b5c87354bce45628239b5 Mon Sep 17 00:00:00 2001 From: Bartosz Zbytniewski Date: Fri, 5 Feb 2021 15:53:24 +0100 Subject: [PATCH 05/15] feature: Initial build.gradle for frontend --- report/build.gradle | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 report/build.gradle diff --git a/report/build.gradle b/report/build.gradle new file mode 100644 index 000000000..098c52b0e --- /dev/null +++ b/report/build.gradle @@ -0,0 +1,12 @@ +plugins { + id 'org.siouan.frontend-jdk8' version '5.0.0' +} + +frontend { + nodeVersion = '8.11.3' + packageJsonDirectory = file('./src/main/webapp') + nodeInstallDirectory = file('./src/main/webapp/node') + assembleScript = 'run gulp build' + cleanScript = 'run clean' + checkScript = 'run check' +} \ No newline at end of file From 9f186b1603c615d2c39de8621fe84dfbe7f94958 Mon Sep 17 00:00:00 2001 From: Bartosz Zbytniewski Date: Fri, 5 Feb 2021 16:01:12 +0100 Subject: [PATCH 06/15] feature: Add helper scripts to package.json --- report/src/main/webapp/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/report/src/main/webapp/package.json b/report/src/main/webapp/package.json index a8f311b14..287862dd3 100644 --- a/report/src/main/webapp/package.json +++ b/report/src/main/webapp/package.json @@ -4,7 +4,8 @@ "description": "aet", "main": "index.js", "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" + "gulp": "gulp build", + "clean": "rm -rf ./node_modules && rm -rf ./node" }, "author": "Cognifide", "license": "Apache-2.0", From 2af1c168e025283d57f27a37f8074581ba013301 Mon Sep 17 00:00:00 2001 From: Bartosz Zbytniewski Date: Mon, 8 Feb 2021 13:22:56 +0100 Subject: [PATCH 07/15] feature: Add :zip:make task to create packages dir --- pom.xml | 1 + report/build.gradle | 25 +- report/src/main/webapp/package-lock.json | 4164 +++++++++++----------- zip/build.gradle | 63 +- 4 files changed, 2143 insertions(+), 2110 deletions(-) diff --git a/pom.xml b/pom.xml index 24934109f..b46961e50 100644 --- a/pom.xml +++ b/pom.xml @@ -687,6 +687,7 @@ **/*.iml + **/build/** **/*.gradle **/.gradle/** **/gradle.properties diff --git a/report/build.gradle b/report/build.gradle index 098c52b0e..54bc0d365 100644 --- a/report/build.gradle +++ b/report/build.gradle @@ -1,5 +1,6 @@ plugins { id 'org.siouan.frontend-jdk8' version '5.0.0' + id 'distribution' } frontend { @@ -7,6 +8,24 @@ frontend { packageJsonDirectory = file('./src/main/webapp') nodeInstallDirectory = file('./src/main/webapp/node') assembleScript = 'run gulp build' - cleanScript = 'run clean' - checkScript = 'run check' -} \ No newline at end of file +} + +distributions { + main { + contents { + from('src/main/webapp') { + include 'report.html' + include 'html/index.html' + include 'app/**' + include 'assets/**' + } + includeEmptyDirs = false + eachFile { file -> + String path = file.relativePath + file.setPath(path.substring(path.indexOf("/") + 1, path.length())) + } + } + } +} + +tasks.assemble.dependsOn tasks.distZip \ No newline at end of file diff --git a/report/src/main/webapp/package-lock.json b/report/src/main/webapp/package-lock.json index ea5ad21d3..292b20aff 100644 --- a/report/src/main/webapp/package-lock.json +++ b/report/src/main/webapp/package-lock.json @@ -10,11 +10,11 @@ "integrity": "sha512-ciiioYMLdo16ShmfHBXJBOFm3xPC4AuwO4xeRpFeHz7WK9PYsWCmigagG2XyzZpubK4a3qNKoUBDhbzHfa50LQ==", "dev": true, "requires": { - "acorn": "^5.0.3", - "css": "^2.2.1", - "normalize-path": "^2.1.1", - "source-map": "^0.6.0", - "through2": "^2.0.3" + "acorn": "5.7.4", + "css": "2.2.3", + "normalize-path": "2.1.1", + "source-map": "0.6.1", + "through2": "2.0.3" }, "dependencies": { "acorn": { @@ -35,13 +35,13 @@ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "source-map": { @@ -56,7 +56,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } }, "through2": { @@ -65,8 +65,8 @@ "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "dev": true, "requires": { - "readable-stream": "^2.1.5", - "xtend": "~4.0.1" + "readable-stream": "2.3.6", + "xtend": "4.0.1" } } } @@ -77,8 +77,8 @@ "integrity": "sha1-iQrnxdjId/bThIYCFazp1+yUW9o=", "dev": true, "requires": { - "normalize-path": "^2.0.1", - "through2": "^2.0.3" + "normalize-path": "2.1.1", + "through2": "2.0.3" }, "dependencies": { "isarray": { @@ -93,13 +93,13 @@ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "string_decoder": { @@ -108,7 +108,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } }, "through2": { @@ -117,8 +117,8 @@ "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "dev": true, "requires": { - "readable-stream": "^2.1.5", - "xtend": "~4.0.1" + "readable-stream": "2.3.6", + "xtend": "4.0.1" } } } @@ -129,8 +129,8 @@ "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==", "dev": true, "requires": { - "jsonparse": "^1.2.0", - "through": ">=2.2.7 <3" + "jsonparse": "1.3.1", + "through": "2.3.8" } }, "abbrev": { @@ -145,7 +145,7 @@ "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=", "dev": true, "requires": { - "mime-types": "~2.1.18", + "mime-types": "2.1.19", "negotiator": "0.6.1" } }, @@ -167,7 +167,7 @@ "integrity": "sha512-JY+iV6r+cO21KtntVvFkD+iqjtdpRUpGqKWgfkCdZq1R+kbreEl8EcdcJR4SmiIgsIQT33s6QzheQ9a275Q8xw==", "dev": true, "requires": { - "acorn": "^5.0.3" + "acorn": "5.7.4" }, "dependencies": { "acorn": { @@ -184,10 +184,10 @@ "integrity": "sha512-rIhNEZuNI8ibQcL7ANm/mGyPukIaZsRNX9psFNQURyJW0nu6k8wjSDld20z6v2mDBWqX13pIEnk9gGZJHIlEXg==", "dev": true, "requires": { - "acorn": "^6.0.2", - "acorn-dynamic-import": "^4.0.0", - "acorn-walk": "^6.1.0", - "xtend": "^4.0.1" + "acorn": "6.4.1", + "acorn-dynamic-import": "4.0.0", + "acorn-walk": "6.1.1", + "xtend": "4.0.1" } }, "acorn-walk": { @@ -208,10 +208,10 @@ "integrity": "sha512-hOs7GfvI6tUI1LfZddH82ky6mOMyTuY0mk7kE2pWpmhhUSkumzaTO5vbVwij39MdwPQWCV4Zv57Eo06NtL/GVA==", "dev": true, "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.1" + "fast-deep-equal": "2.0.1", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.4.1", + "uri-js": "4.2.2" }, "dependencies": { "fast-deep-equal": { @@ -250,8 +250,8 @@ "resolved": "https://registry.npmjs.org/angular-amd/-/angular-amd-0.2.1.tgz", "integrity": "sha1-GJFjrXLdpxuOg55VlAqxueCN3E4=", "requires": { - "angular": "^1.4.7", - "requirejs": "^2.1.20" + "angular": "1.5.5", + "requirejs": "2.1.22" } }, "angular-ui-bootstrap": { @@ -264,7 +264,7 @@ "resolved": "https://registry.npmjs.org/angular-ui-router/-/angular-ui-router-0.2.18.tgz", "integrity": "sha1-Ha1wQVxz1wRv0uEw3wPWL7dGQ2A=", "requires": { - "angular": "^1.0.8" + "angular": "1.5.5" } }, "ansi-colors": { @@ -273,7 +273,7 @@ "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==", "dev": true, "requires": { - "ansi-wrap": "^0.1.0" + "ansi-wrap": "0.1.0" } }, "ansi-cyan": { @@ -327,8 +327,8 @@ "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", "dev": true, "requires": { - "micromatch": "^2.1.5", - "normalize-path": "^2.0.0" + "micromatch": "2.3.11", + "normalize-path": "2.1.1" } }, "aproba": { @@ -349,8 +349,8 @@ "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", "dev": true, "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" + "delegates": "1.0.0", + "readable-stream": "2.3.6" }, "dependencies": { "isarray": { @@ -365,13 +365,13 @@ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "string_decoder": { @@ -380,7 +380,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } } } @@ -391,7 +391,7 @@ "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, "requires": { - "sprintf-js": "~1.0.2" + "sprintf-js": "1.0.3" } }, "arr-diff": { @@ -400,8 +400,8 @@ "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=", "dev": true, "requires": { - "arr-flatten": "^1.0.1", - "array-slice": "^0.2.3" + "arr-flatten": "1.1.0", + "array-slice": "0.2.3" } }, "arr-flatten": { @@ -464,7 +464,7 @@ "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", "dev": true, "requires": { - "array-uniq": "^1.0.1" + "array-uniq": "1.0.3" } }, "array-uniq": { @@ -497,7 +497,7 @@ "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", "dev": true, "requires": { - "safer-buffer": "~2.1.0" + "safer-buffer": "2.1.2" } }, "asn1.js": { @@ -506,9 +506,9 @@ "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==", "dev": true, "requires": { - "bn.js": "^4.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0" + "bn.js": "4.11.8", + "inherits": "2.0.3", + "minimalistic-assert": "1.0.1" } }, "assert": { @@ -597,12 +597,12 @@ "integrity": "sha512-PLWJN3Xo/rycNkx+mp8iBDMTm3FeWe4VmYaZDSqL5QQB9sLsQkG5k8n+LNDFnhh9kdq2K+egL/icpctOmDHwig==", "dev": true, "requires": { - "browserslist": "^3.2.8", - "caniuse-lite": "^1.0.30000864", - "normalize-range": "^0.1.2", - "num2fraction": "^1.2.2", - "postcss": "^6.0.23", - "postcss-value-parser": "^3.2.3" + "browserslist": "3.2.8", + "caniuse-lite": "1.0.30000865", + "normalize-range": "0.1.2", + "num2fraction": "1.2.2", + "postcss": "6.0.23", + "postcss-value-parser": "3.3.0" } }, "aws-sign2": { @@ -623,8 +623,8 @@ "integrity": "sha1-LY4+XQvb1zJ/kbyBT1xXZg+Bgk0=", "dev": true, "requires": { - "follow-redirects": "^1.2.5", - "is-buffer": "^1.1.5" + "follow-redirects": "1.5.1", + "is-buffer": "1.1.6" } }, "babel-code-frame": { @@ -633,9 +633,9 @@ "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", "dev": true, "requires": { - "chalk": "^1.1.3", - "esutils": "^2.0.2", - "js-tokens": "^3.0.2" + "chalk": "1.1.3", + "esutils": "2.0.2", + "js-tokens": "3.0.2" } }, "babel-core": { @@ -644,25 +644,25 @@ "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==", "dev": true, "requires": { - "babel-code-frame": "^6.26.0", - "babel-generator": "^6.26.0", - "babel-helpers": "^6.24.1", - "babel-messages": "^6.23.0", - "babel-register": "^6.26.0", - "babel-runtime": "^6.26.0", - "babel-template": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "convert-source-map": "^1.5.1", - "debug": "^2.6.9", - "json5": "^0.5.1", - "lodash": "^4.17.4", - "minimatch": "^3.0.4", - "path-is-absolute": "^1.0.1", - "private": "^0.1.8", - "slash": "^1.0.0", - "source-map": "^0.5.7" + "babel-code-frame": "6.26.0", + "babel-generator": "6.26.1", + "babel-helpers": "6.24.1", + "babel-messages": "6.23.0", + "babel-register": "6.26.0", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "convert-source-map": "1.5.1", + "debug": "2.6.9", + "json5": "0.5.1", + "lodash": "4.17.19", + "minimatch": "3.0.4", + "path-is-absolute": "1.0.1", + "private": "0.1.8", + "slash": "1.0.0", + "source-map": "0.5.7" }, "dependencies": { "source-map": { @@ -679,14 +679,14 @@ "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", "dev": true, "requires": { - "babel-messages": "^6.23.0", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "detect-indent": "^4.0.0", - "jsesc": "^1.3.0", - "lodash": "^4.17.4", - "source-map": "^0.5.7", - "trim-right": "^1.0.1" + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "detect-indent": "4.0.0", + "jsesc": "1.3.0", + "lodash": "4.17.19", + "source-map": "0.5.7", + "trim-right": "1.0.1" }, "dependencies": { "source-map": { @@ -703,9 +703,9 @@ "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=", "dev": true, "requires": { - "babel-helper-explode-assignable-expression": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" + "babel-helper-explode-assignable-expression": "6.24.1", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" } }, "babel-helper-call-delegate": { @@ -714,10 +714,10 @@ "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=", "dev": true, "requires": { - "babel-helper-hoist-variables": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" + "babel-helper-hoist-variables": "6.24.1", + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" } }, "babel-helper-define-map": { @@ -726,10 +726,10 @@ "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=", "dev": true, "requires": { - "babel-helper-function-name": "^6.24.1", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "lodash": "^4.17.4" + "babel-helper-function-name": "6.24.1", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "lodash": "4.17.19" } }, "babel-helper-explode-assignable-expression": { @@ -738,9 +738,9 @@ "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=", "dev": true, "requires": { - "babel-runtime": "^6.22.0", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" } }, "babel-helper-function-name": { @@ -749,11 +749,11 @@ "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=", "dev": true, "requires": { - "babel-helper-get-function-arity": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" + "babel-helper-get-function-arity": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" } }, "babel-helper-get-function-arity": { @@ -762,8 +762,8 @@ "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=", "dev": true, "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" } }, "babel-helper-hoist-variables": { @@ -772,8 +772,8 @@ "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=", "dev": true, "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" } }, "babel-helper-optimise-call-expression": { @@ -782,8 +782,8 @@ "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=", "dev": true, "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" } }, "babel-helper-regex": { @@ -792,9 +792,9 @@ "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=", "dev": true, "requires": { - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "lodash": "^4.17.4" + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "lodash": "4.17.19" } }, "babel-helper-remap-async-to-generator": { @@ -803,11 +803,11 @@ "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=", "dev": true, "requires": { - "babel-helper-function-name": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" + "babel-helper-function-name": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" } }, "babel-helper-replace-supers": { @@ -816,12 +816,12 @@ "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=", "dev": true, "requires": { - "babel-helper-optimise-call-expression": "^6.24.1", - "babel-messages": "^6.23.0", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" + "babel-helper-optimise-call-expression": "6.24.1", + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" } }, "babel-helpers": { @@ -830,8 +830,8 @@ "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=", "dev": true, "requires": { - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" + "babel-runtime": "6.26.0", + "babel-template": "6.26.0" } }, "babel-loader": { @@ -840,9 +840,9 @@ "integrity": "sha512-iCHfbieL5d1LfOQeeVJEUyD9rTwBcP/fcEbRCfempxTDuqrKpu0AZjLAQHEQa3Yqyj9ORKe2iHfoj4rHLf7xpw==", "dev": true, "requires": { - "find-cache-dir": "^1.0.0", - "loader-utils": "^1.0.2", - "mkdirp": "^0.5.1" + "find-cache-dir": "1.0.0", + "loader-utils": "1.1.0", + "mkdirp": "0.5.1" } }, "babel-messages": { @@ -851,7 +851,7 @@ "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", "dev": true, "requires": { - "babel-runtime": "^6.22.0" + "babel-runtime": "6.26.0" } }, "babel-plugin-check-es2015-constants": { @@ -860,7 +860,7 @@ "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=", "dev": true, "requires": { - "babel-runtime": "^6.22.0" + "babel-runtime": "6.26.0" } }, "babel-plugin-syntax-async-functions": { @@ -887,9 +887,9 @@ "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=", "dev": true, "requires": { - "babel-helper-remap-async-to-generator": "^6.24.1", - "babel-plugin-syntax-async-functions": "^6.8.0", - "babel-runtime": "^6.22.0" + "babel-helper-remap-async-to-generator": "6.24.1", + "babel-plugin-syntax-async-functions": "6.13.0", + "babel-runtime": "6.26.0" } }, "babel-plugin-transform-es2015-arrow-functions": { @@ -898,7 +898,7 @@ "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=", "dev": true, "requires": { - "babel-runtime": "^6.22.0" + "babel-runtime": "6.26.0" } }, "babel-plugin-transform-es2015-block-scoped-functions": { @@ -907,7 +907,7 @@ "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=", "dev": true, "requires": { - "babel-runtime": "^6.22.0" + "babel-runtime": "6.26.0" } }, "babel-plugin-transform-es2015-block-scoping": { @@ -916,11 +916,11 @@ "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=", "dev": true, "requires": { - "babel-runtime": "^6.26.0", - "babel-template": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "lodash": "^4.17.4" + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "lodash": "4.17.19" } }, "babel-plugin-transform-es2015-classes": { @@ -929,15 +929,15 @@ "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=", "dev": true, "requires": { - "babel-helper-define-map": "^6.24.1", - "babel-helper-function-name": "^6.24.1", - "babel-helper-optimise-call-expression": "^6.24.1", - "babel-helper-replace-supers": "^6.24.1", - "babel-messages": "^6.23.0", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" + "babel-helper-define-map": "6.26.0", + "babel-helper-function-name": "6.24.1", + "babel-helper-optimise-call-expression": "6.24.1", + "babel-helper-replace-supers": "6.24.1", + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" } }, "babel-plugin-transform-es2015-computed-properties": { @@ -946,8 +946,8 @@ "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=", "dev": true, "requires": { - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" + "babel-runtime": "6.26.0", + "babel-template": "6.26.0" } }, "babel-plugin-transform-es2015-destructuring": { @@ -956,7 +956,7 @@ "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=", "dev": true, "requires": { - "babel-runtime": "^6.22.0" + "babel-runtime": "6.26.0" } }, "babel-plugin-transform-es2015-duplicate-keys": { @@ -965,8 +965,8 @@ "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=", "dev": true, "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" } }, "babel-plugin-transform-es2015-for-of": { @@ -975,7 +975,7 @@ "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=", "dev": true, "requires": { - "babel-runtime": "^6.22.0" + "babel-runtime": "6.26.0" } }, "babel-plugin-transform-es2015-function-name": { @@ -984,9 +984,9 @@ "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=", "dev": true, "requires": { - "babel-helper-function-name": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" + "babel-helper-function-name": "6.24.1", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" } }, "babel-plugin-transform-es2015-literals": { @@ -995,7 +995,7 @@ "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=", "dev": true, "requires": { - "babel-runtime": "^6.22.0" + "babel-runtime": "6.26.0" } }, "babel-plugin-transform-es2015-modules-amd": { @@ -1004,9 +1004,9 @@ "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=", "dev": true, "requires": { - "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" + "babel-plugin-transform-es2015-modules-commonjs": "6.26.2", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0" } }, "babel-plugin-transform-es2015-modules-commonjs": { @@ -1015,10 +1015,10 @@ "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==", "dev": true, "requires": { - "babel-plugin-transform-strict-mode": "^6.24.1", - "babel-runtime": "^6.26.0", - "babel-template": "^6.26.0", - "babel-types": "^6.26.0" + "babel-plugin-transform-strict-mode": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-types": "6.26.0" } }, "babel-plugin-transform-es2015-modules-systemjs": { @@ -1027,9 +1027,9 @@ "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=", "dev": true, "requires": { - "babel-helper-hoist-variables": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" + "babel-helper-hoist-variables": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0" } }, "babel-plugin-transform-es2015-modules-umd": { @@ -1038,9 +1038,9 @@ "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=", "dev": true, "requires": { - "babel-plugin-transform-es2015-modules-amd": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" + "babel-plugin-transform-es2015-modules-amd": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0" } }, "babel-plugin-transform-es2015-object-super": { @@ -1049,8 +1049,8 @@ "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=", "dev": true, "requires": { - "babel-helper-replace-supers": "^6.24.1", - "babel-runtime": "^6.22.0" + "babel-helper-replace-supers": "6.24.1", + "babel-runtime": "6.26.0" } }, "babel-plugin-transform-es2015-parameters": { @@ -1059,12 +1059,12 @@ "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=", "dev": true, "requires": { - "babel-helper-call-delegate": "^6.24.1", - "babel-helper-get-function-arity": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" + "babel-helper-call-delegate": "6.24.1", + "babel-helper-get-function-arity": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" } }, "babel-plugin-transform-es2015-shorthand-properties": { @@ -1073,8 +1073,8 @@ "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=", "dev": true, "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" } }, "babel-plugin-transform-es2015-spread": { @@ -1083,7 +1083,7 @@ "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=", "dev": true, "requires": { - "babel-runtime": "^6.22.0" + "babel-runtime": "6.26.0" } }, "babel-plugin-transform-es2015-sticky-regex": { @@ -1092,9 +1092,9 @@ "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=", "dev": true, "requires": { - "babel-helper-regex": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" + "babel-helper-regex": "6.26.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" } }, "babel-plugin-transform-es2015-template-literals": { @@ -1103,7 +1103,7 @@ "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=", "dev": true, "requires": { - "babel-runtime": "^6.22.0" + "babel-runtime": "6.26.0" } }, "babel-plugin-transform-es2015-typeof-symbol": { @@ -1112,7 +1112,7 @@ "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=", "dev": true, "requires": { - "babel-runtime": "^6.22.0" + "babel-runtime": "6.26.0" } }, "babel-plugin-transform-es2015-unicode-regex": { @@ -1121,9 +1121,9 @@ "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=", "dev": true, "requires": { - "babel-helper-regex": "^6.24.1", - "babel-runtime": "^6.22.0", - "regexpu-core": "^2.0.0" + "babel-helper-regex": "6.26.0", + "babel-runtime": "6.26.0", + "regexpu-core": "2.0.0" } }, "babel-plugin-transform-exponentiation-operator": { @@ -1132,9 +1132,9 @@ "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=", "dev": true, "requires": { - "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1", - "babel-plugin-syntax-exponentiation-operator": "^6.8.0", - "babel-runtime": "^6.22.0" + "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1", + "babel-plugin-syntax-exponentiation-operator": "6.13.0", + "babel-runtime": "6.26.0" } }, "babel-plugin-transform-regenerator": { @@ -1143,7 +1143,7 @@ "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=", "dev": true, "requires": { - "regenerator-transform": "^0.10.0" + "regenerator-transform": "0.10.1" } }, "babel-plugin-transform-strict-mode": { @@ -1152,8 +1152,8 @@ "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=", "dev": true, "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" } }, "babel-preset-env": { @@ -1162,36 +1162,36 @@ "integrity": "sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==", "dev": true, "requires": { - "babel-plugin-check-es2015-constants": "^6.22.0", - "babel-plugin-syntax-trailing-function-commas": "^6.22.0", - "babel-plugin-transform-async-to-generator": "^6.22.0", - "babel-plugin-transform-es2015-arrow-functions": "^6.22.0", - "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0", - "babel-plugin-transform-es2015-block-scoping": "^6.23.0", - "babel-plugin-transform-es2015-classes": "^6.23.0", - "babel-plugin-transform-es2015-computed-properties": "^6.22.0", - "babel-plugin-transform-es2015-destructuring": "^6.23.0", - "babel-plugin-transform-es2015-duplicate-keys": "^6.22.0", - "babel-plugin-transform-es2015-for-of": "^6.23.0", - "babel-plugin-transform-es2015-function-name": "^6.22.0", - "babel-plugin-transform-es2015-literals": "^6.22.0", - "babel-plugin-transform-es2015-modules-amd": "^6.22.0", - "babel-plugin-transform-es2015-modules-commonjs": "^6.23.0", - "babel-plugin-transform-es2015-modules-systemjs": "^6.23.0", - "babel-plugin-transform-es2015-modules-umd": "^6.23.0", - "babel-plugin-transform-es2015-object-super": "^6.22.0", - "babel-plugin-transform-es2015-parameters": "^6.23.0", - "babel-plugin-transform-es2015-shorthand-properties": "^6.22.0", - "babel-plugin-transform-es2015-spread": "^6.22.0", - "babel-plugin-transform-es2015-sticky-regex": "^6.22.0", - "babel-plugin-transform-es2015-template-literals": "^6.22.0", - "babel-plugin-transform-es2015-typeof-symbol": "^6.23.0", - "babel-plugin-transform-es2015-unicode-regex": "^6.22.0", - "babel-plugin-transform-exponentiation-operator": "^6.22.0", - "babel-plugin-transform-regenerator": "^6.22.0", - "browserslist": "^3.2.6", - "invariant": "^2.2.2", - "semver": "^5.3.0" + "babel-plugin-check-es2015-constants": "6.22.0", + "babel-plugin-syntax-trailing-function-commas": "6.22.0", + "babel-plugin-transform-async-to-generator": "6.24.1", + "babel-plugin-transform-es2015-arrow-functions": "6.22.0", + "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0", + "babel-plugin-transform-es2015-block-scoping": "6.26.0", + "babel-plugin-transform-es2015-classes": "6.24.1", + "babel-plugin-transform-es2015-computed-properties": "6.24.1", + "babel-plugin-transform-es2015-destructuring": "6.23.0", + "babel-plugin-transform-es2015-duplicate-keys": "6.24.1", + "babel-plugin-transform-es2015-for-of": "6.23.0", + "babel-plugin-transform-es2015-function-name": "6.24.1", + "babel-plugin-transform-es2015-literals": "6.22.0", + "babel-plugin-transform-es2015-modules-amd": "6.24.1", + "babel-plugin-transform-es2015-modules-commonjs": "6.26.2", + "babel-plugin-transform-es2015-modules-systemjs": "6.24.1", + "babel-plugin-transform-es2015-modules-umd": "6.24.1", + "babel-plugin-transform-es2015-object-super": "6.24.1", + "babel-plugin-transform-es2015-parameters": "6.24.1", + "babel-plugin-transform-es2015-shorthand-properties": "6.24.1", + "babel-plugin-transform-es2015-spread": "6.22.0", + "babel-plugin-transform-es2015-sticky-regex": "6.24.1", + "babel-plugin-transform-es2015-template-literals": "6.22.0", + "babel-plugin-transform-es2015-typeof-symbol": "6.23.0", + "babel-plugin-transform-es2015-unicode-regex": "6.24.1", + "babel-plugin-transform-exponentiation-operator": "6.24.1", + "babel-plugin-transform-regenerator": "6.26.0", + "browserslist": "3.2.8", + "invariant": "2.2.4", + "semver": "5.5.0" } }, "babel-preset-es2015": { @@ -1200,30 +1200,30 @@ "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=", "dev": true, "requires": { - "babel-plugin-check-es2015-constants": "^6.22.0", - "babel-plugin-transform-es2015-arrow-functions": "^6.22.0", - "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0", - "babel-plugin-transform-es2015-block-scoping": "^6.24.1", - "babel-plugin-transform-es2015-classes": "^6.24.1", - "babel-plugin-transform-es2015-computed-properties": "^6.24.1", - "babel-plugin-transform-es2015-destructuring": "^6.22.0", - "babel-plugin-transform-es2015-duplicate-keys": "^6.24.1", - "babel-plugin-transform-es2015-for-of": "^6.22.0", - "babel-plugin-transform-es2015-function-name": "^6.24.1", - "babel-plugin-transform-es2015-literals": "^6.22.0", - "babel-plugin-transform-es2015-modules-amd": "^6.24.1", - "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1", - "babel-plugin-transform-es2015-modules-systemjs": "^6.24.1", - "babel-plugin-transform-es2015-modules-umd": "^6.24.1", - "babel-plugin-transform-es2015-object-super": "^6.24.1", - "babel-plugin-transform-es2015-parameters": "^6.24.1", - "babel-plugin-transform-es2015-shorthand-properties": "^6.24.1", - "babel-plugin-transform-es2015-spread": "^6.22.0", - "babel-plugin-transform-es2015-sticky-regex": "^6.24.1", - "babel-plugin-transform-es2015-template-literals": "^6.22.0", - "babel-plugin-transform-es2015-typeof-symbol": "^6.22.0", - "babel-plugin-transform-es2015-unicode-regex": "^6.24.1", - "babel-plugin-transform-regenerator": "^6.24.1" + "babel-plugin-check-es2015-constants": "6.22.0", + "babel-plugin-transform-es2015-arrow-functions": "6.22.0", + "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0", + "babel-plugin-transform-es2015-block-scoping": "6.26.0", + "babel-plugin-transform-es2015-classes": "6.24.1", + "babel-plugin-transform-es2015-computed-properties": "6.24.1", + "babel-plugin-transform-es2015-destructuring": "6.23.0", + "babel-plugin-transform-es2015-duplicate-keys": "6.24.1", + "babel-plugin-transform-es2015-for-of": "6.23.0", + "babel-plugin-transform-es2015-function-name": "6.24.1", + "babel-plugin-transform-es2015-literals": "6.22.0", + "babel-plugin-transform-es2015-modules-amd": "6.24.1", + "babel-plugin-transform-es2015-modules-commonjs": "6.26.2", + "babel-plugin-transform-es2015-modules-systemjs": "6.24.1", + "babel-plugin-transform-es2015-modules-umd": "6.24.1", + "babel-plugin-transform-es2015-object-super": "6.24.1", + "babel-plugin-transform-es2015-parameters": "6.24.1", + "babel-plugin-transform-es2015-shorthand-properties": "6.24.1", + "babel-plugin-transform-es2015-spread": "6.22.0", + "babel-plugin-transform-es2015-sticky-regex": "6.24.1", + "babel-plugin-transform-es2015-template-literals": "6.22.0", + "babel-plugin-transform-es2015-typeof-symbol": "6.23.0", + "babel-plugin-transform-es2015-unicode-regex": "6.24.1", + "babel-plugin-transform-regenerator": "6.26.0" } }, "babel-register": { @@ -1232,13 +1232,13 @@ "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=", "dev": true, "requires": { - "babel-core": "^6.26.0", - "babel-runtime": "^6.26.0", - "core-js": "^2.5.0", - "home-or-tmp": "^2.0.0", - "lodash": "^4.17.4", - "mkdirp": "^0.5.1", - "source-map-support": "^0.4.15" + "babel-core": "6.26.3", + "babel-runtime": "6.26.0", + "core-js": "2.5.7", + "home-or-tmp": "2.0.0", + "lodash": "4.17.19", + "mkdirp": "0.5.1", + "source-map-support": "0.4.18" } }, "babel-runtime": { @@ -1247,8 +1247,8 @@ "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "dev": true, "requires": { - "core-js": "^2.4.0", - "regenerator-runtime": "^0.11.0" + "core-js": "2.5.7", + "regenerator-runtime": "0.11.1" } }, "babel-template": { @@ -1257,11 +1257,11 @@ "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", "dev": true, "requires": { - "babel-runtime": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "lodash": "^4.17.4" + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "lodash": "4.17.19" } }, "babel-traverse": { @@ -1270,15 +1270,15 @@ "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", "dev": true, "requires": { - "babel-code-frame": "^6.26.0", - "babel-messages": "^6.23.0", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "debug": "^2.6.8", - "globals": "^9.18.0", - "invariant": "^2.2.2", - "lodash": "^4.17.4" + "babel-code-frame": "6.26.0", + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "debug": "2.6.9", + "globals": "9.18.0", + "invariant": "2.2.4", + "lodash": "4.17.19" } }, "babel-types": { @@ -1287,10 +1287,10 @@ "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", "dev": true, "requires": { - "babel-runtime": "^6.26.0", - "esutils": "^2.0.2", - "lodash": "^4.17.4", - "to-fast-properties": "^1.0.3" + "babel-runtime": "6.26.0", + "esutils": "2.0.2", + "lodash": "4.17.19", + "to-fast-properties": "1.0.3" } }, "babelify": { @@ -1323,13 +1323,13 @@ "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", "dev": true, "requires": { - "cache-base": "^1.0.1", - "class-utils": "^0.3.5", - "component-emitter": "^1.2.1", - "define-property": "^1.0.0", - "isobject": "^3.0.1", - "mixin-deep": "^1.2.0", - "pascalcase": "^0.1.1" + "cache-base": "1.0.1", + "class-utils": "0.3.6", + "component-emitter": "1.2.1", + "define-property": "1.0.0", + "isobject": "3.0.1", + "mixin-deep": "1.3.2", + "pascalcase": "0.1.1" }, "dependencies": { "define-property": { @@ -1338,7 +1338,7 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "is-descriptor": "^1.0.0" + "is-descriptor": "1.0.2" } }, "is-accessor-descriptor": { @@ -1347,7 +1347,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.3" } }, "is-data-descriptor": { @@ -1356,7 +1356,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.3" } }, "is-descriptor": { @@ -1365,9 +1365,9 @@ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.3" } }, "isobject": { @@ -1414,7 +1414,7 @@ "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", "dev": true, "requires": { - "tweetnacl": "^0.14.3" + "tweetnacl": "0.14.5" } }, "beeper": { @@ -1450,8 +1450,8 @@ "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==", "dev": true, "requires": { - "readable-stream": "^2.3.5", - "safe-buffer": "^5.1.1" + "readable-stream": "2.3.6", + "safe-buffer": "5.1.2" }, "dependencies": { "isarray": { @@ -1466,13 +1466,13 @@ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "string_decoder": { @@ -1481,7 +1481,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } } } @@ -1498,7 +1498,7 @@ "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", "dev": true, "requires": { - "inherits": "~2.0.0" + "inherits": "2.0.3" } }, "bn.js": { @@ -1520,7 +1520,7 @@ "on-finished": "2.1.0", "qs": "2.2.4", "raw-body": "1.3.0", - "type-is": "~1.5.1" + "type-is": "1.5.7" }, "dependencies": { "bytes": { @@ -1568,7 +1568,7 @@ "integrity": "sha1-l4IwoValVI9C7vFN4i0PT2EAg9E=", "dev": true, "requires": { - "bytes": "1", + "bytes": "1.0.0", "iconv-lite": "0.4.4" } } @@ -1585,7 +1585,7 @@ "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=", "dev": true, "requires": { - "balanced-match": "^1.0.0", + "balanced-match": "1.0.0", "concat-map": "0.0.1" } }, @@ -1595,9 +1595,9 @@ "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", "dev": true, "requires": { - "expand-range": "^1.8.1", - "preserve": "^0.2.0", - "repeat-element": "^1.1.2" + "expand-range": "1.8.2", + "preserve": "0.2.0", + "repeat-element": "1.1.2" } }, "brorand": { @@ -1612,12 +1612,12 @@ "integrity": "sha512-erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA==", "dev": true, "requires": { - "JSONStream": "^1.0.3", - "combine-source-map": "~0.8.0", - "defined": "^1.0.0", - "safe-buffer": "^5.1.1", - "through2": "^2.0.0", - "umd": "^3.0.0" + "JSONStream": "1.3.5", + "combine-source-map": "0.8.0", + "defined": "1.0.0", + "safe-buffer": "5.1.2", + "through2": "2.0.5", + "umd": "3.0.3" }, "dependencies": { "isarray": { @@ -1632,13 +1632,13 @@ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "string_decoder": { @@ -1647,7 +1647,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } }, "through2": { @@ -1656,8 +1656,8 @@ "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", "dev": true, "requires": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" + "readable-stream": "2.3.6", + "xtend": "4.0.1" } } } @@ -1685,16 +1685,16 @@ "integrity": "sha512-3cVW8Ft3sPQ1t9gqZXBDZhTyRce8NW4wf5KzpCYcg6fWjPbyt+vZLvEo+sTq7c7eNQhi8lInQWbjIFEpoM2f7Q==", "dev": true, "requires": { - "browser-sync-ui": "v1.0.1", + "browser-sync-ui": "1.0.1", "bs-recipes": "1.3.4", "chokidar": "1.7.0", "connect": "3.6.6", - "connect-history-api-fallback": "^1.5.0", - "dev-ip": "^1.0.1", + "connect-history-api-fallback": "1.5.0", + "dev-ip": "1.0.1", "easy-extender": "2.3.2", "eazy-logger": "3.0.2", - "etag": "^1.8.1", - "fresh": "^0.5.2", + "etag": "1.8.1", + "fresh": "0.5.2", "fs-extra": "3.0.1", "http-proxy": "1.15.2", "immutable": "3.8.2", @@ -1703,7 +1703,7 @@ "opn": "4.0.2", "portscanner": "2.1.1", "qs": "6.2.3", - "raw-body": "^2.3.2", + "raw-body": "2.3.3", "resp-modifier": "6.0.2", "rx": "4.1.0", "serve-index": "1.9.1", @@ -1721,11 +1721,11 @@ "dev": true, "requires": { "async-each-series": "0.1.1", - "connect-history-api-fallback": "^1.1.0", - "immutable": "^3.7.6", + "connect-history-api-fallback": "1.5.0", + "immutable": "3.8.2", "server-destroy": "1.0.1", "socket.io-client": "2.0.4", - "stream-throttle": "^0.1.3" + "stream-throttle": "0.1.3" } }, "browserify": { @@ -1734,54 +1734,54 @@ "integrity": "sha512-zQt/Gd1+W+IY+h/xX2NYMW4orQWhqSwyV+xsblycTtpOuB27h1fZhhNQuipJ4t79ohw4P4mMem0jp/ZkISQtjQ==", "dev": true, "requires": { - "JSONStream": "^1.0.3", - "assert": "^1.4.0", - "browser-pack": "^6.0.1", - "browser-resolve": "^1.11.0", - "browserify-zlib": "~0.2.0", - "buffer": "^5.0.2", - "cached-path-relative": "^1.0.0", - "concat-stream": "^1.6.0", - "console-browserify": "^1.1.0", - "constants-browserify": "~1.0.0", - "crypto-browserify": "^3.0.0", - "defined": "^1.0.0", - "deps-sort": "^2.0.0", - "domain-browser": "^1.2.0", - "duplexer2": "~0.1.2", - "events": "^2.0.0", - "glob": "^7.1.0", - "has": "^1.0.0", - "htmlescape": "^1.1.0", - "https-browserify": "^1.0.0", - "inherits": "~2.0.1", - "insert-module-globals": "^7.0.0", - "labeled-stream-splicer": "^2.0.0", - "mkdirp": "^0.5.0", - "module-deps": "^6.0.0", - "os-browserify": "~0.3.0", - "parents": "^1.0.1", - "path-browserify": "~0.0.0", - "process": "~0.11.0", - "punycode": "^1.3.2", - "querystring-es3": "~0.2.0", - "read-only-stream": "^2.0.0", - "readable-stream": "^2.0.2", - "resolve": "^1.1.4", - "shasum": "^1.0.0", - "shell-quote": "^1.6.1", - "stream-browserify": "^2.0.0", - "stream-http": "^2.0.0", - "string_decoder": "^1.1.1", - "subarg": "^1.0.0", - "syntax-error": "^1.1.1", - "through2": "^2.0.0", - "timers-browserify": "^1.0.1", + "JSONStream": "1.3.5", + "assert": "1.4.1", + "browser-pack": "6.1.0", + "browser-resolve": "1.11.3", + "browserify-zlib": "0.2.0", + "buffer": "5.2.1", + "cached-path-relative": "1.0.2", + "concat-stream": "1.6.2", + "console-browserify": "1.1.0", + "constants-browserify": "1.0.0", + "crypto-browserify": "3.12.0", + "defined": "1.0.0", + "deps-sort": "2.0.0", + "domain-browser": "1.2.0", + "duplexer2": "0.1.4", + "events": "2.1.0", + "glob": "7.1.2", + "has": "1.0.3", + "htmlescape": "1.1.1", + "https-browserify": "1.0.0", + "inherits": "2.0.3", + "insert-module-globals": "7.2.0", + "labeled-stream-splicer": "2.0.1", + "mkdirp": "0.5.1", + "module-deps": "6.2.0", + "os-browserify": "0.3.0", + "parents": "1.0.1", + "path-browserify": "0.0.1", + "process": "0.11.10", + "punycode": "1.4.1", + "querystring-es3": "0.2.1", + "read-only-stream": "2.0.0", + "readable-stream": "2.3.6", + "resolve": "1.8.1", + "shasum": "1.0.2", + "shell-quote": "1.6.1", + "stream-browserify": "2.0.2", + "stream-http": "2.8.3", + "string_decoder": "1.2.0", + "subarg": "1.0.0", + "syntax-error": "1.4.0", + "through2": "2.0.5", + "timers-browserify": "1.4.2", "tty-browserify": "0.0.1", - "url": "~0.11.0", - "util": "~0.10.1", - "vm-browserify": "^1.0.0", - "xtend": "^4.0.0" + "url": "0.11.0", + "util": "0.10.4", + "vm-browserify": "1.1.0", + "xtend": "4.0.1" }, "dependencies": { "isarray": { @@ -1796,13 +1796,13 @@ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" }, "dependencies": { "string_decoder": { @@ -1811,7 +1811,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } } } @@ -1822,7 +1822,7 @@ "integrity": "sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==", "dev": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } }, "through2": { @@ -1831,8 +1831,8 @@ "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", "dev": true, "requires": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" + "readable-stream": "2.3.6", + "xtend": "4.0.1" } } } @@ -1843,12 +1843,12 @@ "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", "dev": true, "requires": { - "buffer-xor": "^1.0.3", - "cipher-base": "^1.0.0", - "create-hash": "^1.1.0", - "evp_bytestokey": "^1.0.3", - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" + "buffer-xor": "1.0.3", + "cipher-base": "1.0.4", + "create-hash": "1.2.0", + "evp_bytestokey": "1.0.3", + "inherits": "2.0.3", + "safe-buffer": "5.1.2" } }, "browserify-cipher": { @@ -1857,9 +1857,9 @@ "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==", "dev": true, "requires": { - "browserify-aes": "^1.0.4", - "browserify-des": "^1.0.0", - "evp_bytestokey": "^1.0.0" + "browserify-aes": "1.2.0", + "browserify-des": "1.0.2", + "evp_bytestokey": "1.0.3" } }, "browserify-des": { @@ -1868,10 +1868,10 @@ "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==", "dev": true, "requires": { - "cipher-base": "^1.0.1", - "des.js": "^1.0.0", - "inherits": "^2.0.1", - "safe-buffer": "^5.1.2" + "cipher-base": "1.0.4", + "des.js": "1.0.0", + "inherits": "2.0.3", + "safe-buffer": "5.1.2" } }, "browserify-rsa": { @@ -1880,8 +1880,8 @@ "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", "dev": true, "requires": { - "bn.js": "^4.1.0", - "randombytes": "^2.0.1" + "bn.js": "4.11.8", + "randombytes": "2.0.6" } }, "browserify-sign": { @@ -1890,13 +1890,13 @@ "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=", "dev": true, "requires": { - "bn.js": "^4.1.1", - "browserify-rsa": "^4.0.0", - "create-hash": "^1.1.0", - "create-hmac": "^1.1.2", - "elliptic": "^6.0.0", - "inherits": "^2.0.1", - "parse-asn1": "^5.0.0" + "bn.js": "4.11.8", + "browserify-rsa": "4.0.1", + "create-hash": "1.2.0", + "create-hmac": "1.1.7", + "elliptic": "6.5.3", + "inherits": "2.0.3", + "parse-asn1": "5.1.3" } }, "browserify-zlib": { @@ -1905,7 +1905,7 @@ "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", "dev": true, "requires": { - "pako": "~1.0.5" + "pako": "1.0.8" } }, "browserslist": { @@ -1914,8 +1914,8 @@ "integrity": "sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30000844", - "electron-to-chromium": "^1.3.47" + "caniuse-lite": "1.0.30000865", + "electron-to-chromium": "1.3.52" } }, "bs-recipes": { @@ -1930,8 +1930,8 @@ "integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==", "dev": true, "requires": { - "base64-js": "^1.0.2", - "ieee754": "^1.1.4" + "base64-js": "1.3.0", + "ieee754": "1.1.12" } }, "buffer-from": { @@ -1970,15 +1970,15 @@ "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", "dev": true, "requires": { - "collection-visit": "^1.0.0", - "component-emitter": "^1.2.1", - "get-value": "^2.0.6", - "has-value": "^1.0.0", - "isobject": "^3.0.1", - "set-value": "^2.0.0", - "to-object-path": "^0.3.0", - "union-value": "^1.0.0", - "unset-value": "^1.0.0" + "collection-visit": "1.0.0", + "component-emitter": "1.2.1", + "get-value": "2.0.6", + "has-value": "1.0.0", + "isobject": "3.0.1", + "set-value": "2.0.1", + "to-object-path": "0.3.0", + "union-value": "1.0.1", + "unset-value": "1.0.0" }, "dependencies": { "isobject": { @@ -2001,7 +2001,7 @@ "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=", "dev": true, "requires": { - "callsites": "^0.2.0" + "callsites": "0.2.0" } }, "callsite": { @@ -2028,8 +2028,8 @@ "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "dev": true, "requires": { - "camelcase": "^2.0.0", - "map-obj": "^1.0.0" + "camelcase": "2.1.1", + "map-obj": "1.0.1" }, "dependencies": { "camelcase": { @@ -2058,11 +2058,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" } }, "chardet": { @@ -2077,15 +2077,15 @@ "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", "dev": true, "requires": { - "anymatch": "^1.3.0", - "async-each": "^1.0.0", - "fsevents": "^1.0.0", - "glob-parent": "^2.0.0", - "inherits": "^2.0.1", - "is-binary-path": "^1.0.0", - "is-glob": "^2.0.0", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.0.0" + "anymatch": "1.3.2", + "async-each": "1.0.1", + "fsevents": "1.2.7", + "glob-parent": "2.0.0", + "inherits": "2.0.3", + "is-binary-path": "1.0.1", + "is-glob": "2.0.1", + "path-is-absolute": "1.0.1", + "readdirp": "2.1.0" } }, "cipher-base": { @@ -2094,8 +2094,8 @@ "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", "dev": true, "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" + "inherits": "2.0.3", + "safe-buffer": "5.1.2" } }, "circular-json": { @@ -2110,10 +2110,10 @@ "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", "dev": true, "requires": { - "arr-union": "^3.1.0", - "define-property": "^0.2.5", - "isobject": "^3.0.0", - "static-extend": "^0.1.1" + "arr-union": "3.1.0", + "define-property": "0.2.5", + "isobject": "3.0.1", + "static-extend": "0.1.2" }, "dependencies": { "arr-union": { @@ -2128,7 +2128,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } }, "isobject": { @@ -2145,7 +2145,7 @@ "integrity": "sha1-Ls3xRaujj1R0DybO/Q/z4D4SXWo=", "dev": true, "requires": { - "source-map": "0.5.x" + "source-map": "0.5.7" }, "dependencies": { "source-map": { @@ -2163,7 +2163,7 @@ "dev": true, "requires": { "exit": "0.1.2", - "glob": "^7.1.1" + "glob": "7.1.2" } }, "cli-table": { @@ -2181,9 +2181,9 @@ "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", "dev": true, "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wrap-ansi": "^2.0.0" + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wrap-ansi": "2.1.0" } }, "clone": { @@ -2210,9 +2210,9 @@ "integrity": "sha512-Bq6+4t+lbM8vhTs/Bef5c5AdEMtapp/iFb6+s4/Hh9MVTt8OLKH7ZOOZSCT+Ys7hsHvqv0GuMPJ1lnQJVHvxpg==", "dev": true, "requires": { - "inherits": "^2.0.1", - "process-nextick-args": "^2.0.0", - "readable-stream": "^2.3.5" + "inherits": "2.0.3", + "process-nextick-args": "2.0.0", + "readable-stream": "2.3.6" }, "dependencies": { "isarray": { @@ -2227,13 +2227,13 @@ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "string_decoder": { @@ -2242,7 +2242,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } } } @@ -2265,8 +2265,8 @@ "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", "dev": true, "requires": { - "map-visit": "^1.0.0", - "object-visit": "^1.0.0" + "map-visit": "1.0.0", + "object-visit": "1.0.1" } }, "color-convert": { @@ -2302,10 +2302,10 @@ "integrity": "sha1-pY0N8ELBhvz4IqjoAV9UUNLXmos=", "dev": true, "requires": { - "convert-source-map": "~1.1.0", - "inline-source-map": "~0.6.0", - "lodash.memoize": "~3.0.3", - "source-map": "~0.5.3" + "convert-source-map": "1.1.3", + "inline-source-map": "0.6.2", + "lodash.memoize": "3.0.4", + "source-map": "0.5.7" }, "dependencies": { "convert-source-map": { @@ -2328,7 +2328,7 @@ "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==", "dev": true, "requires": { - "delayed-stream": "~1.0.0" + "delayed-stream": "1.0.0" } }, "commander": { @@ -2373,10 +2373,10 @@ "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", "dev": true, "requires": { - "buffer-from": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^2.2.2", - "typedarray": "^0.0.6" + "buffer-from": "1.1.1", + "inherits": "2.0.3", + "readable-stream": "2.3.6", + "typedarray": "0.0.6" }, "dependencies": { "isarray": { @@ -2391,13 +2391,13 @@ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "string_decoder": { @@ -2406,7 +2406,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } } } @@ -2417,7 +2417,7 @@ "integrity": "sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==", "dev": true, "requires": { - "source-map": "^0.6.1" + "source-map": "0.6.1" }, "dependencies": { "source-map": { @@ -2436,7 +2436,7 @@ "requires": { "debug": "2.6.9", "finalhandler": "1.1.0", - "parseurl": "~1.3.2", + "parseurl": "1.3.2", "utils-merge": "1.0.1" } }, @@ -2458,7 +2458,7 @@ "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=", "dev": true, "requires": { - "date-now": "^0.1.4" + "date-now": "0.1.4" } }, "console-control-strings": { @@ -2509,8 +2509,8 @@ "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==", "dev": true, "requires": { - "bn.js": "^4.1.0", - "elliptic": "^6.0.0" + "bn.js": "4.11.8", + "elliptic": "6.5.3" } }, "create-hash": { @@ -2519,11 +2519,11 @@ "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", "dev": true, "requires": { - "cipher-base": "^1.0.1", - "inherits": "^2.0.1", - "md5.js": "^1.3.4", - "ripemd160": "^2.0.1", - "sha.js": "^2.4.0" + "cipher-base": "1.0.4", + "inherits": "2.0.3", + "md5.js": "1.3.5", + "ripemd160": "2.0.2", + "sha.js": "2.4.11" } }, "create-hmac": { @@ -2532,12 +2532,12 @@ "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", "dev": true, "requires": { - "cipher-base": "^1.0.3", - "create-hash": "^1.1.0", - "inherits": "^2.0.1", - "ripemd160": "^2.0.0", - "safe-buffer": "^5.0.1", - "sha.js": "^2.4.8" + "cipher-base": "1.0.4", + "create-hash": "1.2.0", + "inherits": "2.0.3", + "ripemd160": "2.0.2", + "safe-buffer": "5.1.2", + "sha.js": "2.4.11" } }, "cross-spawn": { @@ -2546,11 +2546,11 @@ "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "dev": true, "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" + "nice-try": "1.0.4", + "path-key": "2.0.1", + "semver": "5.5.0", + "shebang-command": "1.2.0", + "which": "1.3.1" }, "dependencies": { "which": { @@ -2559,7 +2559,7 @@ "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, "requires": { - "isexe": "^2.0.0" + "isexe": "2.0.0" } } } @@ -2570,17 +2570,17 @@ "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", "dev": true, "requires": { - "browserify-cipher": "^1.0.0", - "browserify-sign": "^4.0.0", - "create-ecdh": "^4.0.0", - "create-hash": "^1.1.0", - "create-hmac": "^1.1.0", - "diffie-hellman": "^5.0.0", - "inherits": "^2.0.1", - "pbkdf2": "^3.0.3", - "public-encrypt": "^4.0.0", - "randombytes": "^2.0.0", - "randomfill": "^1.0.3" + "browserify-cipher": "1.0.1", + "browserify-sign": "4.0.4", + "create-ecdh": "4.0.3", + "create-hash": "1.2.0", + "create-hmac": "1.1.7", + "diffie-hellman": "5.0.3", + "inherits": "2.0.3", + "pbkdf2": "3.0.17", + "public-encrypt": "4.0.3", + "randombytes": "2.0.6", + "randomfill": "1.0.4" } }, "css": { @@ -2589,10 +2589,10 @@ "integrity": "sha512-0W171WccAjQGGTKLhw4m2nnl0zPHUlTO/I8td4XzJgIB8Hg3ZZx71qT4G4eX8OVsSiaAKiUMy73E3nsbPlg2DQ==", "dev": true, "requires": { - "inherits": "^2.0.1", - "source-map": "^0.1.38", - "source-map-resolve": "^0.5.1", - "urix": "^0.1.0" + "inherits": "2.0.3", + "source-map": "0.1.43", + "source-map-resolve": "0.5.2", + "urix": "0.1.0" } }, "csslint": { @@ -2601,8 +2601,8 @@ "integrity": "sha1-Gcw+2jIhYP0/cjKvHLKjYOiYouk=", "dev": true, "requires": { - "clone": "~2.1.0", - "parserlib": "~1.1.1" + "clone": "2.1.1", + "parserlib": "1.1.1" } }, "currently-unhandled": { @@ -2611,7 +2611,7 @@ "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", "dev": true, "requires": { - "array-find-index": "^1.0.1" + "array-find-index": "1.0.2" } }, "d": { @@ -2620,7 +2620,7 @@ "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", "dev": true, "requires": { - "es5-ext": "^0.10.9" + "es5-ext": "0.10.45" } }, "dashdash": { @@ -2629,7 +2629,7 @@ "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "dev": true, "requires": { - "assert-plus": "^1.0.0" + "assert-plus": "1.0.0" } }, "date-now": { @@ -2659,9 +2659,9 @@ "integrity": "sha512-GZqvGIgKNlUnHUPQhepnUZFIMoi3dgZKQBzKDeL2g7oJF9SNAji/AAu36dusFUas0O+pae74lNeoIPHqXWDkLg==", "dev": true, "requires": { - "debug": "3.X", - "memoizee": "0.4.X", - "object-assign": "4.X" + "debug": "3.1.0", + "memoizee": "0.4.12", + "object-assign": "4.1.1" }, "dependencies": { "debug": { @@ -2699,7 +2699,7 @@ "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", "dev": true, "requires": { - "clone": "^1.0.2" + "clone": "1.0.4" }, "dependencies": { "clone": { @@ -2716,8 +2716,8 @@ "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=", "dev": true, "requires": { - "foreach": "^2.0.5", - "object-keys": "^1.0.8" + "foreach": "2.0.5", + "object-keys": "1.0.12" } }, "define-property": { @@ -2726,8 +2726,8 @@ "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", "dev": true, "requires": { - "is-descriptor": "^1.0.2", - "isobject": "^3.0.1" + "is-descriptor": "1.0.2", + "isobject": "3.0.1" }, "dependencies": { "is-accessor-descriptor": { @@ -2736,7 +2736,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.3" } }, "is-data-descriptor": { @@ -2745,7 +2745,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.3" } }, "is-descriptor": { @@ -2754,9 +2754,9 @@ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.3" } }, "isobject": { @@ -2785,13 +2785,13 @@ "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", "dev": true, "requires": { - "globby": "^5.0.0", - "is-path-cwd": "^1.0.0", - "is-path-in-cwd": "^1.0.0", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "rimraf": "^2.2.8" + "globby": "5.0.0", + "is-path-cwd": "1.0.0", + "is-path-in-cwd": "1.0.1", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "rimraf": "2.6.2" }, "dependencies": { "pify": { @@ -2832,10 +2832,10 @@ "integrity": "sha1-CRckkC6EZYJg65EHSMzNGvbiH7U=", "dev": true, "requires": { - "JSONStream": "^1.0.3", - "shasum": "^1.0.0", - "subarg": "^1.0.0", - "through2": "^2.0.0" + "JSONStream": "1.3.5", + "shasum": "1.0.2", + "subarg": "1.0.0", + "through2": "2.0.5" }, "dependencies": { "isarray": { @@ -2850,13 +2850,13 @@ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "string_decoder": { @@ -2865,7 +2865,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } }, "through2": { @@ -2874,8 +2874,8 @@ "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", "dev": true, "requires": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" + "readable-stream": "2.3.6", + "xtend": "4.0.1" } } } @@ -2886,8 +2886,8 @@ "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=", "dev": true, "requires": { - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0" + "inherits": "2.0.3", + "minimalistic-assert": "1.0.1" } }, "destroy": { @@ -2908,7 +2908,7 @@ "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", "dev": true, "requires": { - "repeating": "^2.0.0" + "repeating": "2.0.1" } }, "detect-newline": { @@ -2923,9 +2923,9 @@ "integrity": "sha512-TFHMqfOvxlgrfVzTEkNBSh9SvSNX/HfF4OFI2QFGCyPm02EsyILqnUeb5P6q7JZ3SFNTBL5t2sePRgrN4epUWQ==", "dev": true, "requires": { - "acorn-node": "^1.3.0", - "defined": "^1.0.0", - "minimist": "^1.1.1" + "acorn-node": "1.6.2", + "defined": "1.0.0", + "minimist": "1.2.0" } }, "dev-ip": { @@ -2940,9 +2940,9 @@ "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", "dev": true, "requires": { - "bn.js": "^4.1.0", - "miller-rabin": "^4.0.0", - "randombytes": "^2.0.0" + "bn.js": "4.11.8", + "miller-rabin": "4.0.1", + "randombytes": "2.0.6" } }, "doctrine": { @@ -2951,7 +2951,7 @@ "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", "dev": true, "requires": { - "esutils": "^2.0.2" + "esutils": "2.0.2" } }, "dom-serializer": { @@ -2960,8 +2960,8 @@ "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", "dev": true, "requires": { - "domelementtype": "~1.1.1", - "entities": "~1.1.1" + "domelementtype": "1.1.3", + "entities": "1.1.1" }, "dependencies": { "domelementtype": { @@ -2996,7 +2996,7 @@ "integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=", "dev": true, "requires": { - "domelementtype": "1" + "domelementtype": "1.3.0" } }, "domutils": { @@ -3005,8 +3005,8 @@ "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", "dev": true, "requires": { - "dom-serializer": "0", - "domelementtype": "1" + "dom-serializer": "0.1.0", + "domelementtype": "1.3.0" } }, "duplexer2": { @@ -3015,7 +3015,7 @@ "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=", "dev": true, "requires": { - "readable-stream": "^2.0.2" + "readable-stream": "2.3.6" }, "dependencies": { "isarray": { @@ -3030,13 +3030,13 @@ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "string_decoder": { @@ -3045,7 +3045,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } } } @@ -3056,7 +3056,7 @@ "integrity": "sha1-PTJI/r4rFZYHMW2PnPSRwWZIIh0=", "dev": true, "requires": { - "lodash": "^3.10.1" + "lodash": "3.10.1" }, "dependencies": { "lodash": { @@ -3073,7 +3073,7 @@ "integrity": "sha1-oyWqXlPROiIliJsqxBE7K5Y29Pw=", "dev": true, "requires": { - "tfunk": "^3.0.1" + "tfunk": "3.1.0" } }, "ecc-jsbn": { @@ -3082,8 +3082,8 @@ "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", "dev": true, "requires": { - "jsbn": "~0.1.0", - "safer-buffer": "^2.1.0" + "jsbn": "0.1.1", + "safer-buffer": "2.1.2" } }, "ee-first": { @@ -3104,13 +3104,13 @@ "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==", "dev": true, "requires": { - "bn.js": "^4.4.0", - "brorand": "^1.0.1", - "hash.js": "^1.0.0", - "hmac-drbg": "^1.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.0" + "bn.js": "4.11.8", + "brorand": "1.1.0", + "hash.js": "1.1.7", + "hmac-drbg": "1.0.1", + "inherits": "2.0.3", + "minimalistic-assert": "1.0.1", + "minimalistic-crypto-utils": "1.0.1" } }, "emojis-list": { @@ -3131,7 +3131,7 @@ "integrity": "sha1-jhdyBsPICDfYVjLouTWd/osvbq8=", "dev": true, "requires": { - "once": "~1.3.0" + "once": "1.3.3" }, "dependencies": { "once": { @@ -3140,7 +3140,7 @@ "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=", "dev": true, "requires": { - "wrappy": "1" + "wrappy": "1.0.2" } } } @@ -3151,12 +3151,12 @@ "integrity": "sha512-mRbgmAtQ4GAlKwuPnnAvXXwdPhEx+jkc0OBCLrXuD/CRvwNK3AxRSnqK4FSqmAMRRHryVJP8TopOvmEaA64fKw==", "dev": true, "requires": { - "accepts": "~1.3.4", + "accepts": "1.3.5", "base64id": "1.0.0", "cookie": "0.3.1", - "debug": "~3.1.0", - "engine.io-parser": "~2.1.0", - "ws": "~3.3.1" + "debug": "3.1.0", + "engine.io-parser": "2.1.2", + "ws": "3.3.3" }, "dependencies": { "debug": { @@ -3178,14 +3178,14 @@ "requires": { "component-emitter": "1.2.1", "component-inherit": "0.0.3", - "debug": "~3.1.0", - "engine.io-parser": "~2.1.1", + "debug": "3.1.0", + "engine.io-parser": "2.1.2", "has-cors": "1.1.0", "indexof": "0.0.1", "parseqs": "0.0.5", "parseuri": "0.0.5", - "ws": "~3.3.1", - "xmlhttprequest-ssl": "~1.5.4", + "ws": "3.3.3", + "xmlhttprequest-ssl": "1.5.5", "yeast": "0.1.2" }, "dependencies": { @@ -3207,10 +3207,10 @@ "dev": true, "requires": { "after": "0.8.2", - "arraybuffer.slice": "~0.0.7", + "arraybuffer.slice": "0.0.7", "base64-arraybuffer": "0.1.5", "blob": "0.0.4", - "has-binary2": "~1.0.2" + "has-binary2": "1.0.3" } }, "entities": { @@ -3225,7 +3225,7 @@ "integrity": "sha1-tKxAZIEH/c3PriQvQovqihTU8b8=", "dev": true, "requires": { - "is-arrayish": "^0.2.1" + "is-arrayish": "0.2.1" } }, "es-abstract": { @@ -3234,11 +3234,11 @@ "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==", "dev": true, "requires": { - "es-to-primitive": "^1.1.1", - "function-bind": "^1.1.1", - "has": "^1.0.1", - "is-callable": "^1.1.3", - "is-regex": "^1.0.4" + "es-to-primitive": "1.1.1", + "function-bind": "1.1.1", + "has": "1.0.3", + "is-callable": "1.1.4", + "is-regex": "1.0.4" } }, "es-to-primitive": { @@ -3247,9 +3247,9 @@ "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=", "dev": true, "requires": { - "is-callable": "^1.1.1", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.1" + "is-callable": "1.1.4", + "is-date-object": "1.0.1", + "is-symbol": "1.0.1" } }, "es5-ext": { @@ -3258,9 +3258,9 @@ "integrity": "sha1-C/33tHPaWRnVrfO9Jc63VPzMNlM=", "dev": true, "requires": { - "es6-iterator": "~2.0.3", - "es6-symbol": "~3.1.1", - "next-tick": "1" + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1", + "next-tick": "1.0.0" } }, "es6-iterator": { @@ -3269,9 +3269,9 @@ "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", "dev": true, "requires": { - "d": "1", - "es5-ext": "^0.10.35", - "es6-symbol": "^3.1.1" + "d": "1.0.0", + "es5-ext": "0.10.45", + "es6-symbol": "3.1.1" } }, "es6-symbol": { @@ -3280,8 +3280,8 @@ "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", "dev": true, "requires": { - "d": "1", - "es5-ext": "~0.10.14" + "d": "1.0.0", + "es5-ext": "0.10.45" } }, "es6-weak-map": { @@ -3290,10 +3290,10 @@ "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=", "dev": true, "requires": { - "d": "1", - "es5-ext": "^0.10.14", - "es6-iterator": "^2.0.1", - "es6-symbol": "^3.1.1" + "d": "1.0.0", + "es5-ext": "0.10.45", + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1" } }, "escape-html": { @@ -3314,45 +3314,45 @@ "integrity": "sha512-zlggW1qp7/TBjwLfouRoY7eWXrXwJZFqCdIxxh0/LVB/QuuKuIMkzyUZEcDo6LBadsry5JcEMxIqd3H/66CXVg==", "dev": true, "requires": { - "ajv": "^6.5.0", - "babel-code-frame": "^6.26.0", - "chalk": "^2.1.0", - "cross-spawn": "^6.0.5", - "debug": "^3.1.0", - "doctrine": "^2.1.0", - "eslint-scope": "^4.0.0", - "eslint-utils": "^1.3.1", - "eslint-visitor-keys": "^1.0.0", - "espree": "^4.0.0", - "esquery": "^1.0.1", - "esutils": "^2.0.2", - "file-entry-cache": "^2.0.0", - "functional-red-black-tree": "^1.0.1", - "glob": "^7.1.2", - "globals": "^11.7.0", - "ignore": "^4.0.2", - "imurmurhash": "^0.1.4", - "inquirer": "^5.2.0", - "is-resolvable": "^1.1.0", - "js-yaml": "^3.11.0", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.3.0", - "lodash": "^4.17.5", - "minimatch": "^3.0.4", - "mkdirp": "^0.5.1", - "natural-compare": "^1.4.0", - "optionator": "^0.8.2", - "path-is-inside": "^1.0.2", - "pluralize": "^7.0.0", - "progress": "^2.0.0", - "regexpp": "^1.1.0", - "require-uncached": "^1.0.3", - "semver": "^5.5.0", - "string.prototype.matchall": "^2.0.0", - "strip-ansi": "^4.0.0", - "strip-json-comments": "^2.0.1", - "table": "^4.0.3", - "text-table": "^0.2.0" + "ajv": "6.5.2", + "babel-code-frame": "6.26.0", + "chalk": "2.4.1", + "cross-spawn": "6.0.5", + "debug": "3.1.0", + "doctrine": "2.1.0", + "eslint-scope": "4.0.0", + "eslint-utils": "1.3.1", + "eslint-visitor-keys": "1.0.0", + "espree": "4.0.0", + "esquery": "1.0.1", + "esutils": "2.0.2", + "file-entry-cache": "2.0.0", + "functional-red-black-tree": "1.0.1", + "glob": "7.1.2", + "globals": "11.7.0", + "ignore": "4.0.2", + "imurmurhash": "0.1.4", + "inquirer": "5.2.0", + "is-resolvable": "1.1.0", + "js-yaml": "3.12.0", + "json-stable-stringify-without-jsonify": "1.0.1", + "levn": "0.3.0", + "lodash": "4.17.19", + "minimatch": "3.0.4", + "mkdirp": "0.5.1", + "natural-compare": "1.4.0", + "optionator": "0.8.2", + "path-is-inside": "1.0.2", + "pluralize": "7.0.0", + "progress": "2.0.0", + "regexpp": "1.1.0", + "require-uncached": "1.0.3", + "semver": "5.5.0", + "string.prototype.matchall": "2.0.0", + "strip-ansi": "4.0.0", + "strip-json-comments": "2.0.1", + "table": "4.0.3", + "text-table": "0.2.0" }, "dependencies": { "ansi-escapes": { @@ -3373,7 +3373,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "^1.9.0" + "color-convert": "1.9.2" } }, "chalk": { @@ -3382,9 +3382,9 @@ "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.4.0" } }, "cli-cursor": { @@ -3393,7 +3393,7 @@ "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", "dev": true, "requires": { - "restore-cursor": "^2.0.0" + "restore-cursor": "2.0.0" } }, "cli-width": { @@ -3417,7 +3417,7 @@ "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", "dev": true, "requires": { - "escape-string-regexp": "^1.0.5" + "escape-string-regexp": "1.0.5" } }, "globals": { @@ -3432,19 +3432,19 @@ "integrity": "sha512-E9BmnJbAKLPGonz0HeWHtbKf+EeSP93paWO3ZYoUpq/aowXvYGjjCSuashhXPpzbArIjBbji39THkxTz9ZeEUQ==", "dev": true, "requires": { - "ansi-escapes": "^3.0.0", - "chalk": "^2.0.0", - "cli-cursor": "^2.1.0", - "cli-width": "^2.0.0", - "external-editor": "^2.1.0", - "figures": "^2.0.0", - "lodash": "^4.3.0", + "ansi-escapes": "3.1.0", + "chalk": "2.4.1", + "cli-cursor": "2.1.0", + "cli-width": "2.2.0", + "external-editor": "2.2.0", + "figures": "2.0.0", + "lodash": "4.17.19", "mute-stream": "0.0.7", - "run-async": "^2.2.0", - "rxjs": "^5.5.2", - "string-width": "^2.1.0", - "strip-ansi": "^4.0.0", - "through": "^2.3.6" + "run-async": "2.3.0", + "rxjs": "5.5.11", + "string-width": "2.1.1", + "strip-ansi": "4.0.0", + "through": "2.3.8" } }, "is-fullwidth-code-point": { @@ -3459,7 +3459,7 @@ "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", "dev": true, "requires": { - "mimic-fn": "^1.0.0" + "mimic-fn": "1.2.0" } }, "restore-cursor": { @@ -3468,8 +3468,8 @@ "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", "dev": true, "requires": { - "onetime": "^2.0.0", - "signal-exit": "^3.0.2" + "onetime": "2.0.1", + "signal-exit": "3.0.2" } }, "run-async": { @@ -3478,7 +3478,7 @@ "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", "dev": true, "requires": { - "is-promise": "^2.1.0" + "is-promise": "2.1.0" } }, "string-width": { @@ -3487,8 +3487,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" } }, "strip-ansi": { @@ -3497,7 +3497,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } }, "supports-color": { @@ -3506,7 +3506,7 @@ "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", "dev": true, "requires": { - "has-flag": "^3.0.0" + "has-flag": "3.0.0" } } } @@ -3523,11 +3523,11 @@ "integrity": "sha512-f4A/Yk7qF+HcFSz5Tck2QoKIwJVHlX0soJk5MkROYahb5uvspad5Ba60rrz4u/V2/MEj1dtp/uBi6LlLWVaY7Q==", "dev": true, "requires": { - "loader-fs-cache": "^1.0.0", - "loader-utils": "^1.0.2", - "object-assign": "^4.0.1", - "object-hash": "^1.1.4", - "rimraf": "^2.6.1" + "loader-fs-cache": "1.0.1", + "loader-utils": "1.1.0", + "object-assign": "4.1.1", + "object-hash": "1.3.0", + "rimraf": "2.6.2" } }, "eslint-plugin-promise": { @@ -3548,8 +3548,8 @@ "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==", "dev": true, "requires": { - "esrecurse": "^4.1.0", - "estraverse": "^4.1.1" + "esrecurse": "4.2.1", + "estraverse": "4.2.0" } }, "eslint-utils": { @@ -3570,8 +3570,8 @@ "integrity": "sha512-kapdTCt1bjmspxStVKX6huolXVV5ZfyZguY1lcfhVVZstce3bqxH9mcLzNn3/mlgW6wQ732+0fuG9v7h0ZQoKg==", "dev": true, "requires": { - "acorn": "^5.6.0", - "acorn-jsx": "^4.1.1" + "acorn": "5.7.4", + "acorn-jsx": "4.1.1" }, "dependencies": { "acorn": { @@ -3594,7 +3594,7 @@ "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==", "dev": true, "requires": { - "estraverse": "^4.0.0" + "estraverse": "4.2.0" } }, "esrecurse": { @@ -3603,7 +3603,7 @@ "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", "dev": true, "requires": { - "estraverse": "^4.1.0" + "estraverse": "4.2.0" } }, "estraverse": { @@ -3630,8 +3630,8 @@ "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", "dev": true, "requires": { - "d": "1", - "es5-ext": "~0.10.14" + "d": "1.0.0", + "es5-ext": "0.10.45" } }, "eventemitter3": { @@ -3652,8 +3652,8 @@ "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", "dev": true, "requires": { - "md5.js": "^1.3.4", - "safe-buffer": "^5.1.1" + "md5.js": "1.3.5", + "safe-buffer": "5.1.2" } }, "exit": { @@ -3668,7 +3668,7 @@ "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", "dev": true, "requires": { - "is-posix-bracket": "^0.1.0" + "is-posix-bracket": "0.1.1" } }, "expand-range": { @@ -3677,7 +3677,7 @@ "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", "dev": true, "requires": { - "fill-range": "^2.1.0" + "fill-range": "2.2.4" } }, "expand-tilde": { @@ -3686,7 +3686,7 @@ "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", "dev": true, "requires": { - "homedir-polyfill": "^1.0.1" + "homedir-polyfill": "1.0.3" } }, "extend": { @@ -3701,7 +3701,7 @@ "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=", "dev": true, "requires": { - "kind-of": "^1.1.0" + "kind-of": "1.1.0" } }, "external-editor": { @@ -3710,9 +3710,9 @@ "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==", "dev": true, "requires": { - "chardet": "^0.4.0", - "iconv-lite": "^0.4.17", - "tmp": "^0.0.33" + "chardet": "0.4.2", + "iconv-lite": "0.4.23", + "tmp": "0.0.33" } }, "extglob": { @@ -3721,7 +3721,7 @@ "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", "dev": true, "requires": { - "is-extglob": "^1.0.0" + "is-extglob": "1.0.0" } }, "extsprintf": { @@ -3736,9 +3736,9 @@ "integrity": "sha1-9BEl49hPLn2JpD0G2VjI94vha+E=", "dev": true, "requires": { - "ansi-gray": "^0.1.1", - "color-support": "^1.1.3", - "time-stamp": "^1.0.0" + "ansi-gray": "0.1.1", + "color-support": "1.1.3", + "time-stamp": "1.1.0" } }, "fast-deep-equal": { @@ -3765,7 +3765,7 @@ "integrity": "sha1-zEB0x/Sk39A69U3WXDVLE1EyzhE=", "dev": true, "requires": { - "websocket-driver": ">=0.3.6" + "websocket-driver": "0.7.0" } }, "file-entry-cache": { @@ -3774,8 +3774,8 @@ "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=", "dev": true, "requires": { - "flat-cache": "^1.2.1", - "object-assign": "^4.0.1" + "flat-cache": "1.3.0", + "object-assign": "4.1.1" } }, "filename-regex": { @@ -3790,11 +3790,11 @@ "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==", "dev": true, "requires": { - "is-number": "^2.1.0", - "isobject": "^2.0.0", - "randomatic": "^3.0.0", - "repeat-element": "^1.1.2", - "repeat-string": "^1.5.2" + "is-number": "2.1.0", + "isobject": "2.1.0", + "randomatic": "3.0.0", + "repeat-element": "1.1.2", + "repeat-string": "1.6.1" } }, "finalhandler": { @@ -3804,12 +3804,12 @@ "dev": true, "requires": { "debug": "2.6.9", - "encodeurl": "~1.0.1", - "escape-html": "~1.0.3", - "on-finished": "~2.3.0", - "parseurl": "~1.3.2", - "statuses": "~1.3.1", - "unpipe": "~1.0.0" + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "on-finished": "2.3.0", + "parseurl": "1.3.2", + "statuses": "1.3.1", + "unpipe": "1.0.0" } }, "find-cache-dir": { @@ -3818,9 +3818,9 @@ "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", "dev": true, "requires": { - "commondir": "^1.0.1", - "make-dir": "^1.0.0", - "pkg-dir": "^2.0.0" + "commondir": "1.0.1", + "make-dir": "1.3.0", + "pkg-dir": "2.0.0" } }, "find-index": { @@ -3835,7 +3835,7 @@ "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "dev": true, "requires": { - "locate-path": "^2.0.0" + "locate-path": "2.0.0" } }, "findup-sync": { @@ -3844,10 +3844,10 @@ "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=", "dev": true, "requires": { - "detect-file": "^1.0.0", - "is-glob": "^3.1.0", - "micromatch": "^3.0.4", - "resolve-dir": "^1.0.1" + "detect-file": "1.0.0", + "is-glob": "3.1.0", + "micromatch": "3.1.10", + "resolve-dir": "1.0.1" }, "dependencies": { "arr-diff": { @@ -3868,16 +3868,16 @@ "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "dev": true, "requires": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" + "arr-flatten": "1.1.0", + "array-unique": "0.3.2", + "extend-shallow": "2.0.1", + "fill-range": "4.0.0", + "isobject": "3.0.1", + "repeat-element": "1.1.2", + "snapdragon": "0.8.2", + "snapdragon-node": "2.1.1", + "split-string": "3.1.0", + "to-regex": "3.0.2" }, "dependencies": { "extend-shallow": { @@ -3886,7 +3886,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -3897,13 +3897,13 @@ "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", "dev": true, "requires": { - "debug": "^2.3.3", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "posix-character-classes": "^0.1.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "posix-character-classes": "0.1.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" }, "dependencies": { "define-property": { @@ -3912,7 +3912,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } }, "extend-shallow": { @@ -3921,7 +3921,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } }, "is-accessor-descriptor": { @@ -3930,7 +3930,7 @@ "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { "kind-of": { @@ -3939,7 +3939,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -3950,7 +3950,7 @@ "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { "kind-of": { @@ -3959,7 +3959,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -3970,9 +3970,9 @@ "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", "dev": true, "requires": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" } }, "kind-of": { @@ -3989,8 +3989,8 @@ "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "dev": true, "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" }, "dependencies": { "is-extendable": { @@ -3999,7 +3999,7 @@ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, "requires": { - "is-plain-object": "^2.0.4" + "is-plain-object": "2.0.4" } } } @@ -4010,14 +4010,14 @@ "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", "dev": true, "requires": { - "array-unique": "^0.3.2", - "define-property": "^1.0.0", - "expand-brackets": "^2.1.4", - "extend-shallow": "^2.0.1", - "fragment-cache": "^0.2.1", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" + "array-unique": "0.3.2", + "define-property": "1.0.0", + "expand-brackets": "2.1.4", + "extend-shallow": "2.0.1", + "fragment-cache": "0.2.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" }, "dependencies": { "define-property": { @@ -4026,7 +4026,7 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "is-descriptor": "^1.0.0" + "is-descriptor": "1.0.2" } }, "extend-shallow": { @@ -4035,7 +4035,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -4046,10 +4046,10 @@ "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, "requires": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" + "extend-shallow": "2.0.1", + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" }, "dependencies": { "extend-shallow": { @@ -4058,7 +4058,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -4069,7 +4069,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.3" } }, "is-data-descriptor": { @@ -4078,7 +4078,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.3" } }, "is-descriptor": { @@ -4087,9 +4087,9 @@ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.3" } }, "is-extglob": { @@ -4104,7 +4104,7 @@ "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", "dev": true, "requires": { - "is-extglob": "^2.1.0" + "is-extglob": "2.1.1" } }, "is-number": { @@ -4113,7 +4113,7 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { "kind-of": { @@ -4122,7 +4122,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -4145,19 +4145,19 @@ "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "dev": true, "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "braces": "^2.3.1", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "extglob": "^2.0.4", - "fragment-cache": "^0.2.1", - "kind-of": "^6.0.2", - "nanomatch": "^1.2.9", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.2" + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "braces": "2.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "extglob": "2.0.4", + "fragment-cache": "0.2.1", + "kind-of": "6.0.3", + "nanomatch": "1.2.13", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" } } } @@ -4168,11 +4168,11 @@ "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==", "dev": true, "requires": { - "expand-tilde": "^2.0.2", - "is-plain-object": "^2.0.3", - "object.defaults": "^1.1.0", - "object.pick": "^1.2.0", - "parse-filepath": "^1.0.1" + "expand-tilde": "2.0.2", + "is-plain-object": "2.0.4", + "object.defaults": "1.1.0", + "object.pick": "1.3.0", + "parse-filepath": "1.0.2" } }, "first-chunk-stream": { @@ -4193,10 +4193,10 @@ "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=", "dev": true, "requires": { - "circular-json": "^0.3.1", - "del": "^2.0.2", - "graceful-fs": "^4.1.2", - "write": "^0.2.1" + "circular-json": "0.3.3", + "del": "2.2.2", + "graceful-fs": "4.1.11", + "write": "0.2.1" } }, "follow-redirects": { @@ -4205,7 +4205,7 @@ "integrity": "sha512-v9GI1hpaqq1ZZR6pBD1+kI7O24PhDvNGNodjS3MdcEqyrahCp8zbtpv+2B/krUnSmUH80lbAS7MrdeK5IylgKg==", "dev": true, "requires": { - "debug": "^3.1.0" + "debug": "3.1.0" }, "dependencies": { "debug": { @@ -4231,7 +4231,7 @@ "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", "dev": true, "requires": { - "for-in": "^1.0.1" + "for-in": "1.0.2" } }, "foreach": { @@ -4252,9 +4252,9 @@ "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", "dev": true, "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", - "mime-types": "^2.1.12" + "asynckit": "0.4.0", + "combined-stream": "1.0.7", + "mime-types": "2.1.19" } }, "fragment-cache": { @@ -4263,7 +4263,7 @@ "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", "dev": true, "requires": { - "map-cache": "^0.2.2" + "map-cache": "0.2.2" } }, "fresh": { @@ -4278,9 +4278,9 @@ "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^3.0.0", - "universalify": "^0.1.0" + "graceful-fs": "4.1.11", + "jsonfile": "3.0.1", + "universalify": "0.1.2" } }, "fs.realpath": { @@ -4296,8 +4296,8 @@ "dev": true, "optional": true, "requires": { - "nan": "^2.9.2", - "node-pre-gyp": "^0.10.0" + "nan": "2.10.0", + "node-pre-gyp": "0.10.3" }, "dependencies": { "abbrev": { @@ -4323,8 +4323,8 @@ "dev": true, "optional": true, "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" + "delegates": "1.0.0", + "readable-stream": "2.3.6" } }, "balanced-match": { @@ -4337,7 +4337,7 @@ "bundled": true, "dev": true, "requires": { - "balanced-match": "^1.0.0", + "balanced-match": "1.0.0", "concat-map": "0.0.1" } }, @@ -4401,7 +4401,7 @@ "dev": true, "optional": true, "requires": { - "minipass": "^2.2.1" + "minipass": "2.3.5" } }, "fs.realpath": { @@ -4416,14 +4416,14 @@ "dev": true, "optional": true, "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" + "aproba": "1.2.0", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.3" } }, "glob": { @@ -4432,12 +4432,12 @@ "dev": true, "optional": true, "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" } }, "has-unicode": { @@ -4452,7 +4452,7 @@ "dev": true, "optional": true, "requires": { - "safer-buffer": ">= 2.1.2 < 3" + "safer-buffer": "2.1.2" } }, "ignore-walk": { @@ -4461,7 +4461,7 @@ "dev": true, "optional": true, "requires": { - "minimatch": "^3.0.4" + "minimatch": "3.0.4" } }, "inflight": { @@ -4470,8 +4470,8 @@ "dev": true, "optional": true, "requires": { - "once": "^1.3.0", - "wrappy": "1" + "once": "1.4.0", + "wrappy": "1.0.2" } }, "inherits": { @@ -4490,7 +4490,7 @@ "bundled": true, "dev": true, "requires": { - "number-is-nan": "^1.0.0" + "number-is-nan": "1.0.1" } }, "isarray": { @@ -4504,7 +4504,7 @@ "bundled": true, "dev": true, "requires": { - "brace-expansion": "^1.1.7" + "brace-expansion": "1.1.11" } }, "minimist": { @@ -4517,8 +4517,8 @@ "bundled": true, "dev": true, "requires": { - "safe-buffer": "^5.1.2", - "yallist": "^3.0.0" + "safe-buffer": "5.1.2", + "yallist": "3.0.3" } }, "minizlib": { @@ -4527,7 +4527,7 @@ "dev": true, "optional": true, "requires": { - "minipass": "^2.2.1" + "minipass": "2.3.5" } }, "mkdirp": { @@ -4550,9 +4550,9 @@ "dev": true, "optional": true, "requires": { - "debug": "^2.1.2", - "iconv-lite": "^0.4.4", - "sax": "^1.2.4" + "debug": "2.6.9", + "iconv-lite": "0.4.24", + "sax": "1.2.4" } }, "node-pre-gyp": { @@ -4561,16 +4561,16 @@ "dev": true, "optional": true, "requires": { - "detect-libc": "^1.0.2", - "mkdirp": "^0.5.1", - "needle": "^2.2.1", - "nopt": "^4.0.1", - "npm-packlist": "^1.1.6", - "npmlog": "^4.0.2", - "rc": "^1.2.7", - "rimraf": "^2.6.1", - "semver": "^5.3.0", - "tar": "^4" + "detect-libc": "1.0.3", + "mkdirp": "0.5.1", + "needle": "2.2.4", + "nopt": "4.0.1", + "npm-packlist": "1.2.0", + "npmlog": "4.1.2", + "rc": "1.2.8", + "rimraf": "2.6.3", + "semver": "5.6.0", + "tar": "4.4.8" } }, "nopt": { @@ -4579,8 +4579,8 @@ "dev": true, "optional": true, "requires": { - "abbrev": "1", - "osenv": "^0.1.4" + "abbrev": "1.1.1", + "osenv": "0.1.5" } }, "npm-bundled": { @@ -4595,8 +4595,8 @@ "dev": true, "optional": true, "requires": { - "ignore-walk": "^3.0.1", - "npm-bundled": "^1.0.1" + "ignore-walk": "3.0.1", + "npm-bundled": "1.0.5" } }, "npmlog": { @@ -4605,10 +4605,10 @@ "dev": true, "optional": true, "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" + "are-we-there-yet": "1.1.5", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" } }, "number-is-nan": { @@ -4627,7 +4627,7 @@ "bundled": true, "dev": true, "requires": { - "wrappy": "1" + "wrappy": "1.0.2" } }, "os-homedir": { @@ -4648,8 +4648,8 @@ "dev": true, "optional": true, "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" } }, "path-is-absolute": { @@ -4670,10 +4670,10 @@ "dev": true, "optional": true, "requires": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" + "deep-extend": "0.6.0", + "ini": "1.3.5", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" }, "dependencies": { "minimist": { @@ -4690,13 +4690,13 @@ "dev": true, "optional": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "rimraf": { @@ -4705,7 +4705,7 @@ "dev": true, "optional": true, "requires": { - "glob": "^7.1.3" + "glob": "7.1.3" } }, "safe-buffer": { @@ -4748,9 +4748,9 @@ "bundled": true, "dev": true, "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" } }, "string_decoder": { @@ -4759,7 +4759,7 @@ "dev": true, "optional": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } }, "strip-ansi": { @@ -4767,7 +4767,7 @@ "bundled": true, "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "2.1.1" } }, "strip-json-comments": { @@ -4782,13 +4782,13 @@ "dev": true, "optional": true, "requires": { - "chownr": "^1.1.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.3.4", - "minizlib": "^1.1.1", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.2", - "yallist": "^3.0.2" + "chownr": "1.1.1", + "fs-minipass": "1.2.5", + "minipass": "2.3.5", + "minizlib": "1.2.1", + "mkdirp": "0.5.1", + "safe-buffer": "5.1.2", + "yallist": "3.0.3" } }, "util-deprecate": { @@ -4803,7 +4803,7 @@ "dev": true, "optional": true, "requires": { - "string-width": "^1.0.2 || 2" + "string-width": "1.0.2" } }, "wrappy": { @@ -4824,10 +4824,10 @@ "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "inherits": "~2.0.0", - "mkdirp": ">=0.5 0", - "rimraf": "2" + "graceful-fs": "4.1.11", + "inherits": "2.0.3", + "mkdirp": "0.5.1", + "rimraf": "2.6.2" } }, "function-bind": { @@ -4848,14 +4848,14 @@ "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "dev": true, "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" + "aproba": "1.2.0", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.3" } }, "gaze": { @@ -4864,7 +4864,7 @@ "integrity": "sha1-QLcJU30k0dRXZ9takIaJ3+aaxE8=", "dev": true, "requires": { - "globule": "~0.1.0" + "globule": "0.1.0" } }, "get-assigned-identifiers": { @@ -4897,7 +4897,7 @@ "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "dev": true, "requires": { - "assert-plus": "^1.0.0" + "assert-plus": "1.0.0" } }, "glob": { @@ -4906,12 +4906,12 @@ "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", "dev": true, "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" } }, "glob-base": { @@ -4920,8 +4920,8 @@ "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", "dev": true, "requires": { - "glob-parent": "^2.0.0", - "is-glob": "^2.0.0" + "glob-parent": "2.0.0", + "is-glob": "2.0.1" } }, "glob-parent": { @@ -4930,7 +4930,7 @@ "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", "dev": true, "requires": { - "is-glob": "^2.0.0" + "is-glob": "2.0.1" } }, "glob-stream": { @@ -4939,12 +4939,12 @@ "integrity": "sha1-kXCl8St5Awb9/lmPMT+PeVT9FDs=", "dev": true, "requires": { - "glob": "^4.3.1", - "glob2base": "^0.0.12", - "minimatch": "^2.0.1", - "ordered-read-streams": "^0.1.0", - "through2": "^0.6.1", - "unique-stream": "^1.0.0" + "glob": "4.5.3", + "glob2base": "0.0.12", + "minimatch": "2.0.10", + "ordered-read-streams": "0.1.0", + "through2": "0.6.5", + "unique-stream": "1.0.0" }, "dependencies": { "glob": { @@ -4953,10 +4953,10 @@ "integrity": "sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=", "dev": true, "requires": { - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^2.0.1", - "once": "^1.3.0" + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "2.0.10", + "once": "1.4.0" } }, "minimatch": { @@ -4965,7 +4965,7 @@ "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=", "dev": true, "requires": { - "brace-expansion": "^1.0.0" + "brace-expansion": "1.1.11" } }, "through2": { @@ -4974,8 +4974,8 @@ "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", "dev": true, "requires": { - "readable-stream": ">=1.0.33-1 <1.1.0-0", - "xtend": ">=4.0.0 <4.1.0-0" + "readable-stream": "1.0.34", + "xtend": "4.0.1" } } } @@ -4986,7 +4986,7 @@ "integrity": "sha1-uVtKjfdLOcgymLDAXJeLTZo7cQs=", "dev": true, "requires": { - "gaze": "^0.5.1" + "gaze": "0.5.2" } }, "glob2base": { @@ -4995,7 +4995,7 @@ "integrity": "sha1-nUGbPijxLoOjYhZKJ3BVkiycDVY=", "dev": true, "requires": { - "find-index": "^0.1.1" + "find-index": "0.1.1" } }, "global-modules": { @@ -5004,9 +5004,9 @@ "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", "dev": true, "requires": { - "global-prefix": "^1.0.1", - "is-windows": "^1.0.1", - "resolve-dir": "^1.0.0" + "global-prefix": "1.0.2", + "is-windows": "1.0.2", + "resolve-dir": "1.0.1" } }, "global-prefix": { @@ -5015,11 +5015,11 @@ "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", "dev": true, "requires": { - "expand-tilde": "^2.0.2", - "homedir-polyfill": "^1.0.1", - "ini": "^1.3.4", - "is-windows": "^1.0.1", - "which": "^1.2.14" + "expand-tilde": "2.0.2", + "homedir-polyfill": "1.0.3", + "ini": "1.3.5", + "is-windows": "1.0.2", + "which": "1.3.1" } }, "globals": { @@ -5034,12 +5034,12 @@ "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", "dev": true, "requires": { - "array-union": "^1.0.1", - "arrify": "^1.0.0", - "glob": "^7.0.3", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" + "array-union": "1.0.2", + "arrify": "1.0.1", + "glob": "7.1.2", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" }, "dependencies": { "pify": { @@ -5056,9 +5056,9 @@ "integrity": "sha1-2cjt3h2nnRJaFRt5UzuXhnY0auU=", "dev": true, "requires": { - "glob": "~3.1.21", - "lodash": "~1.0.1", - "minimatch": "~0.2.11" + "glob": "3.1.21", + "lodash": "1.0.2", + "minimatch": "0.2.14" }, "dependencies": { "glob": { @@ -5067,9 +5067,9 @@ "integrity": "sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=", "dev": true, "requires": { - "graceful-fs": "~1.2.0", - "inherits": "1", - "minimatch": "~0.2.11" + "graceful-fs": "1.2.3", + "inherits": "1.0.2", + "minimatch": "0.2.14" } }, "graceful-fs": { @@ -5096,8 +5096,8 @@ "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=", "dev": true, "requires": { - "lru-cache": "2", - "sigmund": "~1.0.0" + "lru-cache": "2.7.3", + "sigmund": "1.0.1" } } } @@ -5108,7 +5108,7 @@ "integrity": "sha512-ynYqXLoluBKf9XGR1gA59yEJisIL7YHEH4xr3ZziHB5/yl4qWfaK8Js9jGe6gBGCSCKVqiyO30WnRZADvemUNw==", "dev": true, "requires": { - "sparkles": "^1.0.0" + "sparkles": "1.0.1" } }, "graceful-fs": { @@ -5123,19 +5123,19 @@ "integrity": "sha1-VxzkWSjdQK9lFPxAEYZgFsE4RbQ=", "dev": true, "requires": { - "archy": "^1.0.0", - "chalk": "^1.0.0", - "deprecated": "^0.0.1", - "gulp-util": "^3.0.0", - "interpret": "^1.0.0", - "liftoff": "^2.1.0", - "minimist": "^1.1.0", - "orchestrator": "^0.3.0", - "pretty-hrtime": "^1.0.0", - "semver": "^4.1.0", - "tildify": "^1.0.0", - "v8flags": "^2.0.2", - "vinyl-fs": "^0.3.0" + "archy": "1.0.0", + "chalk": "1.1.3", + "deprecated": "0.0.1", + "gulp-util": "3.0.8", + "interpret": "1.4.0", + "liftoff": "2.5.0", + "minimist": "1.2.0", + "orchestrator": "0.3.8", + "pretty-hrtime": "1.0.3", + "semver": "4.3.6", + "tildify": "1.2.0", + "v8flags": "2.1.1", + "vinyl-fs": "0.3.14" }, "dependencies": { "semver": { @@ -5152,12 +5152,12 @@ "integrity": "sha1-gjfCeKaXdScKHK/n1vEBz81YVUQ=", "dev": true, "requires": { - "autoprefixer": "^8.0.0", - "fancy-log": "^1.3.2", - "plugin-error": "^1.0.1", - "postcss": "^6.0.1", - "through2": "^2.0.0", - "vinyl-sourcemaps-apply": "^0.2.0" + "autoprefixer": "8.6.5", + "fancy-log": "1.3.2", + "plugin-error": "1.0.1", + "postcss": "6.0.23", + "through2": "2.0.3", + "vinyl-sourcemaps-apply": "0.2.1" }, "dependencies": { "arr-diff": { @@ -5178,8 +5178,8 @@ "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "dev": true, "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" } }, "is-extendable": { @@ -5188,7 +5188,7 @@ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, "requires": { - "is-plain-object": "^2.0.4" + "is-plain-object": "2.0.4" } }, "isarray": { @@ -5203,10 +5203,10 @@ "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==", "dev": true, "requires": { - "ansi-colors": "^1.0.1", - "arr-diff": "^4.0.0", - "arr-union": "^3.1.0", - "extend-shallow": "^3.0.2" + "ansi-colors": "1.1.0", + "arr-diff": "4.0.0", + "arr-union": "3.1.0", + "extend-shallow": "3.0.2" } }, "readable-stream": { @@ -5215,13 +5215,13 @@ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "string_decoder": { @@ -5230,7 +5230,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } }, "through2": { @@ -5239,8 +5239,8 @@ "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "dev": true, "requires": { - "readable-stream": "^2.1.5", - "xtend": "~4.0.1" + "readable-stream": "2.3.6", + "xtend": "4.0.1" } } } @@ -5275,8 +5275,8 @@ "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "dev": true, "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" } }, "is-extendable": { @@ -5285,7 +5285,7 @@ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, "requires": { - "is-plain-object": "^2.0.4" + "is-plain-object": "2.0.4" } }, "isarray": { @@ -5300,10 +5300,10 @@ "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==", "dev": true, "requires": { - "ansi-colors": "^1.0.1", - "arr-diff": "^4.0.0", - "arr-union": "^3.1.0", - "extend-shallow": "^3.0.2" + "ansi-colors": "1.1.0", + "arr-diff": "4.0.0", + "arr-union": "3.1.0", + "extend-shallow": "3.0.2" } }, "readable-stream": { @@ -5312,13 +5312,13 @@ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "string_decoder": { @@ -5327,7 +5327,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } }, "through2": { @@ -5336,8 +5336,8 @@ "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "dev": true, "requires": { - "readable-stream": "^2.1.5", - "xtend": "~4.0.1" + "readable-stream": "2.3.6", + "xtend": "4.0.1" } } } @@ -5348,9 +5348,9 @@ "integrity": "sha1-Yz0WyV2IUEYorQJmVmPO5aR5M1M=", "dev": true, "requires": { - "concat-with-sourcemaps": "^1.0.0", - "through2": "^2.0.0", - "vinyl": "^2.0.0" + "concat-with-sourcemaps": "1.1.0", + "through2": "2.0.3", + "vinyl": "2.2.0" }, "dependencies": { "isarray": { @@ -5365,13 +5365,13 @@ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "string_decoder": { @@ -5380,7 +5380,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } }, "through2": { @@ -5389,8 +5389,8 @@ "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "dev": true, "requires": { - "readable-stream": "^2.1.5", - "xtend": "~4.0.1" + "readable-stream": "2.3.6", + "xtend": "4.0.1" } } } @@ -5401,12 +5401,12 @@ "integrity": "sha512-Rec56+RpCGg7feK3d/S45oqgxyLV3end0ed+UjWFv6YziQae2Bp4DNSDobwEvJdfCAsOhOSExEEB+jcfMx430w==", "dev": true, "requires": { - "csslint": "^1.0.2", - "fancy-log": "^1.3.2", - "plugin-error": "^1.0.1", - "rcloader": "^0.2.1", - "through2": "^2.0.1", - "vinyl": "^2.1.0" + "csslint": "1.0.5", + "fancy-log": "1.3.2", + "plugin-error": "1.0.1", + "rcloader": "0.2.2", + "through2": "2.0.3", + "vinyl": "2.2.0" }, "dependencies": { "arr-diff": { @@ -5427,8 +5427,8 @@ "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "dev": true, "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" } }, "is-extendable": { @@ -5437,7 +5437,7 @@ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, "requires": { - "is-plain-object": "^2.0.4" + "is-plain-object": "2.0.4" } }, "isarray": { @@ -5452,10 +5452,10 @@ "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==", "dev": true, "requires": { - "ansi-colors": "^1.0.1", - "arr-diff": "^4.0.0", - "arr-union": "^3.1.0", - "extend-shallow": "^3.0.2" + "ansi-colors": "1.1.0", + "arr-diff": "4.0.0", + "arr-union": "3.1.0", + "extend-shallow": "3.0.2" } }, "readable-stream": { @@ -5464,13 +5464,13 @@ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "string_decoder": { @@ -5479,7 +5479,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } }, "through2": { @@ -5488,8 +5488,8 @@ "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "dev": true, "requires": { - "readable-stream": "^2.1.5", - "xtend": "~4.0.1" + "readable-stream": "2.3.6", + "xtend": "4.0.1" } } } @@ -5500,11 +5500,11 @@ "integrity": "sha512-sP3NK8Y/1e58O0PH9t6s7DAr/lKDSUbIY207oWSeufM6/VclB7jJrIBcPCsyhrFTCDUl9DauePbt6VqP2vPM5w==", "dev": true, "requires": { - "lodash": "^4.12.0", - "minimatch": "^3.0.3", - "plugin-error": "^0.1.2", - "rcloader": "^0.2.2", - "through2": "^2.0.0" + "lodash": "4.17.19", + "minimatch": "3.0.4", + "plugin-error": "0.1.2", + "rcloader": "0.2.2", + "through2": "2.0.3" }, "dependencies": { "isarray": { @@ -5519,13 +5519,13 @@ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "string_decoder": { @@ -5534,7 +5534,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } }, "through2": { @@ -5543,8 +5543,8 @@ "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "dev": true, "requires": { - "readable-stream": "^2.1.5", - "xtend": "~4.0.1" + "readable-stream": "2.3.6", + "xtend": "4.0.1" } } } @@ -5561,14 +5561,14 @@ "integrity": "sha512-q8psj4+aDrblJMMtRxihNBdovfzGrXJp1l4JU0Sz4b/Mhsi2DPrKFYCGDwjIWRENs04ELVHxdOJQ7Vs98OFohg==", "dev": true, "requires": { - "chalk": "^2.3.0", - "lodash.clonedeep": "^4.3.2", - "node-sass": "^4.8.3", - "plugin-error": "^1.0.1", - "replace-ext": "^1.0.0", - "strip-ansi": "^4.0.0", - "through2": "^2.0.0", - "vinyl-sourcemaps-apply": "^0.2.0" + "chalk": "2.4.2", + "lodash.clonedeep": "4.5.0", + "node-sass": "4.11.0", + "plugin-error": "1.0.1", + "replace-ext": "1.0.0", + "strip-ansi": "4.0.0", + "through2": "2.0.5", + "vinyl-sourcemaps-apply": "0.2.1" }, "dependencies": { "ansi-regex": { @@ -5583,7 +5583,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "^1.9.0" + "color-convert": "1.9.2" } }, "arr-diff": { @@ -5604,9 +5604,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" } }, "extend-shallow": { @@ -5615,8 +5615,8 @@ "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "dev": true, "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" } }, "is-extendable": { @@ -5625,7 +5625,7 @@ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, "requires": { - "is-plain-object": "^2.0.4" + "is-plain-object": "2.0.4" } }, "isarray": { @@ -5640,10 +5640,10 @@ "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==", "dev": true, "requires": { - "ansi-colors": "^1.0.1", - "arr-diff": "^4.0.0", - "arr-union": "^3.1.0", - "extend-shallow": "^3.0.2" + "ansi-colors": "1.1.0", + "arr-diff": "4.0.0", + "arr-union": "3.1.0", + "extend-shallow": "3.0.2" } }, "readable-stream": { @@ -5652,13 +5652,13 @@ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "string_decoder": { @@ -5667,7 +5667,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } }, "strip-ansi": { @@ -5676,7 +5676,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } }, "supports-color": { @@ -5685,7 +5685,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { - "has-flag": "^3.0.0" + "has-flag": "3.0.0" } }, "through2": { @@ -5694,8 +5694,8 @@ "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", "dev": true, "requires": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" + "readable-stream": "2.3.6", + "xtend": "4.0.1" } } } @@ -5706,17 +5706,17 @@ "integrity": "sha1-y7IAhFCxvM5s0jv5gze+dRv24wo=", "dev": true, "requires": { - "@gulp-sourcemaps/identity-map": "1.X", - "@gulp-sourcemaps/map-sources": "1.X", - "acorn": "5.X", - "convert-source-map": "1.X", - "css": "2.X", - "debug-fabulous": "1.X", - "detect-newline": "2.X", - "graceful-fs": "4.X", - "source-map": "~0.6.0", - "strip-bom-string": "1.X", - "through2": "2.X" + "@gulp-sourcemaps/identity-map": "1.0.2", + "@gulp-sourcemaps/map-sources": "1.0.0", + "acorn": "5.7.4", + "convert-source-map": "1.5.1", + "css": "2.2.3", + "debug-fabulous": "1.1.0", + "detect-newline": "2.1.0", + "graceful-fs": "4.1.11", + "source-map": "0.6.1", + "strip-bom-string": "1.0.0", + "through2": "2.0.3" }, "dependencies": { "acorn": { @@ -5737,13 +5737,13 @@ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "source-map": { @@ -5758,7 +5758,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } }, "through2": { @@ -5767,8 +5767,8 @@ "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "dev": true, "requires": { - "readable-stream": "^2.1.5", - "xtend": "~4.0.1" + "readable-stream": "2.3.6", + "xtend": "4.0.1" } } } @@ -5779,14 +5779,14 @@ "integrity": "sha512-KVffbGY9d4Wv90bW/B1KZJyunLMyfHTBbilpDvmcrj5Go0/a1G3uVpt+1gRBWSw/11dqR3coJ1oWNTt1AiXuWQ==", "dev": true, "requires": { - "gulplog": "^1.0.0", - "has-gulplog": "^0.1.0", - "lodash": "^4.13.1", - "make-error-cause": "^1.1.1", - "safe-buffer": "^5.1.2", - "through2": "^2.0.0", - "uglify-js": "^3.0.5", - "vinyl-sourcemaps-apply": "^0.2.0" + "gulplog": "1.0.0", + "has-gulplog": "0.1.0", + "lodash": "4.17.19", + "make-error-cause": "1.2.2", + "safe-buffer": "5.1.2", + "through2": "2.0.3", + "uglify-js": "3.4.6", + "vinyl-sourcemaps-apply": "0.2.1" }, "dependencies": { "isarray": { @@ -5801,13 +5801,13 @@ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "string_decoder": { @@ -5816,7 +5816,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } }, "through2": { @@ -5825,8 +5825,8 @@ "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "dev": true, "requires": { - "readable-stream": "^2.1.5", - "xtend": "~4.0.1" + "readable-stream": "2.3.6", + "xtend": "4.0.1" } } } @@ -5837,24 +5837,24 @@ "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=", "dev": true, "requires": { - "array-differ": "^1.0.0", - "array-uniq": "^1.0.2", - "beeper": "^1.0.0", - "chalk": "^1.0.0", - "dateformat": "^2.0.0", - "fancy-log": "^1.1.0", - "gulplog": "^1.0.0", - "has-gulplog": "^0.1.0", - "lodash._reescape": "^3.0.0", - "lodash._reevaluate": "^3.0.0", - "lodash._reinterpolate": "^3.0.0", - "lodash.template": "^3.0.0", - "minimist": "^1.1.0", - "multipipe": "^0.1.2", - "object-assign": "^3.0.0", + "array-differ": "1.0.0", + "array-uniq": "1.0.3", + "beeper": "1.1.1", + "chalk": "1.1.3", + "dateformat": "2.2.0", + "fancy-log": "1.3.2", + "gulplog": "1.0.0", + "has-gulplog": "0.1.0", + "lodash._reescape": "3.0.0", + "lodash._reevaluate": "3.0.0", + "lodash._reinterpolate": "3.0.0", + "lodash.template": "3.6.2", + "minimist": "1.2.0", + "multipipe": "0.1.2", + "object-assign": "3.0.0", "replace-ext": "0.0.1", - "through2": "^2.0.0", - "vinyl": "^0.5.0" + "through2": "2.0.5", + "vinyl": "0.5.3" }, "dependencies": { "clone": { @@ -5887,8 +5887,8 @@ "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=", "dev": true, "requires": { - "clone": "^1.0.0", - "clone-stats": "^0.0.1", + "clone": "1.0.4", + "clone-stats": "0.0.1", "replace-ext": "0.0.1" } } @@ -5900,18 +5900,18 @@ "integrity": "sha1-4JmSFl2XxYZWFtZCoWAVKbA2cGQ=", "dev": true, "requires": { - "connect": "^3.0.1", - "connect-livereload": "^0.4.0", - "gulp-util": "^2.2.19", + "connect": "3.6.6", + "connect-livereload": "0.4.1", + "gulp-util": "2.2.20", "isarray": "0.0.1", - "node.extend": "^1.0.10", - "open": "^0.0.5", - "proxy-middleware": "^0.5.0", - "serve-index": "^1.1.4", - "serve-static": "^1.3.0", - "through2": "^0.5.1", + "node.extend": "1.1.6", + "open": "0.0.5", + "proxy-middleware": "0.5.1", + "serve-index": "1.9.1", + "serve-static": "1.13.2", + "through2": "0.5.1", "tiny-lr": "0.1.4", - "watch": "^0.11.0" + "watch": "0.11.0" }, "dependencies": { "ansi-regex": { @@ -5932,11 +5932,11 @@ "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=", "dev": true, "requires": { - "ansi-styles": "^1.1.0", - "escape-string-regexp": "^1.0.0", - "has-ansi": "^0.1.0", - "strip-ansi": "^0.3.0", - "supports-color": "^0.2.0" + "ansi-styles": "1.1.0", + "escape-string-regexp": "1.0.5", + "has-ansi": "0.1.0", + "strip-ansi": "0.3.0", + "supports-color": "0.2.0" } }, "clone-stats": { @@ -5951,8 +5951,8 @@ "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=", "dev": true, "requires": { - "get-stdin": "^4.0.1", - "meow": "^3.3.0" + "get-stdin": "4.0.1", + "meow": "3.7.0" } }, "gulp-util": { @@ -5961,14 +5961,14 @@ "integrity": "sha1-1xRuVyiRC9jwR6awseVJvCLb1kw=", "dev": true, "requires": { - "chalk": "^0.5.0", - "dateformat": "^1.0.7-1.2.3", - "lodash._reinterpolate": "^2.4.1", - "lodash.template": "^2.4.1", - "minimist": "^0.2.0", - "multipipe": "^0.1.0", - "through2": "^0.5.0", - "vinyl": "^0.2.1" + "chalk": "0.5.1", + "dateformat": "1.0.12", + "lodash._reinterpolate": "2.4.1", + "lodash.template": "2.4.1", + "minimist": "0.2.0", + "multipipe": "0.1.2", + "through2": "0.5.1", + "vinyl": "0.2.3" } }, "has-ansi": { @@ -5977,7 +5977,7 @@ "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=", "dev": true, "requires": { - "ansi-regex": "^0.2.0" + "ansi-regex": "0.2.1" } }, "lodash._reinterpolate": { @@ -5992,9 +5992,9 @@ "integrity": "sha1-LOEsXghNsKV92l5dHu659dF1o7Q=", "dev": true, "requires": { - "lodash._escapehtmlchar": "~2.4.1", - "lodash._reunescapedhtml": "~2.4.1", - "lodash.keys": "~2.4.1" + "lodash._escapehtmlchar": "2.4.1", + "lodash._reunescapedhtml": "2.4.1", + "lodash.keys": "2.4.1" } }, "lodash.keys": { @@ -6003,9 +6003,9 @@ "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", "dev": true, "requires": { - "lodash._isnative": "~2.4.1", - "lodash._shimkeys": "~2.4.1", - "lodash.isobject": "~2.4.1" + "lodash._isnative": "2.4.1", + "lodash._shimkeys": "2.4.1", + "lodash.isobject": "2.4.1" } }, "lodash.template": { @@ -6014,13 +6014,13 @@ "integrity": "sha1-nmEQB+32KRKal0qzxIuBez4c8g0=", "dev": true, "requires": { - "lodash._escapestringchar": "~2.4.1", - "lodash._reinterpolate": "~2.4.1", - "lodash.defaults": "~2.4.1", - "lodash.escape": "~2.4.1", - "lodash.keys": "~2.4.1", - "lodash.templatesettings": "~2.4.1", - "lodash.values": "~2.4.1" + "lodash._escapestringchar": "2.4.1", + "lodash._reinterpolate": "2.4.1", + "lodash.defaults": "2.4.1", + "lodash.escape": "2.4.1", + "lodash.keys": "2.4.1", + "lodash.templatesettings": "2.4.1", + "lodash.values": "2.4.1" } }, "lodash.templatesettings": { @@ -6029,8 +6029,8 @@ "integrity": "sha1-6nbHXRHrhtTb6JqDiTu4YZKaxpk=", "dev": true, "requires": { - "lodash._reinterpolate": "~2.4.1", - "lodash.escape": "~2.4.1" + "lodash._reinterpolate": "2.4.1", + "lodash.escape": "2.4.1" } }, "minimist": { @@ -6045,7 +6045,7 @@ "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=", "dev": true, "requires": { - "ansi-regex": "^0.2.1" + "ansi-regex": "0.2.1" } }, "supports-color": { @@ -6060,8 +6060,8 @@ "integrity": "sha1-390BLrnHAOIyP9M084rGIqs3Lac=", "dev": true, "requires": { - "readable-stream": "~1.0.17", - "xtend": "~3.0.0" + "readable-stream": "1.0.34", + "xtend": "3.0.0" } }, "vinyl": { @@ -6070,7 +6070,7 @@ "integrity": "sha1-vKk4IJWC7FpJrVOKAPofEl5RMlI=", "dev": true, "requires": { - "clone-stats": "~0.0.1" + "clone-stats": "0.0.1" } }, "xtend": { @@ -6087,7 +6087,7 @@ "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=", "dev": true, "requires": { - "glogg": "^1.0.0" + "glogg": "1.0.1" } }, "har-schema": { @@ -6102,8 +6102,8 @@ "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==", "dev": true, "requires": { - "ajv": "^6.5.5", - "har-schema": "^2.0.0" + "ajv": "6.7.0", + "har-schema": "2.0.0" }, "dependencies": { "ajv": { @@ -6112,10 +6112,10 @@ "integrity": "sha512-RZXPviBTtfmtka9n9sy1N5M5b82CbxWIR6HIis4s3WQTXDJamc/0gpCWNGz6EWdWp4DOfjzJfhz/AS9zVPjjWg==", "dev": true, "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" + "fast-deep-equal": "2.0.1", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.4.1", + "uri-js": "4.2.2" } } } @@ -6126,7 +6126,7 @@ "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", "dev": true, "requires": { - "function-bind": "^1.1.1" + "function-bind": "1.1.1" } }, "has-ansi": { @@ -6135,7 +6135,7 @@ "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "2.1.1" } }, "has-binary2": { @@ -6179,7 +6179,7 @@ "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=", "dev": true, "requires": { - "sparkles": "^1.0.0" + "sparkles": "1.0.1" } }, "has-symbols": { @@ -6200,9 +6200,9 @@ "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", "dev": true, "requires": { - "get-value": "^2.0.6", - "has-values": "^1.0.0", - "isobject": "^3.0.0" + "get-value": "2.0.6", + "has-values": "1.0.0", + "isobject": "3.0.1" }, "dependencies": { "isobject": { @@ -6219,8 +6219,8 @@ "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", "dev": true, "requires": { - "is-number": "^3.0.0", - "kind-of": "^4.0.0" + "is-number": "3.0.0", + "kind-of": "4.0.0" }, "dependencies": { "is-number": { @@ -6229,7 +6229,7 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { "kind-of": { @@ -6238,7 +6238,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -6249,7 +6249,7 @@ "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -6260,8 +6260,8 @@ "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=", "dev": true, "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" + "inherits": "2.0.3", + "safe-buffer": "5.1.2" } }, "hash.js": { @@ -6270,8 +6270,8 @@ "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", "dev": true, "requires": { - "inherits": "^2.0.3", - "minimalistic-assert": "^1.0.1" + "inherits": "2.0.3", + "minimalistic-assert": "1.0.1" } }, "hmac-drbg": { @@ -6280,9 +6280,9 @@ "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", "dev": true, "requires": { - "hash.js": "^1.0.3", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.1" + "hash.js": "1.1.7", + "minimalistic-assert": "1.0.1", + "minimalistic-crypto-utils": "1.0.1" } }, "home-or-tmp": { @@ -6291,8 +6291,8 @@ "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=", "dev": true, "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.1" + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" } }, "homedir-polyfill": { @@ -6301,7 +6301,7 @@ "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==", "dev": true, "requires": { - "parse-passwd": "^1.0.0" + "parse-passwd": "1.0.0" } }, "hosted-git-info": { @@ -6322,11 +6322,11 @@ "integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=", "dev": true, "requires": { - "domelementtype": "1", - "domhandler": "2.3", - "domutils": "1.5", - "entities": "1.0", - "readable-stream": "1.1" + "domelementtype": "1.3.0", + "domhandler": "2.3.0", + "domutils": "1.5.1", + "entities": "1.0.0", + "readable-stream": "1.1.14" }, "dependencies": { "isarray": { @@ -6341,10 +6341,10 @@ "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", + "core-util-is": "1.0.2", + "inherits": "2.0.3", "isarray": "0.0.1", - "string_decoder": "~0.10.x" + "string_decoder": "0.10.31" } }, "string_decoder": { @@ -6361,10 +6361,10 @@ "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", "dev": true, "requires": { - "depd": "~1.1.2", + "depd": "1.1.2", "inherits": "2.0.3", "setprototypeof": "1.1.0", - "statuses": ">= 1.4.0 < 2" + "statuses": "1.5.0" }, "dependencies": { "statuses": { @@ -6387,8 +6387,8 @@ "integrity": "sha1-ZC/cr/5S00SNK9o7AHnpQJBk2jE=", "dev": true, "requires": { - "eventemitter3": "1.x.x", - "requires-port": "1.x.x" + "eventemitter3": "1.2.0", + "requires-port": "1.0.0" } }, "http-signature": { @@ -6397,9 +6397,9 @@ "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", "dev": true, "requires": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" + "assert-plus": "1.0.0", + "jsprim": "1.4.1", + "sshpk": "1.16.0" } }, "https-browserify": { @@ -6414,7 +6414,7 @@ "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", "dev": true, "requires": { - "safer-buffer": ">= 2.1.2 < 3" + "safer-buffer": "2.1.2" } }, "ieee754": { @@ -6453,7 +6453,7 @@ "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", "dev": true, "requires": { - "repeating": "^2.0.0" + "repeating": "2.0.1" } }, "indexof": { @@ -6468,8 +6468,8 @@ "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "requires": { - "once": "^1.3.0", - "wrappy": "1" + "once": "1.4.0", + "wrappy": "1.0.2" } }, "inherits": { @@ -6490,7 +6490,7 @@ "integrity": "sha1-+Tk0ccGKedFyT4Y/o4tYY3Ct4qU=", "dev": true, "requires": { - "source-map": "~0.5.3" + "source-map": "0.5.7" }, "dependencies": { "source-map": { @@ -6507,16 +6507,16 @@ "integrity": "sha512-VE6NlW+WGn2/AeOMd496AHFYmE7eLKkUY6Ty31k4og5vmA3Fjuwe9v6ifH6Xx/Hz27QvdoMoviw1/pqWRB09Sw==", "dev": true, "requires": { - "JSONStream": "^1.0.3", - "acorn-node": "^1.5.2", - "combine-source-map": "^0.8.0", - "concat-stream": "^1.6.1", - "is-buffer": "^1.1.0", - "path-is-absolute": "^1.0.1", - "process": "~0.11.0", - "through2": "^2.0.0", - "undeclared-identifiers": "^1.1.2", - "xtend": "^4.0.0" + "JSONStream": "1.3.5", + "acorn-node": "1.6.2", + "combine-source-map": "0.8.0", + "concat-stream": "1.6.2", + "is-buffer": "1.1.6", + "path-is-absolute": "1.0.1", + "process": "0.11.10", + "through2": "2.0.5", + "undeclared-identifiers": "1.1.2", + "xtend": "4.0.1" }, "dependencies": { "isarray": { @@ -6531,13 +6531,13 @@ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "string_decoder": { @@ -6546,7 +6546,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } }, "through2": { @@ -6555,8 +6555,8 @@ "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", "dev": true, "requires": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" + "readable-stream": "2.3.6", + "xtend": "4.0.1" } } } @@ -6573,7 +6573,7 @@ "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", "dev": true, "requires": { - "loose-envify": "^1.0.0" + "loose-envify": "1.4.0" } }, "invert-kv": { @@ -6600,8 +6600,8 @@ "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==", "dev": true, "requires": { - "is-relative": "^1.0.0", - "is-windows": "^1.0.1" + "is-relative": "1.0.0", + "is-windows": "1.0.2" } }, "is-accessor-descriptor": { @@ -6610,7 +6610,7 @@ "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { "kind-of": { @@ -6619,7 +6619,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -6636,7 +6636,7 @@ "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", "dev": true, "requires": { - "binary-extensions": "^1.0.0" + "binary-extensions": "1.11.0" } }, "is-buffer": { @@ -6651,7 +6651,7 @@ "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", "dev": true, "requires": { - "builtin-modules": "^1.0.0" + "builtin-modules": "1.1.1" } }, "is-callable": { @@ -6666,7 +6666,7 @@ "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { "kind-of": { @@ -6675,7 +6675,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -6692,9 +6692,9 @@ "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", "dev": true, "requires": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" }, "dependencies": { "kind-of": { @@ -6717,7 +6717,7 @@ "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", "dev": true, "requires": { - "is-primitive": "^2.0.0" + "is-primitive": "2.0.0" } }, "is-extendable": { @@ -6738,7 +6738,7 @@ "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", "dev": true, "requires": { - "number-is-nan": "^1.0.0" + "number-is-nan": "1.0.1" } }, "is-fullwidth-code-point": { @@ -6747,7 +6747,7 @@ "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, "requires": { - "number-is-nan": "^1.0.0" + "number-is-nan": "1.0.1" } }, "is-glob": { @@ -6756,7 +6756,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "^1.0.0" + "is-extglob": "1.0.0" } }, "is-number": { @@ -6765,7 +6765,7 @@ "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { "kind-of": { @@ -6774,7 +6774,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -6785,7 +6785,7 @@ "integrity": "sha512-6rZi3ezCyFcn5L71ywzz2bS5b2Igl1En3eTlZlvKjpz1n3IZLAYMbKYAIQgFmEu0GENg92ziU/faEOA/aixjbA==", "dev": true, "requires": { - "lodash.isfinite": "^3.3.2" + "lodash.isfinite": "3.3.2" } }, "is-path-cwd": { @@ -6800,7 +6800,7 @@ "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==", "dev": true, "requires": { - "is-path-inside": "^1.0.0" + "is-path-inside": "1.0.1" } }, "is-path-inside": { @@ -6809,7 +6809,7 @@ "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", "dev": true, "requires": { - "path-is-inside": "^1.0.1" + "path-is-inside": "1.0.2" } }, "is-plain-object": { @@ -6818,7 +6818,7 @@ "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", "dev": true, "requires": { - "isobject": "^3.0.1" + "isobject": "3.0.1" }, "dependencies": { "isobject": { @@ -6853,7 +6853,7 @@ "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", "dev": true, "requires": { - "has": "^1.0.1" + "has": "1.0.3" } }, "is-relative": { @@ -6862,7 +6862,7 @@ "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==", "dev": true, "requires": { - "is-unc-path": "^1.0.0" + "is-unc-path": "1.0.0" } }, "is-resolvable": { @@ -6889,7 +6889,7 @@ "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==", "dev": true, "requires": { - "unc-path-regex": "^0.1.2" + "unc-path-regex": "0.1.2" } }, "is-utf8": { @@ -6962,8 +6962,8 @@ "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==", "dev": true, "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" + "argparse": "1.0.10", + "esprima": "4.0.1" } }, "jsbn": { @@ -6984,14 +6984,14 @@ "integrity": "sha1-HnJSkVzmgbQIJ+4UJIxG006apiw=", "dev": true, "requires": { - "cli": "~1.0.0", - "console-browserify": "1.1.x", - "exit": "0.1.x", - "htmlparser2": "3.8.x", - "lodash": "3.7.x", - "minimatch": "~3.0.2", - "shelljs": "0.3.x", - "strip-json-comments": "1.0.x" + "cli": "1.0.1", + "console-browserify": "1.1.0", + "exit": "0.1.2", + "htmlparser2": "3.8.3", + "lodash": "3.7.0", + "minimatch": "3.0.4", + "shelljs": "0.3.0", + "strip-json-comments": "1.0.4" }, "dependencies": { "lodash": { @@ -7014,12 +7014,12 @@ "integrity": "sha1-JCCCosA1rgP9gQROBXDMQgjPbmE=", "dev": true, "requires": { - "beeper": "^1.1.0", - "chalk": "^1.0.0", - "log-symbols": "^1.0.0", - "plur": "^2.1.0", - "string-length": "^1.0.0", - "text-table": "^0.2.0" + "beeper": "1.1.1", + "chalk": "1.1.3", + "log-symbols": "1.0.2", + "plur": "2.1.2", + "string-length": "1.0.1", + "text-table": "0.2.0" } }, "jshint-stylish-summary": { @@ -7028,14 +7028,14 @@ "integrity": "sha1-K3s+o8Ol1NdP2iqQ0dYGd0ONspA=", "dev": true, "requires": { - "chalk": "^1.1.1", - "extend": "^3.0.0", - "log-symbols": "^1.0.2", + "chalk": "1.1.3", + "extend": "3.0.1", + "log-symbols": "1.0.2", "map-stream": "0.0.6", - "plur": "^2.1.2", - "sprintf-js": "^1.0.3", - "string-length": "^1.0.1", - "text-table": "^0.2.0" + "plur": "2.1.2", + "sprintf-js": "1.0.3", + "string-length": "1.0.1", + "text-table": "0.2.0" } }, "jshint-summary": { @@ -7044,10 +7044,10 @@ "integrity": "sha1-1lUeUfnOoFsGh6riCtolf5YkksA=", "dev": true, "requires": { - "chalk": "^0.4.0", - "cli-table": "^0.3.0", - "coffee-script": "^1.7.1", - "wordwrap": "^0.0.2" + "chalk": "0.4.0", + "cli-table": "0.3.1", + "coffee-script": "1.12.7", + "wordwrap": "0.0.2" }, "dependencies": { "ansi-styles": { @@ -7062,9 +7062,9 @@ "integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=", "dev": true, "requires": { - "ansi-styles": "~1.0.0", - "has-color": "~0.1.0", - "strip-ansi": "~0.1.0" + "ansi-styles": "1.0.0", + "has-color": "0.1.7", + "strip-ansi": "0.1.1" } }, "strip-ansi": { @@ -7093,7 +7093,7 @@ "integrity": "sha1-YRwj6BTbN1Un34URk9tZ3Sryf0U=", "dev": true, "requires": { - "jsonify": "~0.0.0" + "jsonify": "0.0.0" } }, "json-stable-stringify-without-jsonify": { @@ -7120,7 +7120,7 @@ "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=", "dev": true, "requires": { - "graceful-fs": "^4.1.6" + "graceful-fs": "4.1.11" } }, "jsonify": { @@ -7159,9 +7159,9 @@ "integrity": "sha512-MC94mHZRvJ3LfykJlTUipBqenZz1pacOZEMhhQ8dMGcDHs0SBE5GbsavUXV7YtP3icBW17W0Zy1I0lfASmo9Pg==", "dev": true, "requires": { - "inherits": "^2.0.1", - "isarray": "^2.0.4", - "stream-splicer": "^2.0.0" + "inherits": "2.0.3", + "isarray": "2.0.4", + "stream-splicer": "2.0.0" }, "dependencies": { "isarray": { @@ -7178,7 +7178,7 @@ "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", "dev": true, "requires": { - "invert-kv": "^1.0.0" + "invert-kv": "1.0.0" } }, "levn": { @@ -7187,8 +7187,8 @@ "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", "dev": true, "requires": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" + "prelude-ls": "1.1.2", + "type-check": "0.3.2" } }, "liftoff": { @@ -7197,14 +7197,14 @@ "integrity": "sha1-IAkpG7Mc6oYbvxCnwVooyvdcMew=", "dev": true, "requires": { - "extend": "^3.0.0", - "findup-sync": "^2.0.0", - "fined": "^1.0.1", - "flagged-respawn": "^1.0.0", - "is-plain-object": "^2.0.4", - "object.map": "^1.0.0", - "rechoir": "^0.6.2", - "resolve": "^1.1.7" + "extend": "3.0.1", + "findup-sync": "2.0.0", + "fined": "1.2.0", + "flagged-respawn": "1.0.1", + "is-plain-object": "2.0.4", + "object.map": "1.0.1", + "rechoir": "0.6.2", + "resolve": "1.8.1" } }, "limiter": { @@ -7219,11 +7219,11 @@ "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "strip-bom": "^2.0.0" + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" }, "dependencies": { "pify": { @@ -7240,7 +7240,7 @@ "integrity": "sha1-VuC/CL2XCLJqdltoUJhAyN7J/bw=", "dev": true, "requires": { - "find-cache-dir": "^0.1.1", + "find-cache-dir": "0.1.1", "mkdirp": "0.5.1" }, "dependencies": { @@ -7250,9 +7250,9 @@ "integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=", "dev": true, "requires": { - "commondir": "^1.0.1", - "mkdirp": "^0.5.1", - "pkg-dir": "^1.0.0" + "commondir": "1.0.1", + "mkdirp": "0.5.1", + "pkg-dir": "1.0.0" } }, "find-up": { @@ -7261,8 +7261,8 @@ "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" } }, "path-exists": { @@ -7271,7 +7271,7 @@ "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { - "pinkie-promise": "^2.0.0" + "pinkie-promise": "2.0.1" } }, "pkg-dir": { @@ -7280,7 +7280,7 @@ "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=", "dev": true, "requires": { - "find-up": "^1.0.0" + "find-up": "1.1.2" } } } @@ -7291,9 +7291,9 @@ "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=", "dev": true, "requires": { - "big.js": "^3.1.3", - "emojis-list": "^2.0.0", - "json5": "^0.5.0" + "big.js": "3.2.0", + "emojis-list": "2.1.0", + "json5": "0.5.1" } }, "localtunnel": { @@ -7323,19 +7323,19 @@ "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=", "dev": true, "requires": { - "camelcase": "^3.0.0", - "cliui": "^3.2.0", - "decamelize": "^1.1.1", - "get-caller-file": "^1.0.1", - "os-locale": "^1.4.0", - "read-pkg-up": "^1.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^1.0.2", - "which-module": "^1.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^4.2.0" + "camelcase": "3.0.0", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.3", + "os-locale": "1.4.0", + "read-pkg-up": "1.0.1", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "1.0.2", + "which-module": "1.0.0", + "y18n": "3.2.1", + "yargs-parser": "4.2.1" } } } @@ -7346,8 +7346,8 @@ "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", "dev": true, "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" + "p-locate": "2.0.0", + "path-exists": "3.0.0" } }, "lodash": { @@ -7379,7 +7379,7 @@ "integrity": "sha1-32fDu2t+jh6DGrSL+geVuSr+iZ0=", "dev": true, "requires": { - "lodash._htmlescapes": "~2.4.1" + "lodash._htmlescapes": "2.4.1" } }, "lodash._escapestringchar": { @@ -7442,8 +7442,8 @@ "integrity": "sha1-dHxPxAED6zu4oJduVx96JlnpO6c=", "dev": true, "requires": { - "lodash._htmlescapes": "~2.4.1", - "lodash.keys": "~2.4.1" + "lodash._htmlescapes": "2.4.1", + "lodash.keys": "2.4.1" }, "dependencies": { "lodash.keys": { @@ -7452,9 +7452,9 @@ "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", "dev": true, "requires": { - "lodash._isnative": "~2.4.1", - "lodash._shimkeys": "~2.4.1", - "lodash.isobject": "~2.4.1" + "lodash._isnative": "2.4.1", + "lodash._shimkeys": "2.4.1", + "lodash.isobject": "2.4.1" } } } @@ -7471,7 +7471,7 @@ "integrity": "sha1-bpzJZm/wgfC1psl4uD4kLmlJ0gM=", "dev": true, "requires": { - "lodash._objecttypes": "~2.4.1" + "lodash._objecttypes": "2.4.1" } }, "lodash.assign": { @@ -7492,8 +7492,8 @@ "integrity": "sha1-p+iIXwXmiFEUS24SqPNngCa8TFQ=", "dev": true, "requires": { - "lodash._objecttypes": "~2.4.1", - "lodash.keys": "~2.4.1" + "lodash._objecttypes": "2.4.1", + "lodash.keys": "2.4.1" }, "dependencies": { "lodash.keys": { @@ -7502,9 +7502,9 @@ "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", "dev": true, "requires": { - "lodash._isnative": "~2.4.1", - "lodash._shimkeys": "~2.4.1", - "lodash.isobject": "~2.4.1" + "lodash._isnative": "2.4.1", + "lodash._shimkeys": "2.4.1", + "lodash.isobject": "2.4.1" } } } @@ -7515,7 +7515,7 @@ "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=", "dev": true, "requires": { - "lodash._root": "^3.0.0" + "lodash._root": "3.0.1" } }, "lodash.isarguments": { @@ -7542,7 +7542,7 @@ "integrity": "sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU=", "dev": true, "requires": { - "lodash._objecttypes": "~2.4.1" + "lodash._objecttypes": "2.4.1" } }, "lodash.keys": { @@ -7551,9 +7551,9 @@ "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", "dev": true, "requires": { - "lodash._getnative": "^3.0.0", - "lodash.isarguments": "^3.0.0", - "lodash.isarray": "^3.0.0" + "lodash._getnative": "3.9.1", + "lodash.isarguments": "3.1.0", + "lodash.isarray": "3.0.4" } }, "lodash.memoize": { @@ -7586,15 +7586,15 @@ "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=", "dev": true, "requires": { - "lodash._basecopy": "^3.0.0", - "lodash._basetostring": "^3.0.0", - "lodash._basevalues": "^3.0.0", - "lodash._isiterateecall": "^3.0.0", - "lodash._reinterpolate": "^3.0.0", - "lodash.escape": "^3.0.0", - "lodash.keys": "^3.0.0", - "lodash.restparam": "^3.0.0", - "lodash.templatesettings": "^3.0.0" + "lodash._basecopy": "3.0.1", + "lodash._basetostring": "3.0.1", + "lodash._basevalues": "3.0.0", + "lodash._isiterateecall": "3.0.9", + "lodash._reinterpolate": "3.0.0", + "lodash.escape": "3.2.0", + "lodash.keys": "3.1.2", + "lodash.restparam": "3.6.1", + "lodash.templatesettings": "3.1.1" } }, "lodash.templatesettings": { @@ -7603,8 +7603,8 @@ "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=", "dev": true, "requires": { - "lodash._reinterpolate": "^3.0.0", - "lodash.escape": "^3.0.0" + "lodash._reinterpolate": "3.0.0", + "lodash.escape": "3.2.0" } }, "lodash.values": { @@ -7613,7 +7613,7 @@ "integrity": "sha1-q/UUQ2s8twUAFieXjLzzCxKA7qQ=", "dev": true, "requires": { - "lodash.keys": "~2.4.1" + "lodash.keys": "2.4.1" }, "dependencies": { "lodash.keys": { @@ -7622,9 +7622,9 @@ "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", "dev": true, "requires": { - "lodash._isnative": "~2.4.1", - "lodash._shimkeys": "~2.4.1", - "lodash.isobject": "~2.4.1" + "lodash._isnative": "2.4.1", + "lodash._shimkeys": "2.4.1", + "lodash.isobject": "2.4.1" } } } @@ -7635,7 +7635,7 @@ "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=", "dev": true, "requires": { - "chalk": "^1.0.0" + "chalk": "1.1.3" } }, "loose-envify": { @@ -7644,7 +7644,7 @@ "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", "dev": true, "requires": { - "js-tokens": "^3.0.0 || ^4.0.0" + "js-tokens": "3.0.2" } }, "loud-rejection": { @@ -7653,8 +7653,8 @@ "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", "dev": true, "requires": { - "currently-unhandled": "^0.4.1", - "signal-exit": "^3.0.0" + "currently-unhandled": "0.4.1", + "signal-exit": "3.0.2" } }, "lru-cache": { @@ -7669,7 +7669,7 @@ "integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=", "dev": true, "requires": { - "es5-ext": "~0.10.2" + "es5-ext": "0.10.45" } }, "make-dir": { @@ -7678,7 +7678,7 @@ "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", "dev": true, "requires": { - "pify": "^3.0.0" + "pify": "3.0.0" } }, "make-error": { @@ -7693,7 +7693,7 @@ "integrity": "sha1-3wOI/NCzeBbf8KX7gQiTl3fcvJ0=", "dev": true, "requires": { - "make-error": "^1.2.0" + "make-error": "1.3.4" } }, "make-iterator": { @@ -7702,7 +7702,7 @@ "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==", "dev": true, "requires": { - "kind-of": "^6.0.2" + "kind-of": "6.0.3" }, "dependencies": { "kind-of": { @@ -7737,7 +7737,7 @@ "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", "dev": true, "requires": { - "object-visit": "^1.0.0" + "object-visit": "1.0.1" } }, "math-random": { @@ -7752,9 +7752,9 @@ "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==", "dev": true, "requires": { - "hash-base": "^3.0.0", - "inherits": "^2.0.1", - "safe-buffer": "^5.1.2" + "hash-base": "3.0.4", + "inherits": "2.0.3", + "safe-buffer": "5.1.2" } }, "media-typer": { @@ -7769,14 +7769,14 @@ "integrity": "sha512-sprBu6nwxBWBvBOh5v2jcsGqiGLlL2xr2dLub3vR8dnE8YB17omwtm/0NSHl8jjNbcsJd5GMWJAnTSVe/O0Wfg==", "dev": true, "requires": { - "d": "1", - "es5-ext": "^0.10.30", - "es6-weak-map": "^2.0.2", - "event-emitter": "^0.3.5", - "is-promise": "^2.1", - "lru-queue": "0.1", - "next-tick": "1", - "timers-ext": "^0.1.2" + "d": "1.0.0", + "es5-ext": "0.10.45", + "es6-weak-map": "2.0.2", + "event-emitter": "0.3.5", + "is-promise": "2.1.0", + "lru-queue": "0.1.0", + "next-tick": "1.0.0", + "timers-ext": "0.1.5" } }, "meow": { @@ -7785,16 +7785,16 @@ "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "dev": true, "requires": { - "camelcase-keys": "^2.0.0", - "decamelize": "^1.1.2", - "loud-rejection": "^1.0.0", - "map-obj": "^1.0.1", - "minimist": "^1.1.3", - "normalize-package-data": "^2.3.4", - "object-assign": "^4.0.1", - "read-pkg-up": "^1.0.1", - "redent": "^1.0.0", - "trim-newlines": "^1.0.0" + "camelcase-keys": "2.1.0", + "decamelize": "1.2.0", + "loud-rejection": "1.6.0", + "map-obj": "1.0.1", + "minimist": "1.2.0", + "normalize-package-data": "2.4.0", + "object-assign": "4.1.1", + "read-pkg-up": "1.0.1", + "redent": "1.0.0", + "trim-newlines": "1.0.0" } }, "micromatch": { @@ -7803,19 +7803,19 @@ "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", "dev": true, "requires": { - "arr-diff": "^2.0.0", - "array-unique": "^0.2.1", - "braces": "^1.8.2", - "expand-brackets": "^0.1.4", - "extglob": "^0.3.1", - "filename-regex": "^2.0.0", - "is-extglob": "^1.0.0", - "is-glob": "^2.0.1", - "kind-of": "^3.0.2", - "normalize-path": "^2.0.1", - "object.omit": "^2.0.0", - "parse-glob": "^3.0.4", - "regex-cache": "^0.4.2" + "arr-diff": "2.0.0", + "array-unique": "0.2.1", + "braces": "1.8.5", + "expand-brackets": "0.1.5", + "extglob": "0.3.2", + "filename-regex": "2.0.1", + "is-extglob": "1.0.0", + "is-glob": "2.0.1", + "kind-of": "3.2.2", + "normalize-path": "2.1.1", + "object.omit": "2.0.1", + "parse-glob": "3.0.4", + "regex-cache": "0.4.4" }, "dependencies": { "arr-diff": { @@ -7824,7 +7824,7 @@ "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", "dev": true, "requires": { - "arr-flatten": "^1.0.1" + "arr-flatten": "1.1.0" } }, "kind-of": { @@ -7833,7 +7833,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -7844,8 +7844,8 @@ "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", "dev": true, "requires": { - "bn.js": "^4.0.0", - "brorand": "^1.0.1" + "bn.js": "4.11.8", + "brorand": "1.1.0" } }, "mime": { @@ -7866,7 +7866,7 @@ "integrity": "sha512-P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw==", "dev": true, "requires": { - "mime-db": "~1.35.0" + "mime-db": "1.35.0" } }, "mimic-fn": { @@ -7893,7 +7893,7 @@ "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, "requires": { - "brace-expansion": "^1.1.7" + "brace-expansion": "1.1.11" } }, "minimist": { @@ -7908,8 +7908,8 @@ "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", "dev": true, "requires": { - "for-in": "^1.0.2", - "is-extendable": "^1.0.1" + "for-in": "1.0.2", + "is-extendable": "1.0.1" }, "dependencies": { "is-extendable": { @@ -7918,7 +7918,7 @@ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, "requires": { - "is-plain-object": "^2.0.4" + "is-plain-object": "2.0.4" } } } @@ -7946,21 +7946,21 @@ "integrity": "sha512-hKPmO06so6bL/ZvqVNVqdTVO8UAYsi3tQWlCa+z9KuWhoN4KDQtb5hcqQQv58qYiDE21wIvnttZEPiDgEbpwbA==", "dev": true, "requires": { - "JSONStream": "^1.0.3", - "browser-resolve": "^1.7.0", - "cached-path-relative": "^1.0.0", - "concat-stream": "~1.6.0", - "defined": "^1.0.0", - "detective": "^5.0.2", - "duplexer2": "^0.1.2", - "inherits": "^2.0.1", - "parents": "^1.0.0", - "readable-stream": "^2.0.2", - "resolve": "^1.4.0", - "stream-combiner2": "^1.1.1", - "subarg": "^1.0.0", - "through2": "^2.0.0", - "xtend": "^4.0.0" + "JSONStream": "1.3.5", + "browser-resolve": "1.11.3", + "cached-path-relative": "1.0.2", + "concat-stream": "1.6.2", + "defined": "1.0.0", + "detective": "5.1.0", + "duplexer2": "0.1.4", + "inherits": "2.0.3", + "parents": "1.0.1", + "readable-stream": "2.3.6", + "resolve": "1.8.1", + "stream-combiner2": "1.1.1", + "subarg": "1.0.0", + "through2": "2.0.5", + "xtend": "4.0.1" }, "dependencies": { "isarray": { @@ -7975,13 +7975,13 @@ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "string_decoder": { @@ -7990,7 +7990,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } }, "through2": { @@ -7999,8 +7999,8 @@ "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", "dev": true, "requires": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" + "readable-stream": "2.3.6", + "xtend": "4.0.1" } } } @@ -8026,7 +8026,7 @@ "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=", "dev": true, "requires": { - "readable-stream": "~1.1.9" + "readable-stream": "1.1.14" } }, "readable-stream": { @@ -8035,10 +8035,10 @@ "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", + "core-util-is": "1.0.2", + "inherits": "2.0.3", "isarray": "0.0.1", - "string_decoder": "~0.10.x" + "string_decoder": "0.10.31" } } } @@ -8061,17 +8061,17 @@ "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", "dev": true, "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "fragment-cache": "^0.2.1", - "is-windows": "^1.0.2", - "kind-of": "^6.0.2", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "fragment-cache": "0.2.1", + "is-windows": "1.0.2", + "kind-of": "6.0.3", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" }, "dependencies": { "arr-diff": { @@ -8092,8 +8092,8 @@ "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "dev": true, "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" } }, "is-extendable": { @@ -8102,7 +8102,7 @@ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, "requires": { - "is-plain-object": "^2.0.4" + "is-plain-object": "2.0.4" } }, "kind-of": { @@ -8149,18 +8149,18 @@ "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==", "dev": true, "requires": { - "fstream": "^1.0.0", - "glob": "^7.0.3", - "graceful-fs": "^4.1.2", - "mkdirp": "^0.5.0", - "nopt": "2 || 3", - "npmlog": "0 || 1 || 2 || 3 || 4", - "osenv": "0", - "request": "^2.87.0", - "rimraf": "2", - "semver": "~5.3.0", - "tar": "^2.0.0", - "which": "1" + "fstream": "1.0.11", + "glob": "7.1.2", + "graceful-fs": "4.1.11", + "mkdirp": "0.5.1", + "nopt": "3.0.6", + "npmlog": "4.1.2", + "osenv": "0.1.5", + "request": "2.88.0", + "rimraf": "2.6.2", + "semver": "5.3.0", + "tar": "2.2.1", + "which": "1.3.1" }, "dependencies": { "semver": { @@ -8177,25 +8177,25 @@ "integrity": "sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==", "dev": true, "requires": { - "async-foreach": "^0.1.3", - "chalk": "^1.1.1", - "cross-spawn": "^3.0.0", - "gaze": "^1.0.0", - "get-stdin": "^4.0.1", - "glob": "^7.0.3", - "in-publish": "^2.0.0", - "lodash.assign": "^4.2.0", - "lodash.clonedeep": "^4.3.2", - "lodash.mergewith": "^4.6.0", - "meow": "^3.7.0", - "mkdirp": "^0.5.1", - "nan": "^2.10.0", - "node-gyp": "^3.8.0", - "npmlog": "^4.0.0", - "request": "^2.88.0", - "sass-graph": "^2.2.4", - "stdout-stream": "^1.4.0", - "true-case-path": "^1.0.2" + "async-foreach": "0.1.3", + "chalk": "1.1.3", + "cross-spawn": "3.0.1", + "gaze": "1.1.3", + "get-stdin": "4.0.1", + "glob": "7.1.2", + "in-publish": "2.0.0", + "lodash.assign": "4.2.0", + "lodash.clonedeep": "4.5.0", + "lodash.mergewith": "4.6.1", + "meow": "3.7.0", + "mkdirp": "0.5.1", + "nan": "2.10.0", + "node-gyp": "3.8.0", + "npmlog": "4.1.2", + "request": "2.88.0", + "sass-graph": "2.2.4", + "stdout-stream": "1.4.1", + "true-case-path": "1.0.3" }, "dependencies": { "cross-spawn": { @@ -8204,8 +8204,8 @@ "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", "dev": true, "requires": { - "lru-cache": "^4.0.1", - "which": "^1.2.9" + "lru-cache": "4.1.5", + "which": "1.3.1" } }, "gaze": { @@ -8214,7 +8214,7 @@ "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==", "dev": true, "requires": { - "globule": "^1.0.0" + "globule": "1.2.1" } }, "globule": { @@ -8223,9 +8223,9 @@ "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==", "dev": true, "requires": { - "glob": "~7.1.1", - "lodash": "~4.17.10", - "minimatch": "~3.0.2" + "glob": "7.1.2", + "lodash": "4.17.19", + "minimatch": "3.0.4" } }, "lru-cache": { @@ -8234,8 +8234,8 @@ "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", "dev": true, "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" + "pseudomap": "1.0.2", + "yallist": "2.1.2" } } } @@ -8246,7 +8246,7 @@ "integrity": "sha1-p7iCyC1sk6SGOlUEvV3o7IYli5Y=", "dev": true, "requires": { - "is": "^3.1.0" + "is": "3.2.1" } }, "nopt": { @@ -8255,7 +8255,7 @@ "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", "dev": true, "requires": { - "abbrev": "1" + "abbrev": "1.1.1" } }, "normalize-package-data": { @@ -8264,10 +8264,10 @@ "integrity": "sha1-EvlaMH1YNSB1oEkHuErIvpisAS8=", "dev": true, "requires": { - "hosted-git-info": "^2.1.4", - "is-builtin-module": "^1.0.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" + "hosted-git-info": "2.7.1", + "is-builtin-module": "1.0.0", + "semver": "5.5.0", + "validate-npm-package-license": "3.0.3" } }, "normalize-path": { @@ -8276,7 +8276,7 @@ "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", "dev": true, "requires": { - "remove-trailing-separator": "^1.0.1" + "remove-trailing-separator": "1.1.0" } }, "normalize-range": { @@ -8291,10 +8291,10 @@ "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "dev": true, "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" + "are-we-there-yet": "1.1.5", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" } }, "num2fraction": { @@ -8333,9 +8333,9 @@ "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", "dev": true, "requires": { - "copy-descriptor": "^0.1.0", - "define-property": "^0.2.5", - "kind-of": "^3.0.3" + "copy-descriptor": "0.1.1", + "define-property": "0.2.5", + "kind-of": "3.2.2" }, "dependencies": { "define-property": { @@ -8344,7 +8344,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } }, "kind-of": { @@ -8353,7 +8353,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -8382,7 +8382,7 @@ "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", "dev": true, "requires": { - "isobject": "^3.0.0" + "isobject": "3.0.1" }, "dependencies": { "isobject": { @@ -8399,10 +8399,10 @@ "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=", "dev": true, "requires": { - "array-each": "^1.0.1", - "array-slice": "^1.0.0", - "for-own": "^1.0.0", - "isobject": "^3.0.0" + "array-each": "1.0.1", + "array-slice": "1.1.0", + "for-own": "1.0.0", + "isobject": "3.0.1" }, "dependencies": { "array-slice": { @@ -8417,7 +8417,7 @@ "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", "dev": true, "requires": { - "for-in": "^1.0.1" + "for-in": "1.0.2" } }, "isobject": { @@ -8434,8 +8434,8 @@ "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=", "dev": true, "requires": { - "for-own": "^1.0.0", - "make-iterator": "^1.0.0" + "for-own": "1.0.0", + "make-iterator": "1.0.1" }, "dependencies": { "for-own": { @@ -8444,7 +8444,7 @@ "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", "dev": true, "requires": { - "for-in": "^1.0.1" + "for-in": "1.0.2" } } } @@ -8455,8 +8455,8 @@ "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", "dev": true, "requires": { - "for-own": "^0.1.4", - "is-extendable": "^0.1.1" + "for-own": "0.1.5", + "is-extendable": "0.1.1" } }, "object.pick": { @@ -8465,7 +8465,7 @@ "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", "dev": true, "requires": { - "isobject": "^3.0.1" + "isobject": "3.0.1" }, "dependencies": { "isobject": { @@ -8491,7 +8491,7 @@ "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "requires": { - "wrappy": "1" + "wrappy": "1.0.2" } }, "open": { @@ -8512,8 +8512,8 @@ "integrity": "sha1-erwi5kTf9jsKltWrfyeQwPAavJU=", "dev": true, "requires": { - "object-assign": "^4.0.1", - "pinkie-promise": "^2.0.0" + "object-assign": "4.1.1", + "pinkie-promise": "2.0.1" } }, "optionator": { @@ -8522,12 +8522,12 @@ "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", "dev": true, "requires": { - "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.4", - "levn": "~0.3.0", - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2", - "wordwrap": "~1.0.0" + "deep-is": "0.1.3", + "fast-levenshtein": "2.0.6", + "levn": "0.3.0", + "prelude-ls": "1.1.2", + "type-check": "0.3.2", + "wordwrap": "1.0.0" }, "dependencies": { "wordwrap": { @@ -8544,9 +8544,9 @@ "integrity": "sha1-FOfp4nZPcxX7rBhOUGx6pt+UrX4=", "dev": true, "requires": { - "end-of-stream": "~0.1.5", - "sequencify": "~0.0.7", - "stream-consume": "~0.1.0" + "end-of-stream": "0.1.5", + "sequencify": "0.0.7", + "stream-consume": "0.1.1" } }, "ordered-read-streams": { @@ -8573,7 +8573,7 @@ "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", "dev": true, "requires": { - "lcid": "^1.0.0" + "lcid": "1.0.0" } }, "os-tmpdir": { @@ -8588,8 +8588,8 @@ "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", "dev": true, "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" } }, "p-limit": { @@ -8598,7 +8598,7 @@ "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", "dev": true, "requires": { - "p-try": "^1.0.0" + "p-try": "1.0.0" } }, "p-locate": { @@ -8607,7 +8607,7 @@ "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", "dev": true, "requires": { - "p-limit": "^1.1.0" + "p-limit": "1.3.0" } }, "p-try": { @@ -8628,7 +8628,7 @@ "integrity": "sha1-/t1NK/GTp3dF/nHjcdc8MwfZx1E=", "dev": true, "requires": { - "path-platform": "~0.11.15" + "path-platform": "0.11.15" } }, "parse-asn1": { @@ -8637,12 +8637,12 @@ "integrity": "sha512-VrPoetlz7B/FqjBLD2f5wBVZvsZVLnRUrxVLfRYhGXCODa/NWE4p3Wp+6+aV3ZPL3KM7/OZmxDIwwijD7yuucg==", "dev": true, "requires": { - "asn1.js": "^4.0.0", - "browserify-aes": "^1.0.0", - "create-hash": "^1.1.0", - "evp_bytestokey": "^1.0.0", - "pbkdf2": "^3.0.3", - "safe-buffer": "^5.1.1" + "asn1.js": "4.10.1", + "browserify-aes": "1.2.0", + "create-hash": "1.2.0", + "evp_bytestokey": "1.0.3", + "pbkdf2": "3.0.17", + "safe-buffer": "5.1.2" } }, "parse-filepath": { @@ -8651,9 +8651,9 @@ "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=", "dev": true, "requires": { - "is-absolute": "^1.0.0", - "map-cache": "^0.2.0", - "path-root": "^0.1.1" + "is-absolute": "1.0.0", + "map-cache": "0.2.2", + "path-root": "0.1.1" } }, "parse-glob": { @@ -8662,10 +8662,10 @@ "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", "dev": true, "requires": { - "glob-base": "^0.3.0", - "is-dotfile": "^1.0.0", - "is-extglob": "^1.0.0", - "is-glob": "^2.0.0" + "glob-base": "0.3.0", + "is-dotfile": "1.0.3", + "is-extglob": "1.0.0", + "is-glob": "2.0.1" } }, "parse-json": { @@ -8674,7 +8674,7 @@ "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "dev": true, "requires": { - "error-ex": "^1.2.0" + "error-ex": "1.3.2" } }, "parse-passwd": { @@ -8689,7 +8689,7 @@ "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=", "dev": true, "requires": { - "better-assert": "~1.0.0" + "better-assert": "1.0.2" } }, "parserlib": { @@ -8704,7 +8704,7 @@ "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=", "dev": true, "requires": { - "better-assert": "~1.0.0" + "better-assert": "1.0.2" } }, "parseurl": { @@ -8767,7 +8767,7 @@ "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=", "dev": true, "requires": { - "path-root-regex": "^0.1.0" + "path-root-regex": "0.1.2" } }, "path-root-regex": { @@ -8782,9 +8782,9 @@ "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" + "graceful-fs": "4.1.11", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" }, "dependencies": { "pify": { @@ -8801,11 +8801,11 @@ "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==", "dev": true, "requires": { - "create-hash": "^1.1.2", - "create-hmac": "^1.1.4", - "ripemd160": "^2.0.1", - "safe-buffer": "^5.0.1", - "sha.js": "^2.4.8" + "create-hash": "1.2.0", + "create-hmac": "1.1.7", + "ripemd160": "2.0.2", + "safe-buffer": "5.1.2", + "sha.js": "2.4.11" } }, "performance-now": { @@ -8832,7 +8832,7 @@ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "pinkie": "^2.0.0" + "pinkie": "2.0.4" } }, "pkg-dir": { @@ -8841,7 +8841,7 @@ "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", "dev": true, "requires": { - "find-up": "^2.1.0" + "find-up": "2.1.0" } }, "plugin-error": { @@ -8850,11 +8850,11 @@ "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=", "dev": true, "requires": { - "ansi-cyan": "^0.1.1", - "ansi-red": "^0.1.1", - "arr-diff": "^1.0.1", - "arr-union": "^2.0.1", - "extend-shallow": "^1.1.2" + "ansi-cyan": "0.1.1", + "ansi-red": "0.1.1", + "arr-diff": "1.1.0", + "arr-union": "2.1.0", + "extend-shallow": "1.1.4" } }, "plur": { @@ -8863,7 +8863,7 @@ "integrity": "sha1-dIJFLBoPUI4+NE6uwxLJHCncZVo=", "dev": true, "requires": { - "irregular-plurals": "^1.0.0" + "irregular-plurals": "1.4.0" } }, "pluralize": { @@ -8879,7 +8879,7 @@ "dev": true, "requires": { "async": "1.5.2", - "is-number-like": "^1.0.3" + "is-number-like": "1.0.8" } }, "posix-character-classes": { @@ -8894,9 +8894,9 @@ "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==", "dev": true, "requires": { - "chalk": "^2.4.1", - "source-map": "^0.6.1", - "supports-color": "^5.4.0" + "chalk": "2.4.1", + "source-map": "0.6.1", + "supports-color": "5.4.0" }, "dependencies": { "ansi-styles": { @@ -8905,7 +8905,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "^1.9.0" + "color-convert": "1.9.2" } }, "chalk": { @@ -8914,9 +8914,9 @@ "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.4.0" } }, "source-map": { @@ -8931,7 +8931,7 @@ "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", "dev": true, "requires": { - "has-flag": "^3.0.0" + "has-flag": "3.0.0" } } } @@ -9008,12 +9008,12 @@ "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==", "dev": true, "requires": { - "bn.js": "^4.1.0", - "browserify-rsa": "^4.0.0", - "create-hash": "^1.1.0", - "parse-asn1": "^5.0.0", - "randombytes": "^2.0.1", - "safe-buffer": "^5.1.2" + "bn.js": "4.11.8", + "browserify-rsa": "4.0.1", + "create-hash": "1.2.0", + "parse-asn1": "5.1.3", + "randombytes": "2.0.6", + "safe-buffer": "5.1.2" } }, "punycode": { @@ -9046,9 +9046,9 @@ "integrity": "sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==", "dev": true, "requires": { - "is-number": "^4.0.0", - "kind-of": "^6.0.0", - "math-random": "^1.0.1" + "is-number": "4.0.0", + "kind-of": "6.0.2", + "math-random": "1.0.1" }, "dependencies": { "is-number": { @@ -9071,7 +9071,7 @@ "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==", "dev": true, "requires": { - "safe-buffer": "^5.1.0" + "safe-buffer": "5.1.2" } }, "randomfill": { @@ -9080,8 +9080,8 @@ "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", "dev": true, "requires": { - "randombytes": "^2.0.5", - "safe-buffer": "^5.1.0" + "randombytes": "2.0.6", + "safe-buffer": "5.1.2" } }, "range-parser": { @@ -9108,7 +9108,7 @@ "integrity": "sha1-8+gPOH3fmugK4wpBADKWQuroERU=", "dev": true, "requires": { - "lodash.clonedeep": "^4.3.2" + "lodash.clonedeep": "4.5.0" } }, "rcloader": { @@ -9117,10 +9117,10 @@ "integrity": "sha1-WNIpi0YtC5v9ITPSoex0+9cFxxc=", "dev": true, "requires": { - "lodash.assign": "^4.2.0", - "lodash.isobject": "^3.0.2", - "lodash.merge": "^4.6.0", - "rcfinder": "^0.1.6" + "lodash.assign": "4.2.0", + "lodash.isobject": "3.0.2", + "lodash.merge": "4.6.1", + "rcfinder": "0.1.9" }, "dependencies": { "lodash.isobject": { @@ -9137,7 +9137,7 @@ "integrity": "sha1-JyT9aoET1zdkrCiNQ4YnDB2/F/A=", "dev": true, "requires": { - "readable-stream": "^2.0.2" + "readable-stream": "2.3.6" }, "dependencies": { "isarray": { @@ -9152,13 +9152,13 @@ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "string_decoder": { @@ -9167,7 +9167,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } } } @@ -9178,9 +9178,9 @@ "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", "dev": true, "requires": { - "load-json-file": "^1.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^1.0.0" + "load-json-file": "1.1.0", + "normalize-package-data": "2.4.0", + "path-type": "1.1.0" } }, "read-pkg-up": { @@ -9189,8 +9189,8 @@ "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", "dev": true, "requires": { - "find-up": "^1.0.0", - "read-pkg": "^1.0.0" + "find-up": "1.1.2", + "read-pkg": "1.1.0" }, "dependencies": { "find-up": { @@ -9199,8 +9199,8 @@ "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" } }, "path-exists": { @@ -9209,7 +9209,7 @@ "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { - "pinkie-promise": "^2.0.0" + "pinkie-promise": "2.0.1" } } } @@ -9220,10 +9220,10 @@ "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", + "core-util-is": "1.0.2", + "inherits": "2.0.3", "isarray": "0.0.1", - "string_decoder": "~0.10.x" + "string_decoder": "0.10.31" } }, "readdirp": { @@ -9232,10 +9232,10 @@ "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "minimatch": "^3.0.2", - "readable-stream": "^2.0.2", - "set-immediate-shim": "^1.0.1" + "graceful-fs": "4.1.11", + "minimatch": "3.0.4", + "readable-stream": "2.3.6", + "set-immediate-shim": "1.0.1" }, "dependencies": { "isarray": { @@ -9250,13 +9250,13 @@ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "string_decoder": { @@ -9265,7 +9265,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } } } @@ -9276,7 +9276,7 @@ "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", "dev": true, "requires": { - "resolve": "^1.1.6" + "resolve": "1.8.1" } }, "redent": { @@ -9285,8 +9285,8 @@ "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", "dev": true, "requires": { - "indent-string": "^2.1.0", - "strip-indent": "^1.0.1" + "indent-string": "2.1.0", + "strip-indent": "1.0.1" } }, "regenerate": { @@ -9307,9 +9307,9 @@ "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==", "dev": true, "requires": { - "babel-runtime": "^6.18.0", - "babel-types": "^6.19.0", - "private": "^0.1.6" + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "private": "0.1.8" } }, "regex-cache": { @@ -9318,7 +9318,7 @@ "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", "dev": true, "requires": { - "is-equal-shallow": "^0.1.3" + "is-equal-shallow": "0.1.3" } }, "regex-not": { @@ -9327,8 +9327,8 @@ "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", "dev": true, "requires": { - "extend-shallow": "^3.0.2", - "safe-regex": "^1.1.0" + "extend-shallow": "3.0.2", + "safe-regex": "1.1.0" }, "dependencies": { "extend-shallow": { @@ -9337,8 +9337,8 @@ "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "dev": true, "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" } }, "is-extendable": { @@ -9347,7 +9347,7 @@ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, "requires": { - "is-plain-object": "^2.0.4" + "is-plain-object": "2.0.4" } } } @@ -9358,7 +9358,7 @@ "integrity": "sha512-ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA==", "dev": true, "requires": { - "define-properties": "^1.1.2" + "define-properties": "1.1.2" } }, "regexpp": { @@ -9373,9 +9373,9 @@ "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=", "dev": true, "requires": { - "regenerate": "^1.2.1", - "regjsgen": "^0.2.0", - "regjsparser": "^0.1.4" + "regenerate": "1.4.0", + "regjsgen": "0.2.0", + "regjsparser": "0.1.5" } }, "regjsgen": { @@ -9390,7 +9390,7 @@ "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", "dev": true, "requires": { - "jsesc": "~0.5.0" + "jsesc": "0.5.0" }, "dependencies": { "jsesc": { @@ -9425,7 +9425,7 @@ "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", "dev": true, "requires": { - "is-finite": "^1.0.0" + "is-finite": "1.0.2" } }, "replace-ext": { @@ -9440,26 +9440,26 @@ "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", "dev": true, "requires": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "har-validator": "~5.1.0", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", - "performance-now": "^2.1.0", - "qs": "~6.5.2", - "safe-buffer": "^5.1.2", - "tough-cookie": "~2.4.3", - "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" + "aws-sign2": "0.7.0", + "aws4": "1.8.0", + "caseless": "0.12.0", + "combined-stream": "1.0.7", + "extend": "3.0.2", + "forever-agent": "0.6.1", + "form-data": "2.3.3", + "har-validator": "5.1.3", + "http-signature": "1.2.0", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.19", + "oauth-sign": "0.9.0", + "performance-now": "2.1.0", + "qs": "6.5.2", + "safe-buffer": "5.1.2", + "tough-cookie": "2.4.3", + "tunnel-agent": "0.6.0", + "uuid": "3.3.2" }, "dependencies": { "extend": { @@ -9494,8 +9494,8 @@ "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=", "dev": true, "requires": { - "caller-path": "^0.1.0", - "resolve-from": "^1.0.0" + "caller-path": "0.1.0", + "resolve-from": "1.0.1" } }, "requirejs": { @@ -9520,7 +9520,7 @@ "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==", "dev": true, "requires": { - "path-parse": "^1.0.5" + "path-parse": "1.0.5" } }, "resolve-dir": { @@ -9529,8 +9529,8 @@ "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=", "dev": true, "requires": { - "expand-tilde": "^2.0.0", - "global-modules": "^1.0.0" + "expand-tilde": "2.0.2", + "global-modules": "1.0.0" } }, "resolve-from": { @@ -9551,8 +9551,8 @@ "integrity": "sha1-sSTeXE+6/LpUH0j/pzlw9KpFa08=", "dev": true, "requires": { - "debug": "^2.2.0", - "minimatch": "^3.0.2" + "debug": "2.6.9", + "minimatch": "3.0.4" } }, "ret": { @@ -9567,7 +9567,7 @@ "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", "dev": true, "requires": { - "glob": "^7.0.5" + "glob": "7.1.2" } }, "ripemd160": { @@ -9576,8 +9576,8 @@ "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", "dev": true, "requires": { - "hash-base": "^3.0.0", - "inherits": "^2.0.1" + "hash-base": "3.0.4", + "inherits": "2.0.3" } }, "rx": { @@ -9607,7 +9607,7 @@ "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "dev": true, "requires": { - "ret": "~0.1.10" + "ret": "0.1.15" } }, "safer-buffer": { @@ -9622,10 +9622,10 @@ "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=", "dev": true, "requires": { - "glob": "^7.0.0", - "lodash": "^4.0.0", - "scss-tokenizer": "^0.2.3", - "yargs": "^7.0.0" + "glob": "7.1.2", + "lodash": "4.17.19", + "scss-tokenizer": "0.2.3", + "yargs": "7.1.0" }, "dependencies": { "yargs": { @@ -9634,19 +9634,19 @@ "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", "dev": true, "requires": { - "camelcase": "^3.0.0", - "cliui": "^3.2.0", - "decamelize": "^1.1.1", - "get-caller-file": "^1.0.1", - "os-locale": "^1.4.0", - "read-pkg-up": "^1.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^1.0.2", - "which-module": "^1.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^5.0.0" + "camelcase": "3.0.0", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.3", + "os-locale": "1.4.0", + "read-pkg-up": "1.0.1", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "1.0.2", + "which-module": "1.0.0", + "y18n": "3.2.1", + "yargs-parser": "5.0.0" } }, "yargs-parser": { @@ -9655,7 +9655,7 @@ "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=", "dev": true, "requires": { - "camelcase": "^3.0.0" + "camelcase": "3.0.0" } } } @@ -9666,8 +9666,8 @@ "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", "dev": true, "requires": { - "js-base64": "^2.1.8", - "source-map": "^0.4.2" + "js-base64": "2.5.1", + "source-map": "0.4.4" }, "dependencies": { "source-map": { @@ -9676,7 +9676,7 @@ "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { - "amdefine": ">=0.0.4" + "amdefine": "1.0.1" } } } @@ -9694,18 +9694,18 @@ "dev": true, "requires": { "debug": "2.6.9", - "depd": "~1.1.2", - "destroy": "~1.0.4", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", + "depd": "1.1.2", + "destroy": "1.0.4", + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "etag": "1.8.1", "fresh": "0.5.2", - "http-errors": "~1.6.2", + "http-errors": "1.6.3", "mime": "1.4.1", "ms": "2.0.0", - "on-finished": "~2.3.0", - "range-parser": "~1.2.0", - "statuses": "~1.4.0" + "on-finished": "2.3.0", + "range-parser": "1.2.0", + "statuses": "1.4.0" }, "dependencies": { "statuses": { @@ -9728,13 +9728,13 @@ "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=", "dev": true, "requires": { - "accepts": "~1.3.4", + "accepts": "1.3.5", "batch": "0.6.1", "debug": "2.6.9", - "escape-html": "~1.0.3", - "http-errors": "~1.6.2", - "mime-types": "~2.1.17", - "parseurl": "~1.3.2" + "escape-html": "1.0.3", + "http-errors": "1.6.3", + "mime-types": "2.1.19", + "parseurl": "1.3.2" } }, "serve-static": { @@ -9743,9 +9743,9 @@ "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==", "dev": true, "requires": { - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "parseurl": "~1.3.2", + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "parseurl": "1.3.2", "send": "0.16.2" } }, @@ -9773,10 +9773,10 @@ "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", "dev": true, "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.3", - "split-string": "^3.0.1" + "extend-shallow": "2.0.1", + "is-extendable": "0.1.1", + "is-plain-object": "2.0.4", + "split-string": "3.1.0" }, "dependencies": { "extend-shallow": { @@ -9785,7 +9785,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -9802,8 +9802,8 @@ "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", "dev": true, "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" + "inherits": "2.0.3", + "safe-buffer": "5.1.2" } }, "shasum": { @@ -9812,8 +9812,8 @@ "integrity": "sha1-5wEjENj0F/TetXEhUOVni4euVl8=", "dev": true, "requires": { - "json-stable-stringify": "~0.0.0", - "sha.js": "~2.4.4" + "json-stable-stringify": "0.0.1", + "sha.js": "2.4.11" } }, "shebang-command": { @@ -9822,7 +9822,7 @@ "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", "dev": true, "requires": { - "shebang-regex": "^1.0.0" + "shebang-regex": "1.0.0" } }, "shebang-regex": { @@ -9837,10 +9837,10 @@ "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=", "dev": true, "requires": { - "array-filter": "~0.0.0", - "array-map": "~0.0.0", - "array-reduce": "~0.0.0", - "jsonify": "~0.0.0" + "array-filter": "0.0.1", + "array-map": "0.0.0", + "array-reduce": "0.0.0", + "jsonify": "0.0.0" } }, "shelljs": { @@ -9879,7 +9879,7 @@ "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0" + "is-fullwidth-code-point": "2.0.0" }, "dependencies": { "is-fullwidth-code-point": { @@ -9896,14 +9896,14 @@ "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", "dev": true, "requires": { - "base": "^0.11.1", - "debug": "^2.2.0", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "map-cache": "^0.2.2", - "source-map": "^0.5.6", - "source-map-resolve": "^0.5.0", - "use": "^3.1.0" + "base": "0.11.2", + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "map-cache": "0.2.2", + "source-map": "0.5.7", + "source-map-resolve": "0.5.2", + "use": "3.1.1" }, "dependencies": { "define-property": { @@ -9912,7 +9912,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } }, "extend-shallow": { @@ -9921,7 +9921,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } }, "source-map": { @@ -9938,9 +9938,9 @@ "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", "dev": true, "requires": { - "define-property": "^1.0.0", - "isobject": "^3.0.0", - "snapdragon-util": "^3.0.1" + "define-property": "1.0.0", + "isobject": "3.0.1", + "snapdragon-util": "3.0.1" }, "dependencies": { "define-property": { @@ -9949,7 +9949,7 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "is-descriptor": "^1.0.0" + "is-descriptor": "1.0.2" } }, "is-accessor-descriptor": { @@ -9958,7 +9958,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.3" } }, "is-data-descriptor": { @@ -9967,7 +9967,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.3" } }, "is-descriptor": { @@ -9976,9 +9976,9 @@ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.3" } }, "isobject": { @@ -10001,7 +10001,7 @@ "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", "dev": true, "requires": { - "kind-of": "^3.2.0" + "kind-of": "3.2.2" }, "dependencies": { "kind-of": { @@ -10010,7 +10010,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -10021,12 +10021,12 @@ "integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==", "dev": true, "requires": { - "debug": "~3.1.0", - "engine.io": "~3.2.0", - "has-binary2": "~1.0.2", - "socket.io-adapter": "~1.1.0", + "debug": "3.1.0", + "engine.io": "3.2.0", + "has-binary2": "1.0.3", + "socket.io-adapter": "1.1.1", "socket.io-client": "2.1.1", - "socket.io-parser": "~3.2.0" + "socket.io-parser": "3.2.0" }, "dependencies": { "debug": { @@ -10046,14 +10046,14 @@ "requires": { "component-emitter": "1.2.1", "component-inherit": "0.0.3", - "debug": "~3.1.0", - "engine.io-parser": "~2.1.1", + "debug": "3.1.0", + "engine.io-parser": "2.1.2", "has-cors": "1.1.0", "indexof": "0.0.1", "parseqs": "0.0.5", "parseuri": "0.0.5", - "ws": "~3.3.1", - "xmlhttprequest-ssl": "~1.5.4", + "ws": "3.3.3", + "xmlhttprequest-ssl": "1.5.5", "yeast": "0.1.2" } }, @@ -10073,15 +10073,15 @@ "base64-arraybuffer": "0.1.5", "component-bind": "1.0.0", "component-emitter": "1.2.1", - "debug": "~3.1.0", - "engine.io-client": "~3.2.0", - "has-binary2": "~1.0.2", + "debug": "3.1.0", + "engine.io-client": "3.2.1", + "has-binary2": "1.0.3", "has-cors": "1.1.0", "indexof": "0.0.1", "object-component": "0.0.3", "parseqs": "0.0.5", "parseuri": "0.0.5", - "socket.io-parser": "~3.2.0", + "socket.io-parser": "3.2.0", "to-array": "0.1.4" } }, @@ -10092,7 +10092,7 @@ "dev": true, "requires": { "component-emitter": "1.2.1", - "debug": "~3.1.0", + "debug": "3.1.0", "isarray": "2.0.1" } } @@ -10114,14 +10114,14 @@ "base64-arraybuffer": "0.1.5", "component-bind": "1.0.0", "component-emitter": "1.2.1", - "debug": "~2.6.4", - "engine.io-client": "~3.1.0", + "debug": "2.6.9", + "engine.io-client": "3.1.6", "has-cors": "1.1.0", "indexof": "0.0.1", "object-component": "0.0.3", "parseqs": "0.0.5", "parseuri": "0.0.5", - "socket.io-parser": "~3.1.1", + "socket.io-parser": "3.1.3", "to-array": "0.1.4" } }, @@ -10132,8 +10132,8 @@ "dev": true, "requires": { "component-emitter": "1.2.1", - "debug": "~3.1.0", - "has-binary2": "~1.0.2", + "debug": "3.1.0", + "has-binary2": "1.0.3", "isarray": "2.0.1" }, "dependencies": { @@ -10160,7 +10160,7 @@ "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", "dev": true, "requires": { - "amdefine": ">=0.0.4" + "amdefine": "1.0.1" } }, "source-map-resolve": { @@ -10169,11 +10169,11 @@ "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==", "dev": true, "requires": { - "atob": "^2.1.1", - "decode-uri-component": "^0.2.0", - "resolve-url": "^0.2.1", - "source-map-url": "^0.4.0", - "urix": "^0.1.0" + "atob": "2.1.1", + "decode-uri-component": "0.2.0", + "resolve-url": "0.2.1", + "source-map-url": "0.4.0", + "urix": "0.1.0" } }, "source-map-support": { @@ -10182,7 +10182,7 @@ "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", "dev": true, "requires": { - "source-map": "^0.5.6" + "source-map": "0.5.7" }, "dependencies": { "source-map": { @@ -10211,8 +10211,8 @@ "integrity": "sha1-BaW01xU6GVvJLDxCW2nzsqlSTII=", "dev": true, "requires": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" + "spdx-expression-parse": "3.0.0", + "spdx-license-ids": "3.0.0" } }, "spdx-exceptions": { @@ -10227,8 +10227,8 @@ "integrity": "sha1-meEZt6XaAOBUkcn6M4t5BII7QdA=", "dev": true, "requires": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" + "spdx-exceptions": "2.1.0", + "spdx-license-ids": "3.0.0" } }, "spdx-license-ids": { @@ -10243,7 +10243,7 @@ "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", "dev": true, "requires": { - "extend-shallow": "^3.0.0" + "extend-shallow": "3.0.2" }, "dependencies": { "extend-shallow": { @@ -10252,8 +10252,8 @@ "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "dev": true, "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" } }, "is-extendable": { @@ -10262,7 +10262,7 @@ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, "requires": { - "is-plain-object": "^2.0.4" + "is-plain-object": "2.0.4" } } } @@ -10279,15 +10279,15 @@ "integrity": "sha512-Zhev35/y7hRMcID/upReIvRse+I9SVhyVre/KTJSJQWMz3C3+G+HpO7m1wK/yckEtujKZ7dS4hkVxAnmHaIGVQ==", "dev": true, "requires": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "safer-buffer": "^2.0.2", - "tweetnacl": "~0.14.0" + "asn1": "0.2.4", + "assert-plus": "1.0.0", + "bcrypt-pbkdf": "1.0.2", + "dashdash": "1.14.1", + "ecc-jsbn": "0.1.2", + "getpass": "0.1.7", + "jsbn": "0.1.1", + "safer-buffer": "2.1.2", + "tweetnacl": "0.14.5" } }, "static-extend": { @@ -10296,8 +10296,8 @@ "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", "dev": true, "requires": { - "define-property": "^0.2.5", - "object-copy": "^0.1.0" + "define-property": "0.2.5", + "object-copy": "0.1.0" }, "dependencies": { "define-property": { @@ -10306,7 +10306,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } } } @@ -10323,7 +10323,7 @@ "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==", "dev": true, "requires": { - "readable-stream": "^2.0.1" + "readable-stream": "2.3.6" }, "dependencies": { "isarray": { @@ -10338,13 +10338,13 @@ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "string_decoder": { @@ -10353,7 +10353,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } } } @@ -10364,8 +10364,8 @@ "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==", "dev": true, "requires": { - "inherits": "~2.0.1", - "readable-stream": "^2.0.2" + "inherits": "2.0.3", + "readable-stream": "2.3.6" }, "dependencies": { "isarray": { @@ -10380,13 +10380,13 @@ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "string_decoder": { @@ -10395,7 +10395,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } } } @@ -10406,8 +10406,8 @@ "integrity": "sha1-+02KFCDqNidk4hrUeAOXvry0HL4=", "dev": true, "requires": { - "duplexer2": "~0.1.0", - "readable-stream": "^2.0.2" + "duplexer2": "0.1.4", + "readable-stream": "2.3.6" }, "dependencies": { "isarray": { @@ -10422,13 +10422,13 @@ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "string_decoder": { @@ -10437,7 +10437,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } } } @@ -10454,11 +10454,11 @@ "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==", "dev": true, "requires": { - "builtin-status-codes": "^3.0.0", - "inherits": "^2.0.1", - "readable-stream": "^2.3.6", - "to-arraybuffer": "^1.0.0", - "xtend": "^4.0.0" + "builtin-status-codes": "3.0.0", + "inherits": "2.0.3", + "readable-stream": "2.3.6", + "to-arraybuffer": "1.0.1", + "xtend": "4.0.1" }, "dependencies": { "isarray": { @@ -10473,13 +10473,13 @@ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "string_decoder": { @@ -10488,7 +10488,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } } } @@ -10499,8 +10499,8 @@ "integrity": "sha1-G2O+Q4oTPktnHMGTUZdgAXWRDYM=", "dev": true, "requires": { - "inherits": "^2.0.1", - "readable-stream": "^2.0.2" + "inherits": "2.0.3", + "readable-stream": "2.3.6" }, "dependencies": { "isarray": { @@ -10515,13 +10515,13 @@ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "string_decoder": { @@ -10530,7 +10530,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } } } @@ -10541,8 +10541,8 @@ "integrity": "sha1-rdV8jXzHOoFjDTHNVdOWHPr7qcM=", "dev": true, "requires": { - "commander": "^2.2.0", - "limiter": "^1.0.5" + "commander": "2.16.0", + "limiter": "1.1.3" } }, "string-length": { @@ -10551,7 +10551,7 @@ "integrity": "sha1-VpcPscOFWOnnC3KL894mmsRa36w=", "dev": true, "requires": { - "strip-ansi": "^3.0.0" + "strip-ansi": "3.0.1" } }, "string-width": { @@ -10560,9 +10560,9 @@ "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" } }, "string.prototype.matchall": { @@ -10571,11 +10571,11 @@ "integrity": "sha512-WoZ+B2ypng1dp4iFLF2kmZlwwlE19gmjgKuhL1FJfDgCREWb3ye3SDVHSzLH6bxfnvYmkCxbzkmWcQZHA4P//Q==", "dev": true, "requires": { - "define-properties": "^1.1.2", - "es-abstract": "^1.10.0", - "function-bind": "^1.1.1", - "has-symbols": "^1.0.0", - "regexp.prototype.flags": "^1.2.0" + "define-properties": "1.1.2", + "es-abstract": "1.12.0", + "function-bind": "1.1.1", + "has-symbols": "1.0.0", + "regexp.prototype.flags": "1.2.0" } }, "string_decoder": { @@ -10590,7 +10590,7 @@ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "2.1.1" } }, "strip-bom": { @@ -10599,7 +10599,7 @@ "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, "requires": { - "is-utf8": "^0.2.0" + "is-utf8": "0.2.1" } }, "strip-bom-string": { @@ -10614,7 +10614,7 @@ "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", "dev": true, "requires": { - "get-stdin": "^4.0.1" + "get-stdin": "4.0.1" } }, "strip-json-comments": { @@ -10629,7 +10629,7 @@ "integrity": "sha1-9izxdYHplrSPyWVpn1TAauJouNI=", "dev": true, "requires": { - "minimist": "^1.1.0" + "minimist": "1.2.0" } }, "supports-color": { @@ -10650,7 +10650,7 @@ "integrity": "sha512-YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==", "dev": true, "requires": { - "acorn-node": "^1.2.0" + "acorn-node": "1.6.2" } }, "table": { @@ -10659,12 +10659,12 @@ "integrity": "sha512-S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg==", "dev": true, "requires": { - "ajv": "^6.0.1", - "ajv-keywords": "^3.0.0", - "chalk": "^2.1.0", - "lodash": "^4.17.4", + "ajv": "6.5.2", + "ajv-keywords": "3.2.0", + "chalk": "2.4.1", + "lodash": "4.17.19", "slice-ansi": "1.0.0", - "string-width": "^2.1.1" + "string-width": "2.1.1" }, "dependencies": { "ansi-regex": { @@ -10679,7 +10679,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "^1.9.0" + "color-convert": "1.9.2" } }, "chalk": { @@ -10688,9 +10688,9 @@ "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.4.0" } }, "is-fullwidth-code-point": { @@ -10705,8 +10705,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" } }, "strip-ansi": { @@ -10715,7 +10715,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } }, "supports-color": { @@ -10724,7 +10724,7 @@ "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", "dev": true, "requires": { - "has-flag": "^3.0.0" + "has-flag": "3.0.0" } } } @@ -10735,9 +10735,9 @@ "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", "dev": true, "requires": { - "block-stream": "*", - "fstream": "^1.0.2", - "inherits": "2" + "block-stream": "0.0.9", + "fstream": "1.0.11", + "inherits": "2.0.3" } }, "text-table": { @@ -10752,8 +10752,8 @@ "integrity": "sha1-OORBT8ZJd9h6/apy+sttKfgve1s=", "dev": true, "requires": { - "chalk": "^1.1.1", - "object-path": "^0.9.0" + "chalk": "1.1.3", + "object-path": "0.9.2" } }, "through": { @@ -10768,8 +10768,8 @@ "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", "dev": true, "requires": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" + "readable-stream": "2.3.7", + "xtend": "4.0.1" }, "dependencies": { "isarray": { @@ -10784,13 +10784,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "string_decoder": { @@ -10799,7 +10799,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } } } @@ -10810,7 +10810,7 @@ "integrity": "sha1-3OwD9V3Km3qj5bBPIYF+tW5jWIo=", "dev": true, "requires": { - "os-homedir": "^1.0.0" + "os-homedir": "1.0.2" } }, "time-stamp": { @@ -10825,7 +10825,7 @@ "integrity": "sha1-ycWLV1voQHN1y14kYtrO50NZ9B0=", "dev": true, "requires": { - "process": "~0.11.0" + "process": "0.11.10" } }, "timers-ext": { @@ -10834,8 +10834,8 @@ "integrity": "sha1-dxR91OdrZgwqu4eF25ZXTLvRKSI=", "dev": true, "requires": { - "es5-ext": "~0.10.14", - "next-tick": "1" + "es5-ext": "0.10.45", + "next-tick": "1.0.0" } }, "tiny-lr": { @@ -10844,11 +10844,11 @@ "integrity": "sha1-bkHX5n39CHjl4LN+N6BtZ+MJ/00=", "dev": true, "requires": { - "body-parser": "~1.8.0", - "debug": "~0.8.1", - "faye-websocket": "~0.7.2", - "parseurl": "~1.3.0", - "qs": "~2.2.3" + "body-parser": "1.8.4", + "debug": "0.8.1", + "faye-websocket": "0.7.3", + "parseurl": "1.3.2", + "qs": "2.2.5" }, "dependencies": { "debug": { @@ -10871,7 +10871,7 @@ "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", "dev": true, "requires": { - "os-tmpdir": "~1.0.2" + "os-tmpdir": "1.0.2" } }, "to-array": { @@ -10898,7 +10898,7 @@ "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { "kind-of": { @@ -10907,7 +10907,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -10918,10 +10918,10 @@ "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", "dev": true, "requires": { - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "regex-not": "^1.0.2", - "safe-regex": "^1.1.0" + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "regex-not": "1.0.2", + "safe-regex": "1.1.0" }, "dependencies": { "extend-shallow": { @@ -10930,8 +10930,8 @@ "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "dev": true, "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" } }, "is-extendable": { @@ -10940,7 +10940,7 @@ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, "requires": { - "is-plain-object": "^2.0.4" + "is-plain-object": "2.0.4" } } } @@ -10951,8 +10951,8 @@ "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "dev": true, "requires": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" + "is-number": "3.0.0", + "repeat-string": "1.6.1" }, "dependencies": { "is-number": { @@ -10961,7 +10961,7 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" } }, "kind-of": { @@ -10970,7 +10970,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -10981,8 +10981,8 @@ "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", "dev": true, "requires": { - "psl": "^1.1.24", - "punycode": "^1.4.1" + "psl": "1.1.31", + "punycode": "1.4.1" } }, "trim-newlines": { @@ -11003,7 +11003,7 @@ "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==", "dev": true, "requires": { - "glob": "^7.1.2" + "glob": "7.1.2" } }, "tty-browserify": { @@ -11018,7 +11018,7 @@ "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", "dev": true, "requires": { - "safe-buffer": "^5.0.1" + "safe-buffer": "5.1.2" } }, "tweetnacl": { @@ -11033,7 +11033,7 @@ "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", "dev": true, "requires": { - "prelude-ls": "~1.1.2" + "prelude-ls": "1.1.2" } }, "type-is": { @@ -11043,7 +11043,7 @@ "dev": true, "requires": { "media-typer": "0.3.0", - "mime-types": "~2.0.9" + "mime-types": "2.0.14" }, "dependencies": { "mime-db": { @@ -11058,7 +11058,7 @@ "integrity": "sha1-MQ4VnbI+B3+Lsit0jav6SVcUCqY=", "dev": true, "requires": { - "mime-db": "~1.12.0" + "mime-db": "1.12.0" } } } @@ -11081,8 +11081,8 @@ "integrity": "sha512-O1D7L6WcOzS1qW2ehopEm4cWm5yA6bQBozlks8jO8ODxYCy4zv+bR/la4Lwp01tpkYGNonnpXvUpYtrvSu8Yzg==", "dev": true, "requires": { - "commander": "~2.16.0", - "source-map": "~0.6.1" + "commander": "2.16.0", + "source-map": "0.6.1" }, "dependencies": { "source-map": { @@ -11117,10 +11117,10 @@ "integrity": "sha512-13EaeocO4edF/3JKime9rD7oB6QI8llAGhgn5fKOPyfkJbRb6NFv9pYV6dFEmpa4uRjKeBqLZP8GpuzqHlKDMQ==", "dev": true, "requires": { - "acorn-node": "^1.3.0", - "get-assigned-identifiers": "^1.2.0", - "simple-concat": "^1.0.0", - "xtend": "^4.0.1" + "acorn-node": "1.6.2", + "get-assigned-identifiers": "1.2.0", + "simple-concat": "1.0.0", + "xtend": "4.0.1" } }, "union-value": { @@ -11129,10 +11129,10 @@ "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", "dev": true, "requires": { - "arr-union": "^3.1.0", - "get-value": "^2.0.6", - "is-extendable": "^0.1.1", - "set-value": "^2.0.1" + "arr-union": "3.1.0", + "get-value": "2.0.6", + "is-extendable": "0.1.1", + "set-value": "2.0.1" }, "dependencies": { "arr-union": { @@ -11167,8 +11167,8 @@ "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", "dev": true, "requires": { - "has-value": "^0.3.1", - "isobject": "^3.0.0" + "has-value": "0.3.1", + "isobject": "3.0.1" }, "dependencies": { "has-value": { @@ -11177,9 +11177,9 @@ "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", "dev": true, "requires": { - "get-value": "^2.0.3", - "has-values": "^0.1.4", - "isobject": "^2.0.0" + "get-value": "2.0.6", + "has-values": "0.1.4", + "isobject": "2.1.0" }, "dependencies": { "isobject": { @@ -11219,7 +11219,7 @@ "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", "dev": true, "requires": { - "punycode": "^2.1.0" + "punycode": "2.1.1" }, "dependencies": { "punycode": { @@ -11299,7 +11299,7 @@ "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=", "dev": true, "requires": { - "user-home": "^1.1.1" + "user-home": "1.1.1" } }, "validate-npm-package-license": { @@ -11308,8 +11308,8 @@ "integrity": "sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==", "dev": true, "requires": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" + "spdx-correct": "3.0.0", + "spdx-expression-parse": "3.0.0" } }, "verror": { @@ -11318,9 +11318,9 @@ "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "dev": true, "requires": { - "assert-plus": "^1.0.0", + "assert-plus": "1.0.0", "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" + "extsprintf": "1.3.0" } }, "vinyl": { @@ -11329,12 +11329,12 @@ "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==", "dev": true, "requires": { - "clone": "^2.1.1", - "clone-buffer": "^1.0.0", - "clone-stats": "^1.0.0", - "cloneable-readable": "^1.0.0", - "remove-trailing-separator": "^1.0.1", - "replace-ext": "^1.0.0" + "clone": "2.1.1", + "clone-buffer": "1.0.0", + "clone-stats": "1.0.0", + "cloneable-readable": "1.1.2", + "remove-trailing-separator": "1.1.0", + "replace-ext": "1.0.0" } }, "vinyl-buffer": { @@ -11343,8 +11343,8 @@ "integrity": "sha1-lsGjR5uMU5JULGEgKQE7Wyf4i78=", "dev": true, "requires": { - "bl": "^1.2.1", - "through2": "^2.0.3" + "bl": "1.2.2", + "through2": "2.0.3" }, "dependencies": { "isarray": { @@ -11359,13 +11359,13 @@ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "string_decoder": { @@ -11374,7 +11374,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } }, "through2": { @@ -11383,8 +11383,8 @@ "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "dev": true, "requires": { - "readable-stream": "^2.1.5", - "xtend": "~4.0.1" + "readable-stream": "2.3.6", + "xtend": "4.0.1" } } } @@ -11395,14 +11395,14 @@ "integrity": "sha1-mmhRzhysHBzqX+hsCTHWIMLPqeY=", "dev": true, "requires": { - "defaults": "^1.0.0", - "glob-stream": "^3.1.5", - "glob-watcher": "^0.0.6", - "graceful-fs": "^3.0.0", - "mkdirp": "^0.5.0", - "strip-bom": "^1.0.0", - "through2": "^0.6.1", - "vinyl": "^0.4.0" + "defaults": "1.0.3", + "glob-stream": "3.1.18", + "glob-watcher": "0.0.6", + "graceful-fs": "3.0.12", + "mkdirp": "0.5.1", + "strip-bom": "1.0.0", + "through2": "0.6.5", + "vinyl": "0.4.6" }, "dependencies": { "clone": { @@ -11423,7 +11423,7 @@ "integrity": "sha512-J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg==", "dev": true, "requires": { - "natives": "^1.1.3" + "natives": "1.1.6" } }, "strip-bom": { @@ -11432,8 +11432,8 @@ "integrity": "sha1-hbiGLzhEtabV7IRnqTWYFzo295Q=", "dev": true, "requires": { - "first-chunk-stream": "^1.0.0", - "is-utf8": "^0.2.0" + "first-chunk-stream": "1.0.0", + "is-utf8": "0.2.1" } }, "through2": { @@ -11442,8 +11442,8 @@ "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", "dev": true, "requires": { - "readable-stream": ">=1.0.33-1 <1.1.0-0", - "xtend": ">=4.0.0 <4.1.0-0" + "readable-stream": "1.0.34", + "xtend": "4.0.1" } }, "vinyl": { @@ -11452,8 +11452,8 @@ "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=", "dev": true, "requires": { - "clone": "^0.2.0", - "clone-stats": "^0.0.1" + "clone": "0.2.0", + "clone-stats": "0.0.1" } } } @@ -11464,8 +11464,8 @@ "integrity": "sha1-84pa+53R6Ttl1VBGmsYYKsT1S44=", "dev": true, "requires": { - "through2": "^2.0.3", - "vinyl": "^2.1.0" + "through2": "2.0.3", + "vinyl": "2.2.0" }, "dependencies": { "isarray": { @@ -11480,13 +11480,13 @@ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "string_decoder": { @@ -11495,7 +11495,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } }, "through2": { @@ -11504,8 +11504,8 @@ "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "dev": true, "requires": { - "readable-stream": "^2.1.5", - "xtend": "~4.0.1" + "readable-stream": "2.3.6", + "xtend": "4.0.1" } } } @@ -11516,7 +11516,7 @@ "integrity": "sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=", "dev": true, "requires": { - "source-map": "^0.5.1" + "source-map": "0.5.7" }, "dependencies": { "source-map": { @@ -11545,8 +11545,8 @@ "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=", "dev": true, "requires": { - "http-parser-js": ">=0.4.0", - "websocket-extensions": ">=0.1.1" + "http-parser-js": "0.4.13", + "websocket-extensions": "0.1.4" } }, "websocket-extensions": { @@ -11561,7 +11561,7 @@ "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, "requires": { - "isexe": "^2.0.0" + "isexe": "2.0.0" } }, "which-module": { @@ -11576,7 +11576,7 @@ "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", "dev": true, "requires": { - "string-width": "^1.0.2 || 2" + "string-width": "1.0.2" } }, "window-size": { @@ -11597,8 +11597,8 @@ "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", "dev": true, "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" + "string-width": "1.0.2", + "strip-ansi": "3.0.1" } }, "wrappy": { @@ -11613,7 +11613,7 @@ "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=", "dev": true, "requires": { - "mkdirp": "^0.5.1" + "mkdirp": "0.5.1" } }, "ws": { @@ -11622,9 +11622,9 @@ "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==", "dev": true, "requires": { - "async-limiter": "~1.0.0", - "safe-buffer": "~5.1.0", - "ultron": "~1.1.0" + "async-limiter": "1.0.0", + "safe-buffer": "5.1.2", + "ultron": "1.1.1" } }, "xmlhttprequest-ssl": { @@ -11657,20 +11657,20 @@ "integrity": "sha1-gW4ahm1VmMzzTlWW3c4i2S2kkNQ=", "dev": true, "requires": { - "camelcase": "^3.0.0", - "cliui": "^3.2.0", - "decamelize": "^1.1.1", - "get-caller-file": "^1.0.1", - "os-locale": "^1.4.0", - "read-pkg-up": "^1.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^1.0.2", - "which-module": "^1.0.0", - "window-size": "^0.2.0", - "y18n": "^3.2.1", - "yargs-parser": "^4.1.0" + "camelcase": "3.0.0", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.3", + "os-locale": "1.4.0", + "read-pkg-up": "1.0.1", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "1.0.2", + "which-module": "1.0.0", + "window-size": "0.2.0", + "y18n": "3.2.1", + "yargs-parser": "4.2.1" } }, "yargs-parser": { @@ -11679,7 +11679,7 @@ "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=", "dev": true, "requires": { - "camelcase": "^3.0.0" + "camelcase": "3.0.0" } }, "yeast": { diff --git a/zip/build.gradle b/zip/build.gradle index 8db02cb76..767a71355 100644 --- a/zip/build.gradle +++ b/zip/build.gradle @@ -6,40 +6,53 @@ plugins { id 'com.cognifide.aet.java-conventions' } -task copyFeaturesXmlFile(type: Copy) { +def packages = "${buildDir}/packages-${project.version}" + +task zipBundles(type: Zip) { + dependsOn rootProject.getTasksByName('build', true) + archiveFileName = 'bundles.zip' + destinationDirectory = file("$packages") + includeEmptyDirs = false + rootProject.subprojects { subproject -> + from("${subproject.buildDir}/libs") { + include "**/${subproject.name}*.jar" + exclude "*aet-maven-plugin*.jar" + exclude "*-test*.jar" + exclude "*client*.jar" + exclude "*sample-site*.jar" + exclude "*zip*" + rename { "${project.group}.${subproject.name}.jar" } + } + } +} + +task zipConfigs(type: Zip) { + destinationDirectory = file("$packages") + archiveFileName = "configs.zip" + from("${rootDir}/osgi-dependencies/configs/src/main/resources") +} + +task zipFeatures(type: Zip) { + destinationDirectory = file("$packages") + archiveFileName = "features.zip" includeEmptyDirs = false from("${rootDir}/osgi-dependencies") { include "**/aet-features.xml" include "**/aet-webconsole.xml" } - into "${buildDir}" } -task zipConfigs(type: Zip) { - archiveFileName = "${project.group}.configs.zip" - destinationDirectory = file("$buildDir/packages") - from "${rootDir}/osgi-dependencies/configs/src/main/resources" +task zipReport(type: Copy) { + dependsOn project(":report").getTasksByName('build', true) + from("${rootDir}/report/build/distributions/report.zip") + into "$packages" } -task copyArtifacts { - dependsOn rootProject.getTasksByName('build', true) - doLast { - delete "${buildDir}/jars" - copy { - includeEmptyDirs = false - rootProject.subprojects { subproject -> - from("${subproject.buildDir}/libs") { - include "**/${subproject.name}*.jar" - exclude "*aet-maven-plugin*.jar" - exclude "*-test*.jar" - exclude "*client*.jar" - exclude "*zip*" - rename { "${project.group}.${subproject.name}.jar" } - } - } - into "${buildDir}/packages" - } - } +task make { + dependsOn tasks.zipBundles + dependsOn tasks.zipConfigs + dependsOn tasks.zipFeatures + dependsOn tasks.zipReport } description = 'AET' From 13b334c8f93fb97ace86e95605f0c650149fc306 Mon Sep 17 00:00:00 2001 From: Bartosz Zbytniewski Date: Tue, 9 Feb 2021 08:37:37 +0100 Subject: [PATCH 08/15] feature: Add sample site zip --- api/datastorage-api/build.gradle | 2 +- api/jobs-api/build.gradle | 6 +++--- .../com.cognifide.aet.java-conventions.gradle | 8 ++++---- client/aet-maven-plugin/build.gradle | 4 ++-- client/client-core/build.gradle | 2 +- core/accessibility-report/build.gradle | 4 ++-- core/cleaner/build.gradle | 10 +++++----- core/communication/build.gradle | 2 +- core/datastorage/build.gradle | 8 ++++---- core/jobs/build.gradle | 14 +++++++------- core/runner/build.gradle | 6 +++--- core/validation/build.gradle | 2 +- core/worker/build.gradle | 12 ++++++------ integration-tests/cleaner-test/build.gradle | 8 ++++---- integration-tests/sample-site/build.gradle | 1 + osgi-dependencies/proxy/build.gradle | 4 ++-- rest-endpoint/build.gradle | 6 +++--- test-executor/build.gradle | 6 +++--- zip/build.gradle | 14 ++++++++++++-- 19 files changed, 65 insertions(+), 54 deletions(-) diff --git a/api/datastorage-api/build.gradle b/api/datastorage-api/build.gradle index 6b224a02f..ffa13c772 100644 --- a/api/datastorage-api/build.gradle +++ b/api/datastorage-api/build.gradle @@ -8,7 +8,7 @@ plugins { } dependencies { - providedCompile project(':communication-api') + projectCompile project(':communication-api') compileOnly 'com.google.guava:guava:25.1-jre' compileOnly 'javax.validation:validation-api:1.1.0.Final' compileOnly 'org.hibernate:hibernate-validator:4.3.2.Final' diff --git a/api/jobs-api/build.gradle b/api/jobs-api/build.gradle index a0aa333cf..49b4381c6 100644 --- a/api/jobs-api/build.gradle +++ b/api/jobs-api/build.gradle @@ -9,9 +9,9 @@ plugins { dependencies { testImplementation 'junit:junit:4.11' - providedCompile project(':communication-api') - providedCompile project(':datastorage-api') - providedCompile project(':selenium') + projectCompile project(':communication-api') + projectCompile project(':datastorage-api') + projectCompile project(':selenium') implementation 'com.google.guava:guava:25.1-jre' compileOnly 'org.apache.commons:commons-lang3:3.7' compileOnly 'org.apache.httpcomponents:fluent-hc:4.5.5' diff --git a/buildSrc/src/main/groovy/com.cognifide.aet.java-conventions.gradle b/buildSrc/src/main/groovy/com.cognifide.aet.java-conventions.gradle index b6bb292a2..e28919d2a 100644 --- a/buildSrc/src/main/groovy/com.cognifide.aet.java-conventions.gradle +++ b/buildSrc/src/main/groovy/com.cognifide.aet.java-conventions.gradle @@ -31,9 +31,9 @@ tasks.withType(JavaCompile) { options.encoding = 'UTF-8' } -configurations { providedCompile } +configurations { projectCompile } -sourceSets.main.compileClasspath += configurations.providedCompile -sourceSets.test.compileClasspath += configurations.providedCompile -sourceSets.test.runtimeClasspath += configurations.providedCompile +sourceSets.main.compileClasspath += configurations.projectCompile +sourceSets.test.compileClasspath += configurations.projectCompile +sourceSets.test.runtimeClasspath += configurations.projectCompile diff --git a/client/aet-maven-plugin/build.gradle b/client/aet-maven-plugin/build.gradle index c47e795f2..b722d4991 100644 --- a/client/aet-maven-plugin/build.gradle +++ b/client/aet-maven-plugin/build.gradle @@ -7,8 +7,8 @@ plugins { } dependencies { - providedCompile project(':communication-api') - providedCompile project(':client-core') + projectCompile project(':communication-api') + projectCompile project(':client-core') implementation 'org.apache.maven:maven-plugin-api:2.0' implementation 'org.apache.maven:maven-project:2.2.1' implementation 'org.codehaus.plexus:plexus-utils:3.0.8' diff --git a/client/client-core/build.gradle b/client/client-core/build.gradle index ee94b1f59..aed728e19 100644 --- a/client/client-core/build.gradle +++ b/client/client-core/build.gradle @@ -7,7 +7,7 @@ plugins { } dependencies { - providedCompile project(':communication-api') + projectCompile project(':communication-api') implementation 'org.codehaus.plexus:plexus-utils:3.0.8' implementation 'com.google.guava:guava:23.6-jre' implementation 'org.apache.commons:commons-lang3:3.3.2' diff --git a/core/accessibility-report/build.gradle b/core/accessibility-report/build.gradle index 71fd38a03..fbc6b4d66 100644 --- a/core/accessibility-report/build.gradle +++ b/core/accessibility-report/build.gradle @@ -11,8 +11,8 @@ plugins { dependencies { implementation 'org.apache.poi:ooxml-schemas:1.4' implementation 'org.jetbrains:annotations:19.0.0' - providedCompile project(':communication-api') - providedCompile project(':datastorage-api') + projectCompile project(':communication-api') + projectCompile project(':datastorage-api') compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0' compileOnly 'org.osgi:org.osgi.annotation:6.0.0' compileOnly 'org.osgi:org.osgi.service.metatype.annotations:1.3.0' diff --git a/core/cleaner/build.gradle b/core/cleaner/build.gradle index 183fb1fff..5cf74d2c9 100644 --- a/core/cleaner/build.gradle +++ b/core/cleaner/build.gradle @@ -17,11 +17,11 @@ dependencies { testImplementation 'org.hamcrest:hamcrest-all:1.3' testImplementation 'com.googlecode.zohhak:zohhak:1.1.1' testImplementation 'com.google.code.gson:gson:2.8.5' - providedCompile project(':communication-api') - providedCompile project(':datastorage-api') - providedCompile project(':validation-api') - providedCompile project(':datastorage') - providedCompile project(':validation') + projectCompile project(':communication-api') + projectCompile project(':datastorage-api') + projectCompile project(':validation-api') + projectCompile project(':datastorage') + projectCompile project(':validation') compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0' compileOnly 'org.osgi:org.osgi.annotation:6.0.0' compileOnly 'org.osgi:org.osgi.service.metatype.annotations:1.3.0' diff --git a/core/communication/build.gradle b/core/communication/build.gradle index 64d24343e..b1bb5acee 100644 --- a/core/communication/build.gradle +++ b/core/communication/build.gradle @@ -11,7 +11,7 @@ dependencies { testImplementation 'junit:junit:4.11' testImplementation 'org.hamcrest:hamcrest-all:1.3' testImplementation 'org.mockito:mockito-all:1.9.5' - providedCompile project(':communication-api') + projectCompile project(':communication-api') implementation 'javax.jms:jms:1.1' implementation 'org.slf4j:slf4j-api:1.7.7' compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0' diff --git a/core/datastorage/build.gradle b/core/datastorage/build.gradle index 3f53fa3cf..2a341b0d1 100644 --- a/core/datastorage/build.gradle +++ b/core/datastorage/build.gradle @@ -12,10 +12,10 @@ dependencies { testImplementation 'org.hamcrest:hamcrest-all:1.3' testImplementation 'org.mockito:mockito-all:1.9.5' testImplementation 'com.github.stefanbirkner:system-rules:1.18.0' - providedCompile project(':communication-api') - providedCompile project(':datastorage-api') - providedCompile project(':validation-api') - providedCompile project(':validation') + projectCompile project(':communication-api') + projectCompile project(':datastorage-api') + projectCompile project(':validation-api') + projectCompile project(':validation') implementation 'org.mongodb:mongo-java-driver:3.8.0' implementation 'org.slf4j:slf4j-api:1.7.7' implementation 'org.apache.commons:commons-lang3:3.7' diff --git a/core/jobs/build.gradle b/core/jobs/build.gradle index 20f33267b..004a6f993 100644 --- a/core/jobs/build.gradle +++ b/core/jobs/build.gradle @@ -29,13 +29,13 @@ dependencies { compileOnly 'com.google.code.gson:gson:2.8.5' compileOnly 'org.slf4j:slf4j-api:1.7.7' compileOnly 'com.google.code.findbugs:jsr305:3.0.2' - providedCompile project(':communication-api') - providedCompile project(':jobs-api') - providedCompile project(':datastorage-api') - providedCompile project(':validation-api') - providedCompile project(':proxy') - providedCompile project(':selenium') - providedCompile project(':w3chtml5validator') + projectCompile project(':communication-api') + projectCompile project(':jobs-api') + projectCompile project(':datastorage-api') + projectCompile project(':validation-api') + projectCompile project(':proxy') + projectCompile project(':selenium') + projectCompile project(':w3chtml5validator') } jar { diff --git a/core/runner/build.gradle b/core/runner/build.gradle index da67a5fc0..455d3aeef 100644 --- a/core/runner/build.gradle +++ b/core/runner/build.gradle @@ -14,9 +14,9 @@ dependencies { testImplementation 'com.googlecode.zohhak:zohhak:1.1.1' testImplementation 'commons-io:commons-io:2.6' implementation 'com.google.guava:guava:25.1-jre' - providedCompile project(':communication-api') - providedCompile project(':datastorage-api') - providedCompile project(':communication') + projectCompile project(':communication-api') + projectCompile project(':datastorage-api') + projectCompile project(':communication') compileOnly 'com.google.code.gson:gson:2.8.5' compileOnly 'commons-io:commons-io:2.6' compileOnly 'org.apache.commons:commons-lang3:3.7' diff --git a/core/validation/build.gradle b/core/validation/build.gradle index 3e69b94a7..e341ffeff 100644 --- a/core/validation/build.gradle +++ b/core/validation/build.gradle @@ -12,7 +12,7 @@ dependencies { testImplementation 'org.hamcrest:hamcrest-all:1.3' testImplementation 'org.mockito:mockito-all:1.9.5' implementation 'org.apache.commons:commons-lang3:3.7' - providedCompile project(':validation-api') + projectCompile project(':validation-api') compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0' compileOnly 'org.osgi:org.osgi.annotation:6.0.0' compileOnly 'org.osgi:org.osgi.service.metatype.annotations:1.3.0' diff --git a/core/worker/build.gradle b/core/worker/build.gradle index 240a6f109..0d24ed1c1 100644 --- a/core/worker/build.gradle +++ b/core/worker/build.gradle @@ -11,12 +11,12 @@ dependencies { testImplementation 'junit:junit:4.11' testImplementation 'org.hamcrest:hamcrest-all:1.3' testImplementation 'org.mockito:mockito-all:1.9.5' - providedCompile project(':jobs-api') - providedCompile project(':communication-api') - providedCompile project(':datastorage-api') - providedCompile project(':communication') - providedCompile project(':proxy') - providedCompile project(':selenium') + projectCompile project(':jobs-api') + projectCompile project(':communication-api') + projectCompile project(':datastorage-api') + projectCompile project(':communication') + projectCompile project(':proxy') + projectCompile project(':selenium') compileOnly 'com.google.guava:guava:25.1-jre' compileOnly('org.apache.activemq:activemq-osgi:5.15.2') { exclude group: 'com.google.guava', module: 'guava' diff --git a/integration-tests/cleaner-test/build.gradle b/integration-tests/cleaner-test/build.gradle index 95f784505..0688c2627 100644 --- a/integration-tests/cleaner-test/build.gradle +++ b/integration-tests/cleaner-test/build.gradle @@ -19,10 +19,10 @@ dependencies { testImplementation 'de.bwaldvogel:mongo-java-server:1.12.0' testImplementation 'org.mongodb:mongo-java-driver:3.8.0' testImplementation 'org.apache.sling:org.apache.sling.testing.osgi-mock.junit4:2.4.6' - providedCompile project(':communication-api') - providedCompile project(':cleaner') - providedCompile project(':datastorage-api') - providedCompile project(':datastorage') + projectCompile project(':communication-api') + projectCompile project(':cleaner') + projectCompile project(':datastorage-api') + projectCompile project(':datastorage') compileOnly 'org.osgi:org.osgi.core:4.3.0' compileOnly 'org.osgi:org.osgi.compendium:4.2.0' compileOnly 'com.google.guava:guava:25.1-jre' diff --git a/integration-tests/sample-site/build.gradle b/integration-tests/sample-site/build.gradle index a91361f1c..34bc37abb 100644 --- a/integration-tests/sample-site/build.gradle +++ b/integration-tests/sample-site/build.gradle @@ -4,6 +4,7 @@ plugins { id 'com.cognifide.aet.java-conventions' + id 'war' } dependencies { diff --git a/osgi-dependencies/proxy/build.gradle b/osgi-dependencies/proxy/build.gradle index fb400679e..713ad222a 100644 --- a/osgi-dependencies/proxy/build.gradle +++ b/osgi-dependencies/proxy/build.gradle @@ -9,8 +9,8 @@ plugins { dependencies { implementation 'com.github.detro:browsermob-proxy-client:0.1.3' - providedCompile project(':jobs-api') - providedCompile project(':selenium') + projectCompile project(':jobs-api') + projectCompile project(':selenium') compileOnly 'org.osgi:org.osgi.core:4.3.0' compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0' compileOnly 'org.osgi:org.osgi.annotation:6.0.0' diff --git a/rest-endpoint/build.gradle b/rest-endpoint/build.gradle index 6ababcc4a..4a6063086 100644 --- a/rest-endpoint/build.gradle +++ b/rest-endpoint/build.gradle @@ -12,9 +12,9 @@ dependencies { testImplementation 'org.hamcrest:hamcrest-all:1.3' testImplementation 'org.mockito:mockito-all:1.9.5' testImplementation 'com.github.stefanbirkner:system-rules:1.18.0' - providedCompile project(':communication-api') - providedCompile project(':datastorage-api') - providedCompile project(':accessibility-report') + projectCompile project(':communication-api') + projectCompile project(':datastorage-api') + projectCompile project(':accessibility-report') implementation 'org.apache.commons:commons-lang3:3.7' compileOnly 'org.osgi:org.osgi.compendium:4.2.0' compileOnly 'org.ops4j.pax.web:pax-web-runtime:1.1.17' diff --git a/test-executor/build.gradle b/test-executor/build.gradle index 867ce5715..4954ec164 100644 --- a/test-executor/build.gradle +++ b/test-executor/build.gradle @@ -11,9 +11,9 @@ dependencies { testImplementation 'junit:junit:4.11' testImplementation 'org.hamcrest:hamcrest-all:1.3' testImplementation 'org.mockito:mockito-all:1.9.5' - providedCompile project(':communication-api') - providedCompile project(':datastorage-api') - providedCompile project(':rest-endpoint') + projectCompile project(':communication-api') + projectCompile project(':datastorage-api') + projectCompile project(':rest-endpoint') implementation 'javax.jms:jms:1.1' implementation 'com.google.guava:guava:25.1-jre' implementation 'org.simpleframework:simple-xml:2.7.1' diff --git a/zip/build.gradle b/zip/build.gradle index 767a71355..121390b64 100644 --- a/zip/build.gradle +++ b/zip/build.gradle @@ -29,7 +29,7 @@ task zipBundles(type: Zip) { task zipConfigs(type: Zip) { destinationDirectory = file("$packages") archiveFileName = "configs.zip" - from("${rootDir}/osgi-dependencies/configs/src/main/resources") + from("${project(':configs').projectDir}/src/main/resources") } task zipFeatures(type: Zip) { @@ -44,15 +44,25 @@ task zipFeatures(type: Zip) { task zipReport(type: Copy) { dependsOn project(":report").getTasksByName('build', true) - from("${rootDir}/report/build/distributions/report.zip") + from "${project(':report').buildDir}/distributions/report.zip" into "$packages" } +task zipSampleSite(type: Zip) { + dependsOn project(":sample-site").getTasksByName('build', true) + destinationDirectory = file("$packages") + archiveFileName = "sample-site.zip" + from(project(":sample-site").buildDir) { + include "**/*.war" + } +} + task make { dependsOn tasks.zipBundles dependsOn tasks.zipConfigs dependsOn tasks.zipFeatures dependsOn tasks.zipReport + dependsOn tasks.zipSampleSite } description = 'AET' From d834c7bb5a965099ae0391a7d1f858f253857488 Mon Sep 17 00:00:00 2001 From: Bartosz Zbytniewski Date: Wed, 10 Feb 2021 12:07:09 +0100 Subject: [PATCH 09/15] fix: Fix osgi dependencies manifest --- osgi-dependencies/proxy/build.gradle | 5 +++-- osgi-dependencies/selenium/build.gradle | 3 +-- osgi-dependencies/w3chtml5validator/build.gradle | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/osgi-dependencies/proxy/build.gradle b/osgi-dependencies/proxy/build.gradle index 713ad222a..727e45d5a 100644 --- a/osgi-dependencies/proxy/build.gradle +++ b/osgi-dependencies/proxy/build.gradle @@ -25,8 +25,9 @@ jar { attributes( 'Bundle-Vendor': 'Cognifide Ltd.', 'Export-Package': 'com.cognifide.aet.proxy.*', - 'Embed-Dependency': 'browsermob-proxy-client', - 'Import-Package': 'com.sun.net.ssl.*;resolution:=optional,sun.net.spi.*;resolution:=optional,com.sun.*;resolution:=optional,*' + 'Include-Resource': 'browsermob-proxy-client-0.1.3.jar', + 'Bundle-ClassPath': '.,browsermob-proxy-client-0.1.3.jar', + 'Import-Package': 'com.cognifide.aet.job.api.collector;version="[3.4,4)",com.cognifide.aet.job.api.exceptions;version="[3.4,4)",com.cognifide.aet.proxy.configuration;version="[3.4,4)",com.cognifide.aet.proxy.exceptions;version="[3.4,4)",com.google.common.collect;version="[25.1,26)",com.google.gson;version="[2.8,3)",javax.xml.bind,org.apache.http,org.apache.http.client.entity,org.apache.http.client.methods,org.apache.http.client.utils,org.apache.http.entity,org.apache.http.impl.client,org.apache.http.message,org.browsermob.core.har;version="[3.4,4)",org.json;version="[20180130.0,20180131)",org.openqa.selenium;version="[3.8,4)",org.openqa.selenium.net;version="[3.8,4)",org.slf4j;version="[1.7,2)"' ) } } diff --git a/osgi-dependencies/selenium/build.gradle b/osgi-dependencies/selenium/build.gradle index fa7584d5e..e4963c27e 100644 --- a/osgi-dependencies/selenium/build.gradle +++ b/osgi-dependencies/selenium/build.gradle @@ -29,8 +29,7 @@ jar { attributes( 'Bundle-Vendor': 'Cognifide Ltd.', 'Export-Package': "org.openqa.*;version=\"${seleniumVersion}\"", - 'Embed-Dependency': '*;scope=compile|runtime|optional', - 'Import-Package': 'com.beust.jcommander.*;resolution:=optional,com.gargoylesoftware.htmlunit.javascript.host.*;resolution:=optional,javax.servlet.*;resolution:=optional,javax.servlet.http.*;resolution:=optional,junit.*;resolution:=optional,org.apache.commons.logging.*;resolution:=optional,org.eclipse.jetty.*;resolution:=optional,org.junit.*;resolution:=optional,org.mortbay.*;resolution:=optional,org.openqa.jetty.*;resolution:=optional,org.seleniumhq.*;resolution:=optional,com.sun.jna.platform.*;resolution:=optional,net.bytebuddy.*;resolution:=optional,org.objectweb.asm.*;resolution:=optional,org.openqa.selenium.safari.*;resolution:=optional,org.openqa.selenium.security.*;resolution:=optional,*', + 'Import-Package': 'com.beust.jcommander;resolution:=optional;version="[1.48,2)",com.beust.jcommander.converters;resolution:=optional;version="[1.48,2)",com.gargoylesoftware.htmlunit.javascript.host;resolution:=optional,com.gargoylesoftware.htmlunit.javascript.host.dom;resolution:=optional,com.gargoylesoftware.htmlunit.javascript.host.event;resolution:=optional,com.gargoylesoftware.htmlunit.javascript.host.html;resolution:=optional,javax.servlet;resolution:=optional;version="[3.1,4)",javax.servlet.http;resolution:=optional;version="[3.1,4)",org.eclipse.jetty.client;resolution:=optional;version="[9.4,10)",org.eclipse.jetty.client.security;resolution:=optional,org.eclipse.jetty.client.webdav;resolution:=optional,org.eclipse.jetty.continuation;resolution:=optional,org.eclipse.jetty.http;resolution:=optional;version="[9.4,10)",org.eclipse.jetty.http.gzip;resolution:=optional,org.eclipse.jetty.io;resolution:=optional;version="[9.4,10)",org.eclipse.jetty.io.bio;resolution:=optional,org.eclipse.jetty.io.nio;resolution:=optional,org.eclipse.jetty.jmx;resolution:=optional,org.eclipse.jetty.security;resolution:=optional,org.eclipse.jetty.security.authentication;resolution:=optional,org.eclipse.jetty.server;resolution:=optional,org.eclipse.jetty.server.bio;resolution:=optional,org.eclipse.jetty.server.handler;resolution:=optional,org.eclipse.jetty.server.handler.jmx;resolution:=optional,org.eclipse.jetty.server.jmx;resolution:=optional,org.eclipse.jetty.server.nio;resolution:=optional,org.eclipse.jetty.server.session;resolution:=optional,org.eclipse.jetty.server.session.jmx;resolution:=optional,org.eclipse.jetty.server.ssl;resolution:=optional,org.eclipse.jetty.servlet;resolution:=optional,org.eclipse.jetty.servlet.api;resolution:=optional,org.eclipse.jetty.servlet.jmx;resolution:=optional,org.eclipse.jetty.servlet.listener;resolution:=optional,org.eclipse.jetty.servlets;resolution:=optional,org.eclipse.jetty.util;resolution:=optional;version="[9.4,10)",org.eclipse.jetty.util.ajax;resolution:=optional,org.eclipse.jetty.util.component;resolution:=optional;version="[9.4,10)",org.eclipse.jetty.util.log;resolution:=optional;version="[9.4,10)",org.eclipse.jetty.util.resource;resolution:=optional;version="[9.4,10)",org.eclipse.jetty.util.security;resolution:=optional;version="[9.4,10)",org.eclipse.jetty.util.ssl;resolution:=optional;version="[9.4,10)",org.eclipse.jetty.util.statistic;resolution:=optional;version="[9.4,10)",org.eclipse.jetty.util.thread;resolution:=optional;version="[9.4,10)",org.eclipse.jetty.webapp;resolution:=optional,org.eclipse.jetty.xml;resolution:=optional;version="[9.4,10)",org.mortbay.log;resolution:=optional,org.mortbay.util.ajax;resolution:=optional,org.seleniumhq.jetty7.jmx;resolution:=optional,org.seleniumhq.jetty9.security;resolution:=optional,org.seleniumhq.jetty9.server;resolution:=optional,org.seleniumhq.jetty9.servlet;resolution:=optional,org.seleniumhq.jetty9.util.security;resolution:=optional,org.seleniumhq.jetty9.util.thread;resolution:=optional,net.bytebuddy;resolution:=optional;version="[1.7,2)",net.bytebuddy.description.annotation;resolution:=optional;version="[1.7,2)",net.bytebuddy.dynamic;resolution:=optional;version="[1.7,2)",net.bytebuddy.implementation;resolution:=optional;version="[1.7,2)",net.bytebuddy.matcher;resolution:=optional;version="[1.7,2)",org.openqa.selenium.safari;resolution:=optional,org.openqa.selenium.security;resolution:=optional,com.gargoylesoftware.htmlunit,com.gargoylesoftware.htmlunit.html,com.gargoylesoftware.htmlunit.javascript,com.gargoylesoftware.htmlunit.util,com.google.common.base;version="[25.1,26)",com.google.common.cache;version="[25.1,26)",com.google.common.collect;version="[25.1,26)",com.google.common.io;version="[25.1,26)",com.google.common.net;version="[25.1,26)",com.google.common.primitives;version="[25.1,26)",com.google.common.reflect;version="[25.1,26)",com.google.common.util.concurrent;version="[25.1,26)",com.google.gson;version="[2.8,3)",com.google.gson.annotations;version="[2.8,3)",com.google.gson.reflect;version="[2.8,3)",com.google.gson.stream;version="[2.8,3)",javax.imageio,javax.management,javax.naming,javax.net,javax.net.ssl,javax.security.auth,javax.security.cert,javax.sql,javax.swing,javax.swing.text,javax.xml.namespace,javax.xml.parsers,javax.xml.xpath,net.jcip.annotations,net.sourceforge.htmlunit.corejs.javascript,org.apache.http,org.apache.http.auth,org.apache.http.client,org.apache.http.client.config,org.apache.http.client.methods,org.apache.http.config,org.apache.http.conn,org.apache.http.conn.routing,org.apache.http.conn.socket,org.apache.http.conn.ssl,org.apache.http.entity,org.apache.http.impl.client,org.apache.http.impl.conn,org.apache.http.message,org.apache.http.protocol,org.apache.http.util,org.ietf.jgss,org.openqa.grid.common;version="[3.8,4)",org.openqa.grid.common.exception;version="[3.8,4)",org.openqa.grid.internal;version="[3.8,4)",org.openqa.grid.internal.exception;version="[3.8,4)",org.openqa.grid.internal.listeners;version="[3.8,4)",org.openqa.grid.internal.utils;version="[3.8,4)",org.openqa.grid.internal.utils.configuration;version="[3.8,4)",org.openqa.grid.internal.utils.configuration.converters;version="[3.8,4)",org.openqa.grid.internal.utils.configuration.validators;version="[3.8,4)",org.openqa.grid.selenium.node;version="[3.8,4)",org.openqa.grid.shared;version="[3.8,4)",org.openqa.grid.web;version="[3.8,4)",org.openqa.grid.web.servlet;version="[3.8,4)",org.openqa.grid.web.servlet.beta;version="[3.8,4)",org.openqa.grid.web.servlet.handler;version="[3.8,4)",org.openqa.grid.web.utils;version="[3.8,4)",org.openqa.selenium;version="[3.8,4)",org.openqa.selenium.firefox;version="[3.8,4)",org.openqa.selenium.firefox.internal;version="[3.8,4)",org.openqa.selenium.html5;version="[3.8,4)",org.openqa.selenium.interactions;version="[3.8,4)",org.openqa.selenium.interactions.internal;version="[3.8,4)",org.openqa.selenium.internal;version="[3.8,4)",org.openqa.selenium.io;version="[3.8,4)",org.openqa.selenium.json;version="[3.8,4)",org.openqa.selenium.logging;version="[3.8,4)",org.openqa.selenium.logging.profiler;version="[3.8,4)",org.openqa.selenium.mobile;version="[3.8,4)",org.openqa.selenium.net;version="[3.8,4)",org.openqa.selenium.remote;version="[3.8,4)",org.openqa.selenium.remote.html5;version="[3.8,4)",org.openqa.selenium.remote.http;version="[3.8,4)",org.openqa.selenium.remote.internal;version="[3.8,4)",org.openqa.selenium.remote.mobile;version="[3.8,4)",org.openqa.selenium.remote.server;version="[3.8,4)",org.openqa.selenium.remote.server.commandhandler;version="[3.8,4)",org.openqa.selenium.remote.server.handler;version="[3.8,4)",org.openqa.selenium.remote.server.handler.html5;version="[3.8,4)",org.openqa.selenium.remote.server.handler.interactions;version="[3.8,4)",org.openqa.selenium.remote.server.handler.interactions.touch;version="[3.8,4)",org.openqa.selenium.remote.server.handler.internal;version="[3.8,4)",org.openqa.selenium.remote.server.handler.mobile;version="[3.8,4)",org.openqa.selenium.remote.server.jmx;version="[3.8,4)",org.openqa.selenium.remote.server.log;version="[3.8,4)",org.openqa.selenium.remote.server.rest;version="[3.8,4)",org.openqa.selenium.remote.server.xdrpc;version="[3.8,4)",org.openqa.selenium.remote.service;version="[3.8,4)",org.openqa.selenium.remote.session;version="[3.8,4)",org.openqa.selenium.support;version="[3.8,4)",org.openqa.selenium.support.events;version="[3.8,4)",org.openqa.selenium.support.events.internal;version="[3.8,4)",org.openqa.selenium.support.pagefactory;version="[3.8,4)",org.openqa.selenium.support.pagefactory.internal;version="[3.8,4)",org.openqa.selenium.support.ui;version="[3.8,4)",org.slf4j,org.slf4j.helpers,org.slf4j.spi,org.w3c.css.sac,org.w3c.dom,org.xml.sax,org.xml.sax.helpers', 'Embed-Directory': 'OSGI-INF/lib', 'Embed-Transitive': 'false' ) diff --git a/osgi-dependencies/w3chtml5validator/build.gradle b/osgi-dependencies/w3chtml5validator/build.gradle index 934300d62..73771ad3c 100644 --- a/osgi-dependencies/w3chtml5validator/build.gradle +++ b/osgi-dependencies/w3chtml5validator/build.gradle @@ -36,8 +36,9 @@ jar { attributes( 'Bundle-Vendor': 'Cognifide Ltd.', 'Export-Package': 'nu.validator.*', - 'Embed-Dependency': '*;scope=compile|runtime', - 'Import-Package': 'com.icl.saxon;resolution:=optional,com.sun.org.apache.xerces.internal.*;resolution:=optional,javax.portlet;resolution:=optional,jp.co.swiftinc.relax.*;resolution:=optional,junit.framework;resolution:=optional,org.gjt.xpp;resolution:=optional,org.xmlpull.v1;resolution:=optional,org.apache.xmlbeans;resolution:=optional,org.apache.xerces.*;resolution:=optional,com.google.inject;resolution:=optional,org.fest.assertions;resolution:=optional,org.junit.*;resolution:=optional,org.seasar.framework.*;resolution:=optional,org.springframework.web.context.*;resolution:=optional,*' + 'Include-Resource': 'validator-17.11.1.jar,langdetect-1.1-20120112.jar,salvation-2.3.0.jar,jsonic-1.3.9.jar,jetty-util-ajax-9.2.9.v20150224.jar,icu4j-58.2.jar,galimatias-0.1.2.jar,isorelax-20030108.jar,Saxon-HE-9.6.0-4.jar,htmlparser-1.4.7.jar,jing-20171006VNU.jar,rhino-1.7R5.jar,xom-1.1.jar,jchardet-1.0.jar', + 'Bundle-ClassPath': '.,validator-17.11.1.jar,langdetect-1.1-20120112.jar,salvation-2.3.0.jar,jsonic-1.3.9.jar,jetty-util-ajax-9.2.9.v20150224.jar,icu4j-58.2.jar,galimatias-0.1.2.jar,isorelax-20030108.jar,Saxon-HE-9.6.0-4.jar,htmlparser-1.4.7.jar,jing-20171006VNU.jar,rhino-1.7R5.jar,xom-1.1.jar,jchardet-1.0.jar', + 'Import-Package': 'com.icl.saxon;resolution:=optional,com.sun.org.apache.xerces.internal.parsers;resolution:=optional,com.sun.org.apache.xerces.internal.util;resolution:=optional,com.sun.org.apache.xerces.internal.xni.parser;resolution:=optional,jp.co.swiftinc.relax.schema;resolution:=optional,jp.co.swiftinc.relax.verifier;resolution:=optional,junit.framework;resolution:=optional,org.apache.xmlbeans;resolution:=optional,org.apache.xerces.impl;resolution:=optional,org.apache.xerces.impl.validation;resolution:=optional,org.apache.xerces.impl.xpath.regex;resolution:=optional,org.apache.xerces.impl.xs;resolution:=optional,org.apache.xerces.parsers;resolution:=optional,org.apache.xerces.util;resolution:=optional,org.apache.xerces.xni;resolution:=optional,org.apache.xerces.xni.grammars;resolution:=optional,org.apache.xerces.xni.parser;resolution:=optional,com.google.inject;resolution:=optional,org.fest.assertions;resolution:=optional,org.junit;resolution:=optional,org.junit.experimental.theories;resolution:=optional,org.junit.rules;resolution:=optional,org.junit.runner;resolution:=optional,org.junit.runners;resolution:=optional,org.seasar.framework.container;resolution:=optional,org.seasar.framework.container.factory;resolution:=optional,org.seasar.framework.log;resolution:=optional,org.springframework.web.context;resolution:=optional,org.springframework.web.context.support;resolution:=optional,javax.annotation,javax.net.ssl,javax.script,javax.servlet;version="[3.1,4)",javax.servlet.http;version="[3.1,4)",javax.swing,javax.swing.border,javax.swing.event,javax.swing.filechooser,javax.swing.table,javax.swing.text,javax.swing.tree,javax.xml.datatype,javax.xml.namespace,javax.xml.parsers,javax.xml.stream,javax.xml.stream.events,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.sax,javax.xml.transform.stax,javax.xml.transform.stream,javax.xml.xpath,nu.validator.checker.table,nu.validator.collections,nu.validator.datatype.data,nu.validator.datatype.tools,nu.validator.gnu.xml.aelfred2,nu.validator.htmlparser.common,nu.validator.htmlparser.impl,nu.validator.htmlparser.io,nu.validator.htmlparser.rewindable,nu.validator.htmlparser.sax,nu.validator.json,nu.validator.localentities,nu.validator.messages.types,nu.validator.saxtree,nu.validator.source,org.apache.commons.beanutils,org.apache.commons.fileupload;version="[1.3,2)",org.apache.commons.fileupload.servlet;version="[1.3,2)",org.apache.commons.logging;version="[1.2,2)",org.apache.http,org.apache.http.client,org.apache.http.client.config,org.apache.http.client.methods,org.apache.http.config,org.apache.http.conn,org.apache.http.conn.socket,org.apache.http.conn.ssl,org.apache.http.impl.client,org.apache.http.impl.conn,org.apache.log4j;version="[1.2,2)",org.apache.tools.ant,org.apache.tools.ant.types,org.apache.xalan.processor;resolution:=optional,org.apache.xml.resolver,org.apache.xml.resolver.helpers,org.eclipse.jetty.server;version="[9.3,10)",org.eclipse.jetty.servlet,org.eclipse.jetty.servlets;version="[9.3,10)",org.eclipse.jetty.util;version="[9.3,10)",org.eclipse.jetty.util.log;version="[9.3,10)",org.eclipse.jetty.util.thread;version="[9.3,10)",org.slf4j,org.springframework.context,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers,javax.portlet;resolution:=optional,org.gjt.xpp;resolution:=optional,org.xmlpull.v1;resolution:=optional' ) } } From 4c7d86dfcd9c172cd8c529267a3a9d913f99bda9 Mon Sep 17 00:00:00 2001 From: Bartosz Zbytniewski Date: Wed, 10 Feb 2021 12:56:03 +0100 Subject: [PATCH 10/15] fix: Fix communication-api manifest --- api/communication-api/build.gradle | 7 ++----- api/datastorage-api/build.gradle | 4 ---- api/jobs-api/build.gradle | 4 ---- api/validation-api/build.gradle | 4 ---- buildSrc/build.gradle | 4 ---- .../main/groovy/com.cognifide.aet.java-conventions.gradle | 4 ---- client/aet-maven-plugin/build.gradle | 4 ---- client/client-core/build.gradle | 4 ---- core/accessibility-report/build.gradle | 4 ---- core/cleaner/build.gradle | 4 ---- core/communication/build.gradle | 4 ---- core/datastorage/build.gradle | 4 ---- core/jobs/build.gradle | 4 ---- core/runner/build.gradle | 4 ---- core/validation/build.gradle | 4 ---- core/worker/build.gradle | 4 ---- integration-tests/cleaner-test/build.gradle | 4 ---- integration-tests/sample-site/build.gradle | 4 ---- osgi-dependencies/proxy/build.gradle | 4 ---- osgi-dependencies/selenium/build.gradle | 4 ---- osgi-dependencies/w3chtml5validator/build.gradle | 4 ---- rest-endpoint/build.gradle | 4 ---- settings.gradle | 4 ---- test-executor/build.gradle | 4 ---- zip/build.gradle | 4 ---- 25 files changed, 2 insertions(+), 101 deletions(-) diff --git a/api/communication-api/build.gradle b/api/communication-api/build.gradle index 608408f82..f10fb8b86 100644 --- a/api/communication-api/build.gradle +++ b/api/communication-api/build.gradle @@ -1,7 +1,3 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - plugins { id 'com.cognifide.aet.java-conventions' id 'biz.aQute.bnd.builder' @@ -26,7 +22,8 @@ jar { manifest { attributes( 'Bundle-Vendor': 'Cognifide Ltd.', - 'Export-Package': 'com.cognifide.aet.communication.api.*' + 'Export-Package': 'com.cognifide.aet.communication.api;version="3.4.1",com.cognifide.aet.communication.api.exceptions;version="3.4.1",com.cognifide.aet.communication.api.execution;version="3.4.1";uses:="com.cognifide.aet.communication.api.messages",com.cognifide.aet.communication.api.job;version="3.4.1";uses:="com.cognifide.aet.communication.api,com.cognifide.aet.communication.api.metadata",com.cognifide.aet.communication.api.messages;version="3.4.1";uses:="com.cognifide.aet.communication.api",com.cognifide.aet.communication.api.metadata;version="3.4.1";uses:="com.cognifide.aet.communication.api.metadata.exclude,javax.validation",com.cognifide.aet.communication.api.metadata.exclude;version="3.4.1",com.cognifide.aet.communication.api.metadata.gson;version="3.4.1";uses:="com.cognifide.aet.communication.api.metadata,com.google.gson",com.cognifide.aet.communication.api.queues;version="3.4.1";uses:="javax.jms",com.cognifide.aet.communication.api.util;version="3.4.1";uses:="com.cognifide.aet.communication.api.metadata,javax.validation",com.cognifide.aet.communication.api.wrappers;version="3.4.1";uses:="com.cognifide.aet.communication.api.metadata"', + 'Import-Package': 'com.cognifide.aet.communication.api;version="[3.4,4)",com.cognifide.aet.communication.api.messages;version="[3.4,4)",com.cognifide.aet.communication.api.metadata;version="[3.4,4)",com.cognifide.aet.communication.api.metadata.exclude;version="[3.4,4)",com.cognifide.aet.communication.api.metadata.gson;version="[3.4,4)",com.cognifide.aet.communication.api.util;version="[3.4,4)",com.google.common.base;version="[25.1,26)",com.google.common.collect;version="[25.1,26)",com.google.gson;version="[2.8,3)",com.google.gson.reflect;version="[2.8,3)",javax.jms;version="[1.1,2)",javax.validation;version="[1.1,2)",javax.validation.bootstrap;version="[1.1,2)",javax.validation.constraints;version="[1.1,2)",javax.validation.spi;version="[1.1,2)",org.apache.commons.lang3;version="[3.7,4)",org.apache.commons.lang3.builder;version="[3.7,4)",org.hibernate.validator;version="[4.3,5)",org.hibernate.validator.constraints;version="[4.3,5)",org.slf4j;version="[1.7,2)"' ) } } diff --git a/api/datastorage-api/build.gradle b/api/datastorage-api/build.gradle index ffa13c772..f6b21307a 100644 --- a/api/datastorage-api/build.gradle +++ b/api/datastorage-api/build.gradle @@ -1,7 +1,3 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - plugins { id 'com.cognifide.aet.java-conventions' id 'biz.aQute.bnd.builder' diff --git a/api/jobs-api/build.gradle b/api/jobs-api/build.gradle index 49b4381c6..9ef080230 100644 --- a/api/jobs-api/build.gradle +++ b/api/jobs-api/build.gradle @@ -1,7 +1,3 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - plugins { id 'com.cognifide.aet.java-conventions' id 'biz.aQute.bnd.builder' diff --git a/api/validation-api/build.gradle b/api/validation-api/build.gradle index 43b826845..88f29ecb5 100644 --- a/api/validation-api/build.gradle +++ b/api/validation-api/build.gradle @@ -1,7 +1,3 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - plugins { id 'com.cognifide.aet.java-conventions' id 'biz.aQute.bnd.builder' diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 66a0569cd..288e99ea5 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -1,7 +1,3 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - plugins { // Support convention plugins written in Groovy. Convention plugins are build scripts in 'src/main' that automatically become available as plugins in the main build. id 'groovy-gradle-plugin' diff --git a/buildSrc/src/main/groovy/com.cognifide.aet.java-conventions.gradle b/buildSrc/src/main/groovy/com.cognifide.aet.java-conventions.gradle index e28919d2a..f2b9083d8 100644 --- a/buildSrc/src/main/groovy/com.cognifide.aet.java-conventions.gradle +++ b/buildSrc/src/main/groovy/com.cognifide.aet.java-conventions.gradle @@ -1,7 +1,3 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - plugins { id 'java-library' id 'maven-publish' diff --git a/client/aet-maven-plugin/build.gradle b/client/aet-maven-plugin/build.gradle index b722d4991..7dd555df8 100644 --- a/client/aet-maven-plugin/build.gradle +++ b/client/aet-maven-plugin/build.gradle @@ -1,7 +1,3 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - plugins { id 'com.cognifide.aet.java-conventions' } diff --git a/client/client-core/build.gradle b/client/client-core/build.gradle index aed728e19..073d92aaa 100644 --- a/client/client-core/build.gradle +++ b/client/client-core/build.gradle @@ -1,7 +1,3 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - plugins { id 'com.cognifide.aet.java-conventions' } diff --git a/core/accessibility-report/build.gradle b/core/accessibility-report/build.gradle index fbc6b4d66..476340390 100644 --- a/core/accessibility-report/build.gradle +++ b/core/accessibility-report/build.gradle @@ -1,7 +1,3 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - plugins { id 'com.cognifide.aet.java-conventions' id "org.jetbrains.kotlin.jvm" version "1.4.21-2" diff --git a/core/cleaner/build.gradle b/core/cleaner/build.gradle index 5cf74d2c9..cdfd0cc41 100644 --- a/core/cleaner/build.gradle +++ b/core/cleaner/build.gradle @@ -1,7 +1,3 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - plugins { id 'com.cognifide.aet.java-conventions' id 'biz.aQute.bnd.builder' diff --git a/core/communication/build.gradle b/core/communication/build.gradle index b1bb5acee..b989b8d06 100644 --- a/core/communication/build.gradle +++ b/core/communication/build.gradle @@ -1,7 +1,3 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - plugins { id 'com.cognifide.aet.java-conventions' id 'biz.aQute.bnd.builder' diff --git a/core/datastorage/build.gradle b/core/datastorage/build.gradle index 2a341b0d1..1ba4534ac 100644 --- a/core/datastorage/build.gradle +++ b/core/datastorage/build.gradle @@ -1,7 +1,3 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - plugins { id 'com.cognifide.aet.java-conventions' id 'biz.aQute.bnd.builder' diff --git a/core/jobs/build.gradle b/core/jobs/build.gradle index 004a6f993..3e53c34cd 100644 --- a/core/jobs/build.gradle +++ b/core/jobs/build.gradle @@ -1,7 +1,3 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - plugins { id 'com.cognifide.aet.java-conventions' id 'biz.aQute.bnd.builder' diff --git a/core/runner/build.gradle b/core/runner/build.gradle index 455d3aeef..ada275f63 100644 --- a/core/runner/build.gradle +++ b/core/runner/build.gradle @@ -1,7 +1,3 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - plugins { id 'com.cognifide.aet.java-conventions' id 'biz.aQute.bnd.builder' diff --git a/core/validation/build.gradle b/core/validation/build.gradle index e341ffeff..ba7544f71 100644 --- a/core/validation/build.gradle +++ b/core/validation/build.gradle @@ -1,7 +1,3 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - plugins { id 'com.cognifide.aet.java-conventions' id 'biz.aQute.bnd.builder' diff --git a/core/worker/build.gradle b/core/worker/build.gradle index 0d24ed1c1..7ef4932a2 100644 --- a/core/worker/build.gradle +++ b/core/worker/build.gradle @@ -1,7 +1,3 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - plugins { id 'com.cognifide.aet.java-conventions' id 'biz.aQute.bnd.builder' diff --git a/integration-tests/cleaner-test/build.gradle b/integration-tests/cleaner-test/build.gradle index 0688c2627..f21aefc93 100644 --- a/integration-tests/cleaner-test/build.gradle +++ b/integration-tests/cleaner-test/build.gradle @@ -1,7 +1,3 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - plugins { id 'com.cognifide.aet.java-conventions' } diff --git a/integration-tests/sample-site/build.gradle b/integration-tests/sample-site/build.gradle index 34bc37abb..5a00de022 100644 --- a/integration-tests/sample-site/build.gradle +++ b/integration-tests/sample-site/build.gradle @@ -1,7 +1,3 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - plugins { id 'com.cognifide.aet.java-conventions' id 'war' diff --git a/osgi-dependencies/proxy/build.gradle b/osgi-dependencies/proxy/build.gradle index 727e45d5a..6a13f329f 100644 --- a/osgi-dependencies/proxy/build.gradle +++ b/osgi-dependencies/proxy/build.gradle @@ -1,7 +1,3 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - plugins { id 'com.cognifide.aet.java-conventions' id 'biz.aQute.bnd.builder' diff --git a/osgi-dependencies/selenium/build.gradle b/osgi-dependencies/selenium/build.gradle index e4963c27e..fe1d824a5 100644 --- a/osgi-dependencies/selenium/build.gradle +++ b/osgi-dependencies/selenium/build.gradle @@ -1,7 +1,3 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - plugins { id 'com.cognifide.aet.java-conventions' id 'biz.aQute.bnd.builder' diff --git a/osgi-dependencies/w3chtml5validator/build.gradle b/osgi-dependencies/w3chtml5validator/build.gradle index 73771ad3c..4ce1d9cb8 100644 --- a/osgi-dependencies/w3chtml5validator/build.gradle +++ b/osgi-dependencies/w3chtml5validator/build.gradle @@ -1,7 +1,3 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - plugins { id 'com.cognifide.aet.java-conventions' id 'biz.aQute.bnd.builder' diff --git a/rest-endpoint/build.gradle b/rest-endpoint/build.gradle index 4a6063086..0d559290c 100644 --- a/rest-endpoint/build.gradle +++ b/rest-endpoint/build.gradle @@ -1,7 +1,3 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - plugins { id 'com.cognifide.aet.java-conventions' id 'biz.aQute.bnd.builder' diff --git a/settings.gradle b/settings.gradle index 6ed50b885..675dbd8d9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,7 +1,3 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - pluginManagement { plugins { id 'biz.aQute.bnd.builder' version '5.2.0' diff --git a/test-executor/build.gradle b/test-executor/build.gradle index 4954ec164..29c71e82a 100644 --- a/test-executor/build.gradle +++ b/test-executor/build.gradle @@ -1,7 +1,3 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - plugins { id 'com.cognifide.aet.java-conventions' id 'biz.aQute.bnd.builder' diff --git a/zip/build.gradle b/zip/build.gradle index 121390b64..faec238f8 100644 --- a/zip/build.gradle +++ b/zip/build.gradle @@ -1,7 +1,3 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - plugins { id 'com.cognifide.aet.java-conventions' } From 47d99a1d282e3d3b9f1ef20561058c78c88460ce Mon Sep 17 00:00:00 2001 From: Bartosz Zbytniewski Date: Thu, 11 Feb 2021 09:33:35 +0100 Subject: [PATCH 11/15] feature: Move to kotlin DSL --- api/communication-api/build.gradle | 31 --------- api/communication-api/build.gradle.kts | 37 +++++++++++ api/datastorage-api/build.gradle | 24 ------- api/datastorage-api/build.gradle.kts | 24 +++++++ api/jobs-api/build.gradle | 28 -------- api/jobs-api/build.gradle.kts | 28 ++++++++ api/validation-api/build.gradle | 19 ------ api/validation-api/build.gradle.kts | 19 ++++++ buildSrc/build.gradle.kts | 10 +++ .../com.cognifide.aet.java-conventions.gradle | 35 ++++++++++ client/aet-maven-plugin/build.gradle | 26 -------- client/aet-maven-plugin/build.gradle.kts | 26 ++++++++ client/client-core/build.gradle | 23 ------- client/client-core/build.gradle.kts | 23 +++++++ core/accessibility-report/build.gradle | 35 ---------- core/accessibility-report/build.gradle.kts | 35 ++++++++++ core/cleaner/build.gradle | 42 ------------ core/cleaner/build.gradle.kts | 44 +++++++++++++ core/communication/build.gradle | 29 --------- core/communication/build.gradle.kts | 29 +++++++++ core/datastorage/build.gradle | 38 ----------- core/datastorage/build.gradle.kts | 38 +++++++++++ core/jobs/build.gradle | 47 -------------- core/jobs/build.gradle.kts | 47 ++++++++++++++ core/runner/build.gradle | 35 ---------- core/runner/build.gradle.kts | 35 ++++++++++ core/validation/build.gradle | 26 -------- core/validation/build.gradle.kts | 26 ++++++++ core/worker/build.gradle | 40 ------------ core/worker/build.gradle.kts | 40 ++++++++++++ gradle.properties | 1 - integration-tests/cleaner-test/build.gradle | 31 --------- .../cleaner-test/build.gradle.kts | 33 ++++++++++ integration-tests/sample-site/build.gradle | 13 ---- .../sample-site/build.gradle.kts | 13 ++++ osgi-dependencies/proxy/build.gradle | 31 --------- osgi-dependencies/proxy/build.gradle.kts | 34 ++++++++++ osgi-dependencies/selenium/build.gradle | 35 ---------- osgi-dependencies/selenium/build.gradle.kts | 39 +++++++++++ .../w3chtml5validator/build.gradle | 42 ------------ .../w3chtml5validator/build.gradle.kts | 51 +++++++++++++++ rest-endpoint/build.gradle | 39 ----------- rest-endpoint/build.gradle.kts | 39 +++++++++++ test-executor/build.gradle | 41 ------------ test-executor/build.gradle.kts | 41 ++++++++++++ zip/build.gradle | 64 ------------------- zip/build.gradle.kts | 64 +++++++++++++++++++ 47 files changed, 810 insertions(+), 740 deletions(-) delete mode 100644 api/communication-api/build.gradle create mode 100644 api/communication-api/build.gradle.kts delete mode 100644 api/datastorage-api/build.gradle create mode 100644 api/datastorage-api/build.gradle.kts delete mode 100644 api/jobs-api/build.gradle create mode 100644 api/jobs-api/build.gradle.kts delete mode 100644 api/validation-api/build.gradle create mode 100644 api/validation-api/build.gradle.kts create mode 100644 buildSrc/build.gradle.kts create mode 100644 buildSrc/src/main/gradle/com.cognifide.aet.java-conventions.gradle delete mode 100644 client/aet-maven-plugin/build.gradle create mode 100644 client/aet-maven-plugin/build.gradle.kts delete mode 100644 client/client-core/build.gradle create mode 100644 client/client-core/build.gradle.kts delete mode 100644 core/accessibility-report/build.gradle create mode 100644 core/accessibility-report/build.gradle.kts delete mode 100644 core/cleaner/build.gradle create mode 100644 core/cleaner/build.gradle.kts delete mode 100644 core/communication/build.gradle create mode 100644 core/communication/build.gradle.kts delete mode 100644 core/datastorage/build.gradle create mode 100644 core/datastorage/build.gradle.kts delete mode 100644 core/jobs/build.gradle create mode 100644 core/jobs/build.gradle.kts delete mode 100644 core/runner/build.gradle create mode 100644 core/runner/build.gradle.kts delete mode 100644 core/validation/build.gradle create mode 100644 core/validation/build.gradle.kts delete mode 100644 core/worker/build.gradle create mode 100644 core/worker/build.gradle.kts delete mode 100644 gradle.properties delete mode 100644 integration-tests/cleaner-test/build.gradle create mode 100644 integration-tests/cleaner-test/build.gradle.kts delete mode 100644 integration-tests/sample-site/build.gradle create mode 100644 integration-tests/sample-site/build.gradle.kts delete mode 100644 osgi-dependencies/proxy/build.gradle create mode 100644 osgi-dependencies/proxy/build.gradle.kts delete mode 100644 osgi-dependencies/selenium/build.gradle create mode 100644 osgi-dependencies/selenium/build.gradle.kts delete mode 100644 osgi-dependencies/w3chtml5validator/build.gradle create mode 100644 osgi-dependencies/w3chtml5validator/build.gradle.kts delete mode 100644 rest-endpoint/build.gradle create mode 100644 rest-endpoint/build.gradle.kts delete mode 100644 test-executor/build.gradle create mode 100644 test-executor/build.gradle.kts delete mode 100644 zip/build.gradle create mode 100644 zip/build.gradle.kts diff --git a/api/communication-api/build.gradle b/api/communication-api/build.gradle deleted file mode 100644 index f10fb8b86..000000000 --- a/api/communication-api/build.gradle +++ /dev/null @@ -1,31 +0,0 @@ -plugins { - id 'com.cognifide.aet.java-conventions' - id 'biz.aQute.bnd.builder' -} - -dependencies { - testImplementation 'com.googlecode.zohhak:zohhak:1.1.1' - testImplementation 'junit:junit:4.11' - testImplementation 'org.hamcrest:hamcrest-all:1.3' - testImplementation 'commons-io:commons-io:2.6' - testImplementation 'com.google.guava:guava:25.1-jre' - implementation 'javax.validation:validation-api:1.1.0.Final' - implementation 'org.hibernate:hibernate-validator:4.3.2.Final' - implementation 'com.google.code.gson:gson:2.8.5' - compileOnly 'org.apache.activemq:activemq-osgi:5.15.2' - compileOnly 'org.apache.commons:commons-lang3:3.7' - compileOnly 'org.jboss.logging:jboss-logging:3.3.2.Final' - compileOnly 'commons-io:commons-io:2.6' -} - -jar { - manifest { - attributes( - 'Bundle-Vendor': 'Cognifide Ltd.', - 'Export-Package': 'com.cognifide.aet.communication.api;version="3.4.1",com.cognifide.aet.communication.api.exceptions;version="3.4.1",com.cognifide.aet.communication.api.execution;version="3.4.1";uses:="com.cognifide.aet.communication.api.messages",com.cognifide.aet.communication.api.job;version="3.4.1";uses:="com.cognifide.aet.communication.api,com.cognifide.aet.communication.api.metadata",com.cognifide.aet.communication.api.messages;version="3.4.1";uses:="com.cognifide.aet.communication.api",com.cognifide.aet.communication.api.metadata;version="3.4.1";uses:="com.cognifide.aet.communication.api.metadata.exclude,javax.validation",com.cognifide.aet.communication.api.metadata.exclude;version="3.4.1",com.cognifide.aet.communication.api.metadata.gson;version="3.4.1";uses:="com.cognifide.aet.communication.api.metadata,com.google.gson",com.cognifide.aet.communication.api.queues;version="3.4.1";uses:="javax.jms",com.cognifide.aet.communication.api.util;version="3.4.1";uses:="com.cognifide.aet.communication.api.metadata,javax.validation",com.cognifide.aet.communication.api.wrappers;version="3.4.1";uses:="com.cognifide.aet.communication.api.metadata"', - 'Import-Package': 'com.cognifide.aet.communication.api;version="[3.4,4)",com.cognifide.aet.communication.api.messages;version="[3.4,4)",com.cognifide.aet.communication.api.metadata;version="[3.4,4)",com.cognifide.aet.communication.api.metadata.exclude;version="[3.4,4)",com.cognifide.aet.communication.api.metadata.gson;version="[3.4,4)",com.cognifide.aet.communication.api.util;version="[3.4,4)",com.google.common.base;version="[25.1,26)",com.google.common.collect;version="[25.1,26)",com.google.gson;version="[2.8,3)",com.google.gson.reflect;version="[2.8,3)",javax.jms;version="[1.1,2)",javax.validation;version="[1.1,2)",javax.validation.bootstrap;version="[1.1,2)",javax.validation.constraints;version="[1.1,2)",javax.validation.spi;version="[1.1,2)",org.apache.commons.lang3;version="[3.7,4)",org.apache.commons.lang3.builder;version="[3.7,4)",org.hibernate.validator;version="[4.3,5)",org.hibernate.validator.constraints;version="[4.3,5)",org.slf4j;version="[1.7,2)"' - ) - } -} - -description = 'AET :: API :: Communication API' diff --git a/api/communication-api/build.gradle.kts b/api/communication-api/build.gradle.kts new file mode 100644 index 000000000..69f6d7b69 --- /dev/null +++ b/api/communication-api/build.gradle.kts @@ -0,0 +1,37 @@ +plugins { + id("com.cognifide.aet.java-conventions") + id("biz.aQute.bnd.builder") +} + +dependencies { + testImplementation("com.googlecode.zohhak:zohhak:1.1.1") + testImplementation("junit:junit:4.11") + testImplementation("org.hamcrest:hamcrest-all:1.3") + testImplementation("commons-io:commons-io:2.6") + testImplementation("com.google.guava:guava:25.1-jre") + implementation("javax.validation:validation-api:1.1.0.Final") + implementation("org.hibernate:hibernate-validator:4.3.2.Final") + implementation("com.google.code.gson:gson:2.8.5") + compileOnly("org.apache.activemq:activemq-osgi:5.15.2") + compileOnly("org.apache.commons:commons-lang3:3.7") + compileOnly("org.jboss.logging:jboss-logging:3.3.2.Final") + compileOnly("commons-io:commons-io:2.6") +} + +tasks.jar { + manifest { + attributes( + Pair("Bundle-Vendor", "Cognifide Ltd."), + Pair( + "Export-Package", + "com.cognifide.aet.communication.api;version='3.4.1',com.cognifide.aet.communication.api.exceptions;version='3.4.1',com.cognifide.aet.communication.api.execution;version='3.4.1';uses:='com.cognifide.aet.communication.api.messages',com.cognifide.aet.communication.api.job;version='3.4.1';uses:='com.cognifide.aet.communication.api,com.cognifide.aet.communication.api.metadata',com.cognifide.aet.communication.api.messages;version='3.4.1';uses:='com.cognifide.aet.communication.api',com.cognifide.aet.communication.api.metadata;version='3.4.1';uses:='com.cognifide.aet.communication.api.metadata.exclude,javax.validation',com.cognifide.aet.communication.api.metadata.exclude;version='3.4.1',com.cognifide.aet.communication.api.metadata.gson;version='3.4.1';uses:='com.cognifide.aet.communication.api.metadata,com.google.gson',com.cognifide.aet.communication.api.queues;version='3.4.1';uses:='javax.jms',com.cognifide.aet.communication.api.util;version='3.4.1';uses:='com.cognifide.aet.communication.api.metadata,javax.validation',com.cognifide.aet.communication.api.wrappers;version='3.4.1';uses:='com.cognifide.aet.communication.api.metadata'" + ), + Pair( + "Import-Package", + "com.cognifide.aet.communication.api;version='[3.4,4)',com.cognifide.aet.communication.api.messages;version='[3.4,4)',com.cognifide.aet.communication.api.metadata;version='[3.4,4)',com.cognifide.aet.communication.api.metadata.exclude;version='[3.4,4)',com.cognifide.aet.communication.api.metadata.gson;version='[3.4,4)',com.cognifide.aet.communication.api.util;version='[3.4,4)',com.google.common.base;version='[25.1,26)',com.google.common.collect;version='[25.1,26)',com.google.gson;version='[2.8,3)',com.google.gson.reflect;version='[2.8,3)',javax.jms;version='[1.1,2)',javax.validation;version='[1.1,2)',javax.validation.bootstrap;version='[1.1,2)',javax.validation.constraints;version='[1.1,2)',javax.validation.spi;version='[1.1,2)',org.apache.commons.lang3;version='[3.7,4)',org.apache.commons.lang3.builder;version='[3.7,4)',org.hibernate.validator;version='[4.3,5)',org.hibernate.validator.constraints;version='[4.3,5)',org.slf4j;version='[1.7,2)'" + ) + ) + } +} + +description = "AET :: API :: Communication API" diff --git a/api/datastorage-api/build.gradle b/api/datastorage-api/build.gradle deleted file mode 100644 index f6b21307a..000000000 --- a/api/datastorage-api/build.gradle +++ /dev/null @@ -1,24 +0,0 @@ -plugins { - id 'com.cognifide.aet.java-conventions' - id 'biz.aQute.bnd.builder' -} - -dependencies { - projectCompile project(':communication-api') - compileOnly 'com.google.guava:guava:25.1-jre' - compileOnly 'javax.validation:validation-api:1.1.0.Final' - compileOnly 'org.hibernate:hibernate-validator:4.3.2.Final' - compileOnly 'org.jboss.logging:jboss-logging:3.3.2.Final' - compileOnly 'com.google.code.gson:gson:2.8.5' -} - -jar { - manifest { - attributes( - 'Bundle-Vendor': 'Cognifide Ltd.', - 'Export-Package': 'com.cognifide.aet.vs.*' - ) - } -} - -description = 'AET :: API :: Data Storage API' diff --git a/api/datastorage-api/build.gradle.kts b/api/datastorage-api/build.gradle.kts new file mode 100644 index 000000000..a0a513269 --- /dev/null +++ b/api/datastorage-api/build.gradle.kts @@ -0,0 +1,24 @@ +plugins { + id("com.cognifide.aet.java-conventions") + id("biz.aQute.bnd.builder") +} + +dependencies { + projectCompile(project(":communication-api")) + compileOnly("com.google.guava:guava:25.1-jre") + compileOnly("javax.validation:validation-api:1.1.0.Final") + compileOnly("org.hibernate:hibernate-validator:4.3.2.Final") + compileOnly("org.jboss.logging:jboss-logging:3.3.2.Final") + compileOnly("com.google.code.gson:gson:2.8.5") +} + +tasks.jar { + manifest { + attributes( + Pair("Bundle-Vendor", "Cognifide Ltd."), + Pair("Export-Package", "com.cognifide.aet.vs.*") + ) + } +} + +description = "AET :: API :: Data Storage API" diff --git a/api/jobs-api/build.gradle b/api/jobs-api/build.gradle deleted file mode 100644 index 9ef080230..000000000 --- a/api/jobs-api/build.gradle +++ /dev/null @@ -1,28 +0,0 @@ -plugins { - id 'com.cognifide.aet.java-conventions' - id 'biz.aQute.bnd.builder' -} - -dependencies { - testImplementation 'junit:junit:4.11' - projectCompile project(':communication-api') - projectCompile project(':datastorage-api') - projectCompile project(':selenium') - implementation 'com.google.guava:guava:25.1-jre' - compileOnly 'org.apache.commons:commons-lang3:3.7' - compileOnly 'org.apache.httpcomponents:fluent-hc:4.5.5' - compileOnly 'org.codehaus.jackson:jackson-mapper-asl:1.9.13' -} - -jar { - manifest { - attributes( - 'Bundle-SymbolicName': "${project.name}", - 'Bundle-Name': "${project.name}", - 'Bundle-Vendor': 'Cognifide Ltd.', - 'Export-Package': 'com.cognifide.aet.job.api.*,org.browsermob.core.*' - ) - } -} - -description = 'AET :: API :: Jobs API' diff --git a/api/jobs-api/build.gradle.kts b/api/jobs-api/build.gradle.kts new file mode 100644 index 000000000..41f736875 --- /dev/null +++ b/api/jobs-api/build.gradle.kts @@ -0,0 +1,28 @@ +plugins { + id("com.cognifide.aet.java-conventions") + id("biz.aQute.bnd.builder") +} + +dependencies { + testImplementation("junit:junit:4.11") + projectCompile(project(":communication-api")) + projectCompile(project(":datastorage-api")) + projectCompile(project(":selenium")) + implementation("com.google.guava:guava:25.1-jre") + compileOnly("org.apache.commons:commons-lang3:3.7") + compileOnly("org.apache.httpcomponents:fluent-hc:4.5.5") + compileOnly("org.codehaus.jackson:jackson-mapper-asl:1.9.13") +} + +tasks.jar { + manifest { + attributes( + Pair("Bundle-SymbolicName", project.name), + Pair("Bundle-Name", project.name), + Pair("Bundle-Vendor", "Cognifide Ltd."), + Pair("Export-Package", "com.cognifide.aet.job.api.*,org.browsermob.core.*") + ) + } +} + +description = "AET :: API :: Jobs API" diff --git a/api/validation-api/build.gradle b/api/validation-api/build.gradle deleted file mode 100644 index 88f29ecb5..000000000 --- a/api/validation-api/build.gradle +++ /dev/null @@ -1,19 +0,0 @@ -plugins { - id 'com.cognifide.aet.java-conventions' - id 'biz.aQute.bnd.builder' -} - -dependencies { - compileOnly 'org.apache.commons:commons-lang3:3.7' -} - -jar { - manifest { - attributes( - 'Bundle-Vendor': 'Cognifide Ltd.', - 'Export-Package': 'com.cognifide.aet.validation' - ) - } -} - -description = 'AET :: API :: Validation API' diff --git a/api/validation-api/build.gradle.kts b/api/validation-api/build.gradle.kts new file mode 100644 index 000000000..62a10aada --- /dev/null +++ b/api/validation-api/build.gradle.kts @@ -0,0 +1,19 @@ +plugins { + id("com.cognifide.aet.java-conventions") + id("biz.aQute.bnd.builder") +} + +dependencies { + compileOnly("org.apache.commons:commons-lang3:3.7") +} + +tasks.jar { + manifest { + attributes( + Pair("Bundle-Vendor", "Cognifide Ltd."), + Pair("Export-Package", "com.cognifide.aet.validation") + ) + } +} + +description = "AET :: API :: Validation API" diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts new file mode 100644 index 000000000..c4a4146e1 --- /dev/null +++ b/buildSrc/build.gradle.kts @@ -0,0 +1,10 @@ +plugins { + // Support convention plugins written in Groovy. Convention plugins are build scripts in 'src/main' that automatically become available as plugins in the main build. + id("groovy-gradle-plugin") +} + +repositories { + // Use the plugin portal to apply community plugins in convention plugins. + gradlePluginPortal() +} + diff --git a/buildSrc/src/main/gradle/com.cognifide.aet.java-conventions.gradle b/buildSrc/src/main/gradle/com.cognifide.aet.java-conventions.gradle new file mode 100644 index 000000000..f2b9083d8 --- /dev/null +++ b/buildSrc/src/main/gradle/com.cognifide.aet.java-conventions.gradle @@ -0,0 +1,35 @@ +plugins { + id 'java-library' + id 'maven-publish' +} + +repositories { + maven { + url = 'http://repository.jboss.org/nexus/content/groups/public' + } + mavenCentral() + jcenter() +} + +group = 'com.cognifide.aet' +version = '3.4.1-SNAPSHOT' +java.sourceCompatibility = JavaVersion.VERSION_1_8 + +publishing { + publications { + maven(MavenPublication) { + from(components.java) + } + } +} + +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' +} + +configurations { projectCompile } + +sourceSets.main.compileClasspath += configurations.projectCompile +sourceSets.test.compileClasspath += configurations.projectCompile +sourceSets.test.runtimeClasspath += configurations.projectCompile + diff --git a/client/aet-maven-plugin/build.gradle b/client/aet-maven-plugin/build.gradle deleted file mode 100644 index 7dd555df8..000000000 --- a/client/aet-maven-plugin/build.gradle +++ /dev/null @@ -1,26 +0,0 @@ -plugins { - id 'com.cognifide.aet.java-conventions' -} - -dependencies { - projectCompile project(':communication-api') - projectCompile project(':client-core') - implementation 'org.apache.maven:maven-plugin-api:2.0' - implementation 'org.apache.maven:maven-project:2.2.1' - implementation 'org.codehaus.plexus:plexus-utils:3.0.8' - implementation 'com.google.guava:guava:23.6-jre' - implementation 'org.apache.commons:commons-lang3:3.3.2' - implementation 'commons-io:commons-io:2.4' - implementation 'com.jcabi:jcabi-log:0.12.2' - implementation 'org.slf4j:slf4j-api:1.7.10' - implementation 'org.slf4j:slf4j-log4j12:1.7.10' - implementation 'org.simpleframework:simple-xml:2.7.1' - implementation 'javax.validation:validation-api:1.1.0.Final' - implementation 'org.hibernate:hibernate-validator:4.3.2.Final' - testImplementation 'junit:junit:4.11' - testImplementation 'org.hamcrest:hamcrest-all:1.3' - testImplementation 'org.mockito:mockito-all:1.9.5' - compileOnly 'org.apache.maven.plugin-tools:maven-plugin-annotations:3.2' -} - -description = 'AET :: Client :: Maven Plugin' diff --git a/client/aet-maven-plugin/build.gradle.kts b/client/aet-maven-plugin/build.gradle.kts new file mode 100644 index 000000000..d94291188 --- /dev/null +++ b/client/aet-maven-plugin/build.gradle.kts @@ -0,0 +1,26 @@ +plugins { + id("com.cognifide.aet.java-conventions") +} + +dependencies { + projectCompile(project(":communication-api")) + projectCompile(project(":client-core")) + implementation("org.apache.maven:maven-plugin-api:2.0") + implementation("org.apache.maven:maven-project:2.2.1") + implementation("org.codehaus.plexus:plexus-utils:3.0.8") + implementation("com.google.guava:guava:23.6-jre") + implementation("org.apache.commons:commons-lang3:3.3.2") + implementation("commons-io:commons-io:2.4") + implementation("com.jcabi:jcabi-log:0.12.2") + implementation("org.slf4j:slf4j-api:1.7.10") + implementation("org.slf4j:slf4j-log4j12:1.7.10") + implementation("org.simpleframework:simple-xml:2.7.1") + implementation("javax.validation:validation-api:1.1.0.Final") + implementation("org.hibernate:hibernate-validator:4.3.2.Final") + testImplementation("junit:junit:4.11") + testImplementation("org.hamcrest:hamcrest-all:1.3") + testImplementation("org.mockito:mockito-all:1.9.5") + compileOnly("org.apache.maven.plugin-tools:maven-plugin-annotations:3.2") +} + +description = "AET :: Client :: Maven Plugin" diff --git a/client/client-core/build.gradle b/client/client-core/build.gradle deleted file mode 100644 index 073d92aaa..000000000 --- a/client/client-core/build.gradle +++ /dev/null @@ -1,23 +0,0 @@ -plugins { - id 'com.cognifide.aet.java-conventions' -} - -dependencies { - projectCompile project(':communication-api') - implementation 'org.codehaus.plexus:plexus-utils:3.0.8' - implementation 'com.google.guava:guava:23.6-jre' - implementation 'org.apache.commons:commons-lang3:3.3.2' - implementation 'org.apache.httpcomponents:fluent-hc:4.5.2' - implementation 'org.apache.httpcomponents:httpmime:4.5.2' - implementation 'commons-io:commons-io:2.4' - implementation 'com.jcabi:jcabi-log:0.12.2' - implementation 'org.slf4j:slf4j-api:1.7.10' - implementation 'org.slf4j:slf4j-log4j12:1.7.10' - implementation 'com.google.code.gson:gson:2.6.1' - implementation 'org.simpleframework:simple-xml:2.7.1' - testImplementation 'junit:junit:4.11' - testImplementation 'org.hamcrest:hamcrest-all:1.3' - testImplementation 'org.mockito:mockito-all:1.9.5' -} - -description = 'AET :: Client :: Client Core' diff --git a/client/client-core/build.gradle.kts b/client/client-core/build.gradle.kts new file mode 100644 index 000000000..e7f590bed --- /dev/null +++ b/client/client-core/build.gradle.kts @@ -0,0 +1,23 @@ +plugins { + id("com.cognifide.aet.java-conventions") +} + +dependencies { + projectCompile(project(":communication-api")) + implementation("org.codehaus.plexus:plexus-utils:3.0.8") + implementation("com.google.guava:guava:23.6-jre") + implementation("org.apache.commons:commons-lang3:3.3.2") + implementation("org.apache.httpcomponents:fluent-hc:4.5.2") + implementation("org.apache.httpcomponents:httpmime:4.5.2") + implementation("commons-io:commons-io:2.4") + implementation("com.jcabi:jcabi-log:0.12.2") + implementation("org.slf4j:slf4j-api:1.7.10") + implementation("org.slf4j:slf4j-log4j12:1.7.10") + implementation("com.google.code.gson:gson:2.6.1") + implementation("org.simpleframework:simple-xml:2.7.1") + testImplementation("junit:junit:4.11") + testImplementation("org.hamcrest:hamcrest-all:1.3") + testImplementation("org.mockito:mockito-all:1.9.5") +} + +description = "AET :: Client :: Client Core" diff --git a/core/accessibility-report/build.gradle b/core/accessibility-report/build.gradle deleted file mode 100644 index 476340390..000000000 --- a/core/accessibility-report/build.gradle +++ /dev/null @@ -1,35 +0,0 @@ -plugins { - id 'com.cognifide.aet.java-conventions' - id "org.jetbrains.kotlin.jvm" version "1.4.21-2" - id 'biz.aQute.bnd.builder' -} - -dependencies { - implementation 'org.apache.poi:ooxml-schemas:1.4' - implementation 'org.jetbrains:annotations:19.0.0' - projectCompile project(':communication-api') - projectCompile project(':datastorage-api') - compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0' - compileOnly 'org.osgi:org.osgi.annotation:6.0.0' - compileOnly 'org.osgi:org.osgi.service.metatype.annotations:1.3.0' - compileOnly 'org.slf4j:slf4j-api:1.7.7' - compileOnly 'org.mongodb:mongo-java-driver:3.8.0' - compileOnly 'com.google.code.gson:gson:2.8.5' - compileOnly 'commons-io:commons-io:2.6' - compileOnly 'org.apache.commons:commons-text:1.8' - compileOnly 'org.apache.commons:commons-collections4:4.4' - compileOnly 'org.apache.poi:poi-ooxml:4.1.2' - compileOnly 'org.jetbrains.kotlin:kotlin-osgi-bundle:1.3.72' -} - -jar { - manifest { - attributes( - 'Bundle-Vendor': 'Cognifide Ltd.', - 'Import-Package': 'javax.annotation;resolution:=optional,*', - 'Export-Package': 'com.cognifide.aet.accessibility.report.service.*' - ) - } -} - -description = 'AET :: Core :: Accessibility Report' diff --git a/core/accessibility-report/build.gradle.kts b/core/accessibility-report/build.gradle.kts new file mode 100644 index 000000000..fdbb4e90c --- /dev/null +++ b/core/accessibility-report/build.gradle.kts @@ -0,0 +1,35 @@ +plugins { + id("com.cognifide.aet.java-conventions") + id("org.jetbrains.kotlin.jvm") version ("1.4.21-2") + id("biz.aQute.bnd.builder") +} + +dependencies { + implementation("org.apache.poi:ooxml-schemas:1.4") + implementation("org.jetbrains:annotations:19.0.0") + projectCompile(project(":communication-api")) + projectCompile(project(":datastorage-api")) + compileOnly("org.osgi:org.osgi.service.component.annotations:1.3.0") + compileOnly("org.osgi:org.osgi.annotation:6.0.0") + compileOnly("org.osgi:org.osgi.service.metatype.annotations:1.3.0") + compileOnly("org.slf4j:slf4j-api:1.7.7") + compileOnly("org.mongodb:mongo-java-driver:3.8.0") + compileOnly("com.google.code.gson:gson:2.8.5") + compileOnly("commons-io:commons-io:2.6") + compileOnly("org.apache.commons:commons-text:1.8") + compileOnly("org.apache.commons:commons-collections4:4.4") + compileOnly("org.apache.poi:poi-ooxml:4.1.2") + compileOnly("org.jetbrains.kotlin:kotlin-osgi-bundle:1.3.72") +} + +tasks.jar { + manifest { + attributes( + Pair("Bundle-Vendor", "Cognifide Ltd."), + Pair("Import-Package", "javax.annotation;resolution:=optional,*"), + Pair("Export-Package", "com.cognifide.aet.accessibility.report.service.*") + ) + } +} + +description = "AET :: Core :: Accessibility Report" diff --git a/core/cleaner/build.gradle b/core/cleaner/build.gradle deleted file mode 100644 index cdfd0cc41..000000000 --- a/core/cleaner/build.gradle +++ /dev/null @@ -1,42 +0,0 @@ -plugins { - id 'com.cognifide.aet.java-conventions' - id 'biz.aQute.bnd.builder' -} - -configurations { - testCompile.extendsFrom compileOnly -} - -dependencies { - testImplementation 'junit:junit:4.11' - testImplementation 'org.mockito:mockito-all:1.9.5' - testImplementation 'org.hamcrest:hamcrest-all:1.3' - testImplementation 'com.googlecode.zohhak:zohhak:1.1.1' - testImplementation 'com.google.code.gson:gson:2.8.5' - projectCompile project(':communication-api') - projectCompile project(':datastorage-api') - projectCompile project(':validation-api') - projectCompile project(':datastorage') - projectCompile project(':validation') - compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0' - compileOnly 'org.osgi:org.osgi.annotation:6.0.0' - compileOnly 'org.osgi:org.osgi.service.metatype.annotations:1.3.0' - compileOnly 'com.google.guava:guava:25.1-jre' - compileOnly 'org.apache.commons:commons-lang3:3.7' - compileOnly 'org.apache.activemq:activemq-osgi:5.15.2' - compileOnly 'org.apache.servicemix.bundles:org.apache.servicemix.bundles.quartz:2.3.0_2' - compileOnly 'org.apache.camel:camel-core:2.24.0' - compileOnly 'com.google.code.findbugs:jsr305:3.0.2' -} - -jar { - manifest { - attributes( - 'Bundle-Vendor': 'Cognifide Ltd.', - 'Import-Package': 'javax.annotation;resolution:=optional,*', - 'Export-Package': 'com.cognifide.aet.cleaner.*' - ) - } -} - -description = 'AET :: Core :: Cleaner' diff --git a/core/cleaner/build.gradle.kts b/core/cleaner/build.gradle.kts new file mode 100644 index 000000000..1565ea5a9 --- /dev/null +++ b/core/cleaner/build.gradle.kts @@ -0,0 +1,44 @@ +plugins { + id("com.cognifide.aet.java-conventions") + id("biz.aQute.bnd.builder") +} + +configurations { + testCompile { + extendsFrom(configurations.compileOnly.get()) + } +} + +dependencies { + testImplementation("junit:junit:4.11") + testImplementation("org.mockito:mockito-all:1.9.5") + testImplementation("org.hamcrest:hamcrest-all:1.3") + testImplementation("com.googlecode.zohhak:zohhak:1.1.1") + testImplementation("com.google.code.gson:gson:2.8.5") + projectCompile(project(":communication-api")) + projectCompile(project(":datastorage-api")) + projectCompile(project(":validation-api")) + projectCompile(project(":datastorage")) + projectCompile(project(":validation")) + compileOnly("org.osgi:org.osgi.service.component.annotations:1.3.0") + compileOnly("org.osgi:org.osgi.annotation:6.0.0") + compileOnly("org.osgi:org.osgi.service.metatype.annotations:1.3.0") + compileOnly("com.google.guava:guava:25.1-jre") + compileOnly("org.apache.commons:commons-lang3:3.7") + compileOnly("org.apache.activemq:activemq-osgi:5.15.2") + compileOnly("org.apache.servicemix.bundles:org.apache.servicemix.bundles.quartz:2.3.0_2") + compileOnly("org.apache.camel:camel-core:2.24.0") + compileOnly("com.google.code.findbugs:jsr305:3.0.2") +} + +tasks.jar { + manifest { + attributes( + Pair("Bundle-Vendor", "Cognifide Ltd."), + Pair("Import-Package", "javax.annotation;resolution:=optional,*"), + Pair("Export-Package", "com.cognifide.aet.cleaner.*") + ) + } +} + +description = "AET :: Core :: Cleaner" diff --git a/core/communication/build.gradle b/core/communication/build.gradle deleted file mode 100644 index b989b8d06..000000000 --- a/core/communication/build.gradle +++ /dev/null @@ -1,29 +0,0 @@ -plugins { - id 'com.cognifide.aet.java-conventions' - id 'biz.aQute.bnd.builder' -} - -dependencies { - testImplementation 'junit:junit:4.11' - testImplementation 'org.hamcrest:hamcrest-all:1.3' - testImplementation 'org.mockito:mockito-all:1.9.5' - projectCompile project(':communication-api') - implementation 'javax.jms:jms:1.1' - implementation 'org.slf4j:slf4j-api:1.7.7' - compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0' - compileOnly 'org.osgi:org.osgi.annotation:6.0.0' - compileOnly 'org.osgi:org.osgi.service.metatype.annotations:1.3.0' - compileOnly 'org.apache.activemq:activemq-osgi:5.15.2' - compileOnly 'org.apache.felix:org.apache.felix.configadmin:1.8.16' -} - -jar { - manifest { - attributes( - 'Bundle-Vendor': 'Cognifide Ltd.', - 'Export-Package': 'com.cognifide.aet.queues.*' - ) - } -} - -description = 'AET :: Core :: Communication' diff --git a/core/communication/build.gradle.kts b/core/communication/build.gradle.kts new file mode 100644 index 000000000..014ac931c --- /dev/null +++ b/core/communication/build.gradle.kts @@ -0,0 +1,29 @@ +plugins { + id("com.cognifide.aet.java-conventions") + id("biz.aQute.bnd.builder") +} + +dependencies { + testImplementation("junit:junit:4.11") + testImplementation("org.hamcrest:hamcrest-all:1.3") + testImplementation("org.mockito:mockito-all:1.9.5") + projectCompile(project(":communication-api")) + implementation("javax.jms:jms:1.1") + implementation("org.slf4j:slf4j-api:1.7.7") + compileOnly("org.osgi:org.osgi.service.component.annotations:1.3.0") + compileOnly("org.osgi:org.osgi.annotation:6.0.0") + compileOnly("org.osgi:org.osgi.service.metatype.annotations:1.3.0") + compileOnly("org.apache.activemq:activemq-osgi:5.15.2") + compileOnly("org.apache.felix:org.apache.felix.configadmin:1.8.16") +} + +tasks.jar { + manifest { + attributes( + Pair("Bundle-Vendor", "Cognifide Ltd."), + Pair("Export-Package", "com.cognifide.aet.queues.*") + ) + } +} + +description = "AET :: Core :: Communication" diff --git a/core/datastorage/build.gradle b/core/datastorage/build.gradle deleted file mode 100644 index 1ba4534ac..000000000 --- a/core/datastorage/build.gradle +++ /dev/null @@ -1,38 +0,0 @@ -plugins { - id 'com.cognifide.aet.java-conventions' - id 'biz.aQute.bnd.builder' -} - -dependencies { - testImplementation 'junit:junit:4.11' - testImplementation 'org.hamcrest:hamcrest-all:1.3' - testImplementation 'org.mockito:mockito-all:1.9.5' - testImplementation 'com.github.stefanbirkner:system-rules:1.18.0' - projectCompile project(':communication-api') - projectCompile project(':datastorage-api') - projectCompile project(':validation-api') - projectCompile project(':validation') - implementation 'org.mongodb:mongo-java-driver:3.8.0' - implementation 'org.slf4j:slf4j-api:1.7.7' - implementation 'org.apache.commons:commons-lang3:3.7' - compileOnly 'com.google.guava:guava:25.1-jre' - compileOnly 'commons-codec:commons-codec:1.11' - compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0' - compileOnly 'org.osgi:org.osgi.annotation:6.0.0' - compileOnly 'org.osgi:org.osgi.service.metatype.annotations:1.3.0' - compileOnly 'com.google.code.gson:gson:2.8.5' - compileOnly 'org.osgi:org.osgi.compendium:4.2.0' - compileOnly 'commons-io:commons-io:2.6' - compileOnly 'org.apache.servicemix.bundles:org.apache.servicemix.bundles.quartz:2.3.0_2' -} - -jar { - manifest { - attributes( - 'Bundle-Vendor': 'Cognifide Ltd.', - 'Export-Package': "com.cognifide.aet.vs.metadata.*,com.cognifide.aet.vs.mongodb.*" - ) - } -} - -description = 'AET :: Core :: Data Storage' diff --git a/core/datastorage/build.gradle.kts b/core/datastorage/build.gradle.kts new file mode 100644 index 000000000..3991643e5 --- /dev/null +++ b/core/datastorage/build.gradle.kts @@ -0,0 +1,38 @@ +plugins { + id("com.cognifide.aet.java-conventions") + id("biz.aQute.bnd.builder") +} + +dependencies { + testImplementation("junit:junit:4.11") + testImplementation("org.hamcrest:hamcrest-all:1.3") + testImplementation("org.mockito:mockito-all:1.9.5") + testImplementation("com.github.stefanbirkner:system-rules:1.18.0") + projectCompile(project(":communication-api")) + projectCompile(project(":datastorage-api")) + projectCompile(project(":validation-api")) + projectCompile(project(":validation")) + implementation("org.mongodb:mongo-java-driver:3.8.0") + implementation("org.slf4j:slf4j-api:1.7.7") + implementation("org.apache.commons:commons-lang3:3.7") + compileOnly("com.google.guava:guava:25.1-jre") + compileOnly("commons-codec:commons-codec:1.11") + compileOnly("org.osgi:org.osgi.service.component.annotations:1.3.0") + compileOnly("org.osgi:org.osgi.annotation:6.0.0") + compileOnly("org.osgi:org.osgi.service.metatype.annotations:1.3.0") + compileOnly("com.google.code.gson:gson:2.8.5") + compileOnly("org.osgi:org.osgi.compendium:4.2.0") + compileOnly("commons-io:commons-io:2.6") + compileOnly("org.apache.servicemix.bundles:org.apache.servicemix.bundles.quartz:2.3.0_2") +} + +tasks.jar { + manifest { + attributes( + Pair("Bundle-Vendor", "Cognifide Ltd."), + Pair("Export-Package", "com.cognifide.aet.vs.metadata.*,com.cognifide.aet.vs.mongodb.*") + ) + } +} + +description = "AET :: Core :: Data Storage" diff --git a/core/jobs/build.gradle b/core/jobs/build.gradle deleted file mode 100644 index 3e53c34cd..000000000 --- a/core/jobs/build.gradle +++ /dev/null @@ -1,47 +0,0 @@ -plugins { - id 'com.cognifide.aet.java-conventions' - id 'biz.aQute.bnd.builder' -} - -dependencies { - testImplementation 'junit:junit:4.11' - testImplementation 'org.hamcrest:hamcrest-all:1.3' - testImplementation 'org.mockito:mockito-all:1.9.5' - testImplementation 'com.googlecode.zohhak:zohhak:1.1.1' - testImplementation 'xmlunit:xmlunit:1.2' - testImplementation 'uk.co.jemos.podam:podam:3.6.0.RELEASE' - testImplementation 'com.googlecode.catch-exception:catch-exception:1.2.0' - testImplementation 'org.skyscreamer:jsonassert:1.3.0' - testImplementation 'org.slf4j:slf4j-simple:1.7.7' - testImplementation 'org.assertj:assertj-core:3.11.1' - implementation 'com.googlecode.java-diff-utils:diffutils:1.3.0' - implementation 'org.apache.commons:commons-lang3:3.7' - implementation 'org.jsoup:jsoup:1.11.3' - compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0' - compileOnly 'org.osgi:org.osgi.annotation:6.0.0' - compileOnly 'org.osgi:org.osgi.service.metatype.annotations:1.3.0' - compileOnly 'org.osgi:org.osgi.core:4.3.0' - compileOnly 'org.apache.httpcomponents:fluent-hc:4.5.5' - compileOnly 'com.google.code.gson:gson:2.8.5' - compileOnly 'org.slf4j:slf4j-api:1.7.7' - compileOnly 'com.google.code.findbugs:jsr305:3.0.2' - projectCompile project(':communication-api') - projectCompile project(':jobs-api') - projectCompile project(':datastorage-api') - projectCompile project(':validation-api') - projectCompile project(':proxy') - projectCompile project(':selenium') - projectCompile project(':w3chtml5validator') -} - -jar { - manifest { - attributes( - 'Bundle-Vendor': 'Cognifide Ltd.', - 'Import-Package': 'javax.annotation;resolution:=optional,*', - 'Export-Package': 'com.cognifide.aet.job.common.*,collectors.*' - ) - } -} - -description = 'AET :: Core :: Jobs' diff --git a/core/jobs/build.gradle.kts b/core/jobs/build.gradle.kts new file mode 100644 index 000000000..e4bba27f9 --- /dev/null +++ b/core/jobs/build.gradle.kts @@ -0,0 +1,47 @@ +plugins { + id("com.cognifide.aet.java-conventions") + id("biz.aQute.bnd.builder") +} + +dependencies { + testImplementation("junit:junit:4.11") + testImplementation("org.hamcrest:hamcrest-all:1.3") + testImplementation("org.mockito:mockito-all:1.9.5") + testImplementation("com.googlecode.zohhak:zohhak:1.1.1") + testImplementation("xmlunit:xmlunit:1.2") + testImplementation("uk.co.jemos.podam:podam:3.6.0.RELEASE") + testImplementation("com.googlecode.catch-exception:catch-exception:1.2.0") + testImplementation("org.skyscreamer:jsonassert:1.3.0") + testImplementation("org.slf4j:slf4j-simple:1.7.7") + testImplementation("org.assertj:assertj-core:3.11.1") + implementation("com.googlecode.java-diff-utils:diffutils:1.3.0") + implementation("org.apache.commons:commons-lang3:3.7") + implementation("org.jsoup:jsoup:1.11.3") + compileOnly("org.osgi:org.osgi.service.component.annotations:1.3.0") + compileOnly("org.osgi:org.osgi.annotation:6.0.0") + compileOnly("org.osgi:org.osgi.service.metatype.annotations:1.3.0") + compileOnly("org.osgi:org.osgi.core:4.3.0") + compileOnly("org.apache.httpcomponents:fluent-hc:4.5.5") + compileOnly("com.google.code.gson:gson:2.8.5") + compileOnly("org.slf4j:slf4j-api:1.7.7") + compileOnly("com.google.code.findbugs:jsr305:3.0.2") + projectCompile(project(":communication-api")) + projectCompile(project(":jobs-api")) + projectCompile(project(":datastorage-api")) + projectCompile(project(":validation-api")) + projectCompile(project(":proxy")) + projectCompile(project(":selenium")) + projectCompile(project(":w3chtml5validator")) +} + +tasks.jar { + manifest { + attributes( + Pair("Bundle-Vendor", "Cognifide Ltd."), + Pair("Import-Package", "javax.annotation;resolution:=optional,*"), + Pair("Export-Package", "com.cognifide.aet.job.common.*,collectors.*") + ) + } +} + +description = "AET :: Core :: Jobs" diff --git a/core/runner/build.gradle b/core/runner/build.gradle deleted file mode 100644 index ada275f63..000000000 --- a/core/runner/build.gradle +++ /dev/null @@ -1,35 +0,0 @@ -plugins { - id 'com.cognifide.aet.java-conventions' - id 'biz.aQute.bnd.builder' -} - -dependencies { - testImplementation 'junit:junit:4.11' - testImplementation 'org.hamcrest:hamcrest-all:1.3' - testImplementation 'org.mockito:mockito-all:1.9.5' - testImplementation 'com.googlecode.zohhak:zohhak:1.1.1' - testImplementation 'commons-io:commons-io:2.6' - implementation 'com.google.guava:guava:25.1-jre' - projectCompile project(':communication-api') - projectCompile project(':datastorage-api') - projectCompile project(':communication') - compileOnly 'com.google.code.gson:gson:2.8.5' - compileOnly 'commons-io:commons-io:2.6' - compileOnly 'org.apache.commons:commons-lang3:3.7' - compileOnly 'org.apache.activemq:activemq-osgi:5.15.2' - compileOnly 'javax.validation:validation-api:1.1.0.Final' - compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0' - compileOnly 'org.osgi:org.osgi.annotation:6.0.0' - compileOnly 'org.osgi:org.osgi.service.metatype.annotations:1.3.0' -} - -jar { - manifest { - attributes( - 'Bundle-Vendor': 'Cognifide Ltd.', - 'Export-Package': 'com.cognifide.aet.runner*' - ) - } -} - -description = 'AET :: Core :: Runner' diff --git a/core/runner/build.gradle.kts b/core/runner/build.gradle.kts new file mode 100644 index 000000000..625e81b90 --- /dev/null +++ b/core/runner/build.gradle.kts @@ -0,0 +1,35 @@ +plugins { + id("com.cognifide.aet.java-conventions") + id("biz.aQute.bnd.builder") +} + +dependencies { + testImplementation("junit:junit:4.11") + testImplementation("org.hamcrest:hamcrest-all:1.3") + testImplementation("org.mockito:mockito-all:1.9.5") + testImplementation("com.googlecode.zohhak:zohhak:1.1.1") + testImplementation("commons-io:commons-io:2.6") + implementation("com.google.guava:guava:25.1-jre") + projectCompile(project(":communication-api")) + projectCompile(project(":datastorage-api")) + projectCompile(project(":communication")) + compileOnly("com.google.code.gson:gson:2.8.5") + compileOnly("commons-io:commons-io:2.6") + compileOnly("org.apache.commons:commons-lang3:3.7") + compileOnly("org.apache.activemq:activemq-osgi:5.15.2") + compileOnly("javax.validation:validation-api:1.1.0.Final") + compileOnly("org.osgi:org.osgi.service.component.annotations:1.3.0") + compileOnly("org.osgi:org.osgi.annotation:6.0.0") + compileOnly("org.osgi:org.osgi.service.metatype.annotations:1.3.0") +} + +tasks.jar { + manifest { + attributes( + Pair("Bundle-Vendor", "Cognifide Ltd."), + Pair("Export-Package", "com.cognifide.aet.runner*") + ) + } +} + +description = "AET :: Core :: Runner" diff --git a/core/validation/build.gradle b/core/validation/build.gradle deleted file mode 100644 index ba7544f71..000000000 --- a/core/validation/build.gradle +++ /dev/null @@ -1,26 +0,0 @@ -plugins { - id 'com.cognifide.aet.java-conventions' - id 'biz.aQute.bnd.builder' -} - -dependencies { - testImplementation 'junit:junit:4.11' - testImplementation 'org.hamcrest:hamcrest-all:1.3' - testImplementation 'org.mockito:mockito-all:1.9.5' - implementation 'org.apache.commons:commons-lang3:3.7' - projectCompile project(':validation-api') - compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0' - compileOnly 'org.osgi:org.osgi.annotation:6.0.0' - compileOnly 'org.osgi:org.osgi.service.metatype.annotations:1.3.0' -} - -jar { - manifest { - attributes( - 'Bundle-Vendor': 'Cognifide Ltd.', - 'Export-Package': 'com.cognifide.aet.validation.impl.*' - ) - } -} - -description = 'AET :: Core :: Validation' diff --git a/core/validation/build.gradle.kts b/core/validation/build.gradle.kts new file mode 100644 index 000000000..7aca36a8b --- /dev/null +++ b/core/validation/build.gradle.kts @@ -0,0 +1,26 @@ +plugins { + id("com.cognifide.aet.java-conventions") + id("biz.aQute.bnd.builder") +} + +dependencies { + testImplementation("junit:junit:4.11") + testImplementation("org.hamcrest:hamcrest-all:1.3") + testImplementation("org.mockito:mockito-all:1.9.5") + implementation("org.apache.commons:commons-lang3:3.7") + projectCompile(project(":validation-api")) + compileOnly("org.osgi:org.osgi.service.component.annotations:1.3.0") + compileOnly("org.osgi:org.osgi.annotation:6.0.0") + compileOnly("org.osgi:org.osgi.service.metatype.annotations:1.3.0") +} + +tasks.jar { + manifest { + attributes( + Pair("Bundle-Vendor", "Cognifide Ltd."), + Pair("Export-Package", "com.cognifide.aet.validation.impl.*") + ) + } +} + +description = "AET :: Core :: Validation" diff --git a/core/worker/build.gradle b/core/worker/build.gradle deleted file mode 100644 index 7ef4932a2..000000000 --- a/core/worker/build.gradle +++ /dev/null @@ -1,40 +0,0 @@ -plugins { - id 'com.cognifide.aet.java-conventions' - id 'biz.aQute.bnd.builder' -} - -dependencies { - testImplementation 'junit:junit:4.11' - testImplementation 'org.hamcrest:hamcrest-all:1.3' - testImplementation 'org.mockito:mockito-all:1.9.5' - projectCompile project(':jobs-api') - projectCompile project(':communication-api') - projectCompile project(':datastorage-api') - projectCompile project(':communication') - projectCompile project(':proxy') - projectCompile project(':selenium') - compileOnly 'com.google.guava:guava:25.1-jre' - compileOnly('org.apache.activemq:activemq-osgi:5.15.2') { - exclude group: 'com.google.guava', module: 'guava' - } - compileOnly 'org.osgi:org.osgi.core:4.3.0' - compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0' - compileOnly 'org.osgi:org.osgi.annotation:6.0.0' - compileOnly 'org.osgi:org.osgi.service.metatype.annotations:1.3.0' - compileOnly 'javax.validation:validation-api:1.1.0.Final' - compileOnly 'org.apache.httpcomponents:fluent-hc:4.5.5' - compileOnly 'org.apache.httpcomponents:httpclient:4.4' - compileOnly 'com.google.code.findbugs:jsr305:3.0.2' -} - -jar { - manifest { - attributes( - 'Bundle-Vendor': 'Cognifide Ltd.', - 'Import-Package': 'javax.annotation;resolution:=optional,*', - 'Export-Package': 'com.cognifide.aet.worker.*' - ) - } -} - -description = 'AET :: Core :: Worker' diff --git a/core/worker/build.gradle.kts b/core/worker/build.gradle.kts new file mode 100644 index 000000000..32618b174 --- /dev/null +++ b/core/worker/build.gradle.kts @@ -0,0 +1,40 @@ +plugins { + id("com.cognifide.aet.java-conventions") + id("biz.aQute.bnd.builder") +} + +dependencies { + testImplementation("junit:junit:4.11") + testImplementation("org.hamcrest:hamcrest-all:1.3") + testImplementation("org.mockito:mockito-all:1.9.5") + projectCompile(project(":jobs-api")) + projectCompile(project(":communication-api")) + projectCompile(project(":datastorage-api")) + projectCompile(project(":communication")) + projectCompile(project(":proxy")) + projectCompile(project(":selenium")) + compileOnly("com.google.guava:guava:25.1-jre") + compileOnly("org.apache.activemq:activemq-osgi:5.15.2") { + exclude("com.google.guava", "guava") + } + compileOnly("org.osgi:org.osgi.core:4.3.0") + compileOnly("org.osgi:org.osgi.service.component.annotations:1.3.0") + compileOnly("org.osgi:org.osgi.annotation:6.0.0") + compileOnly("org.osgi:org.osgi.service.metatype.annotations:1.3.0") + compileOnly("javax.validation:validation-api:1.1.0.Final") + compileOnly("org.apache.httpcomponents:fluent-hc:4.5.5") + compileOnly("org.apache.httpcomponents:httpclient:4.4") + compileOnly("com.google.code.findbugs:jsr305:3.0.2") +} + +tasks.jar { + manifest { + attributes( + Pair("Bundle-Vendor", "Cognifide Ltd."), + Pair("Import-Package", "javax.annotation;resolution:=optional,*"), + Pair("Export-Package", "com.cognifide.aet.worker.*") + ) + } +} + +description = "AET :: Core :: Worker" diff --git a/gradle.properties b/gradle.properties deleted file mode 100644 index befa61a8d..000000000 --- a/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -seleniumVersion=3.8.1 \ No newline at end of file diff --git a/integration-tests/cleaner-test/build.gradle b/integration-tests/cleaner-test/build.gradle deleted file mode 100644 index f21aefc93..000000000 --- a/integration-tests/cleaner-test/build.gradle +++ /dev/null @@ -1,31 +0,0 @@ -plugins { - id 'com.cognifide.aet.java-conventions' -} - -configurations { - testCompile.extendsFrom compileOnly -} - -dependencies { - testImplementation 'junit:junit:4.11' - testImplementation 'org.mockito:mockito-all:1.9.5' - testImplementation 'org.hamcrest:hamcrest-all:1.3' - testImplementation 'com.googlecode.zohhak:zohhak:1.1.1' - testImplementation 'com.google.code.gson:gson:2.8.5' - testImplementation 'de.bwaldvogel:mongo-java-server:1.12.0' - testImplementation 'org.mongodb:mongo-java-driver:3.8.0' - testImplementation 'org.apache.sling:org.apache.sling.testing.osgi-mock.junit4:2.4.6' - projectCompile project(':communication-api') - projectCompile project(':cleaner') - projectCompile project(':datastorage-api') - projectCompile project(':datastorage') - compileOnly 'org.osgi:org.osgi.core:4.3.0' - compileOnly 'org.osgi:org.osgi.compendium:4.2.0' - compileOnly 'com.google.guava:guava:25.1-jre' - compileOnly 'org.apache.commons:commons-lang3:3.7' - compileOnly 'org.apache.servicemix.bundles:org.apache.servicemix.bundles.quartz:2.3.0_2' - compileOnly 'org.apache.camel:camel-core:2.24.0' - compileOnly 'com.google.code.findbugs:jsr305:3.0.2' -} - -description = 'AET :: Integration Tests :: Cleaner Test' diff --git a/integration-tests/cleaner-test/build.gradle.kts b/integration-tests/cleaner-test/build.gradle.kts new file mode 100644 index 000000000..4b971f8ee --- /dev/null +++ b/integration-tests/cleaner-test/build.gradle.kts @@ -0,0 +1,33 @@ +plugins { + id("com.cognifide.aet.java-conventions") +} + +configurations { + testCompile { + extendsFrom(configurations.compileOnly.get()) + } +} + +dependencies { + testImplementation("junit:junit:4.11") + testImplementation("org.mockito:mockito-all:1.9.5") + testImplementation("org.hamcrest:hamcrest-all:1.3") + testImplementation("com.googlecode.zohhak:zohhak:1.1.1") + testImplementation("com.google.code.gson:gson:2.8.5") + testImplementation("de.bwaldvogel:mongo-java-server:1.12.0") + testImplementation("org.mongodb:mongo-java-driver:3.8.0") + testImplementation("org.apache.sling:org.apache.sling.testing.osgi-mock.junit4:2.4.6") + projectCompile(project(":communication-api")) + projectCompile(project(":cleaner")) + projectCompile(project(":datastorage-api")) + projectCompile(project(":datastorage")) + compileOnly("org.osgi:org.osgi.core:4.3.0") + compileOnly("org.osgi:org.osgi.compendium:4.2.0") + compileOnly("com.google.guava:guava:25.1-jre") + compileOnly("org.apache.commons:commons-lang3:3.7") + compileOnly("org.apache.servicemix.bundles:org.apache.servicemix.bundles.quartz:2.3.0_2") + compileOnly("org.apache.camel:camel-core:2.24.0") + compileOnly("com.google.code.findbugs:jsr305:3.0.2") +} + +description = "AET :: Integration Tests :: Cleaner Test" diff --git a/integration-tests/sample-site/build.gradle b/integration-tests/sample-site/build.gradle deleted file mode 100644 index 5a00de022..000000000 --- a/integration-tests/sample-site/build.gradle +++ /dev/null @@ -1,13 +0,0 @@ -plugins { - id 'com.cognifide.aet.java-conventions' - id 'war' -} - -dependencies { - implementation 'taglibs:standard:1.1.2' - implementation 'javax.servlet:jstl:1.2' - testImplementation 'junit:junit:4.11' - implementation 'javax.servlet:javax.servlet-api:3.0.1' -} - -description = 'AET :: Integration Tests :: Sample Site' diff --git a/integration-tests/sample-site/build.gradle.kts b/integration-tests/sample-site/build.gradle.kts new file mode 100644 index 000000000..6b4ed056e --- /dev/null +++ b/integration-tests/sample-site/build.gradle.kts @@ -0,0 +1,13 @@ +plugins { + id("com.cognifide.aet.java-conventions") + id("war") +} + +dependencies { + implementation("taglibs:standard:1.1.2") + implementation("javax.servlet:jstl:1.2") + testImplementation("junit:junit:4.11") + implementation("javax.servlet:javax.servlet-api:3.0.1") +} + +description = "AET :: Integration Tests :: Sample Site" diff --git a/osgi-dependencies/proxy/build.gradle b/osgi-dependencies/proxy/build.gradle deleted file mode 100644 index 6a13f329f..000000000 --- a/osgi-dependencies/proxy/build.gradle +++ /dev/null @@ -1,31 +0,0 @@ -plugins { - id 'com.cognifide.aet.java-conventions' - id 'biz.aQute.bnd.builder' -} - -dependencies { - implementation 'com.github.detro:browsermob-proxy-client:0.1.3' - projectCompile project(':jobs-api') - projectCompile project(':selenium') - compileOnly 'org.osgi:org.osgi.core:4.3.0' - compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0' - compileOnly 'org.osgi:org.osgi.annotation:6.0.0' - compileOnly 'org.osgi:org.osgi.service.metatype.annotations:1.3.0' - compileOnly 'org.json:json:20180130' - compileOnly 'com.google.code.gson:gson:2.8.5' - compileOnly 'org.apache.httpcomponents:httpclient:4.4' -} - -jar { - manifest { - attributes( - 'Bundle-Vendor': 'Cognifide Ltd.', - 'Export-Package': 'com.cognifide.aet.proxy.*', - 'Include-Resource': 'browsermob-proxy-client-0.1.3.jar', - 'Bundle-ClassPath': '.,browsermob-proxy-client-0.1.3.jar', - 'Import-Package': 'com.cognifide.aet.job.api.collector;version="[3.4,4)",com.cognifide.aet.job.api.exceptions;version="[3.4,4)",com.cognifide.aet.proxy.configuration;version="[3.4,4)",com.cognifide.aet.proxy.exceptions;version="[3.4,4)",com.google.common.collect;version="[25.1,26)",com.google.gson;version="[2.8,3)",javax.xml.bind,org.apache.http,org.apache.http.client.entity,org.apache.http.client.methods,org.apache.http.client.utils,org.apache.http.entity,org.apache.http.impl.client,org.apache.http.message,org.browsermob.core.har;version="[3.4,4)",org.json;version="[20180130.0,20180131)",org.openqa.selenium;version="[3.8,4)",org.openqa.selenium.net;version="[3.8,4)",org.slf4j;version="[1.7,2)"' - ) - } -} - -description = 'AET :: OSGi Dependencies :: Proxy' diff --git a/osgi-dependencies/proxy/build.gradle.kts b/osgi-dependencies/proxy/build.gradle.kts new file mode 100644 index 000000000..34f711a27 --- /dev/null +++ b/osgi-dependencies/proxy/build.gradle.kts @@ -0,0 +1,34 @@ +plugins { + id("com.cognifide.aet.java-conventions") + id("biz.aQute.bnd.builder") +} + +dependencies { + implementation("com.github.detro:browsermob-proxy-client:0.1.3") + projectCompile(project(":jobs-api")) + projectCompile(project(":selenium")) + compileOnly("org.osgi:org.osgi.core:4.3.0") + compileOnly("org.osgi:org.osgi.service.component.annotations:1.3.0") + compileOnly("org.osgi:org.osgi.annotation:6.0.0") + compileOnly("org.osgi:org.osgi.service.metatype.annotations:1.3.0") + compileOnly("org.json:json:20180130") + compileOnly("com.google.code.gson:gson:2.8.5") + compileOnly("org.apache.httpcomponents:httpclient:4.4") +} + +tasks.jar { + manifest { + attributes( + Pair("Bundle-Vendor", "Cognifide Ltd."), + Pair("Export-Package", "com.cognifide.aet.proxy.*"), + Pair("Include-Resource", "browsermob-proxy-client-0.1.3.jar"), + Pair("Bundle-ClassPath", ".,browsermob-proxy-client-0.1.3.jar"), + Pair( + "Import-Package", + "com.cognifide.aet.job.api.collector;version='[3.4,4)',com.cognifide.aet.job.api.exceptions;version='[3.4,4)',com.cognifide.aet.proxy.configuration;version='[3.4,4)',com.cognifide.aet.proxy.exceptions;version='[3.4,4)',com.google.common.collect;version='[25.1,26)',com.google.gson;version='[2.8,3)',javax.xml.bind,org.apache.http,org.apache.http.client.entity,org.apache.http.client.methods,org.apache.http.client.utils,org.apache.http.entity,org.apache.http.impl.client,org.apache.http.message,org.browsermob.core.har;version='[3.4,4)',org.json;version='[20180130.0,20180131)',org.openqa.selenium;version='[3.8,4)',org.openqa.selenium.net;version='[3.8,4)',org.slf4j;version='[1.7,2)'" + ) + ) + } +} + +description = "AET :: OSGi Dependencies :: Proxy" diff --git a/osgi-dependencies/selenium/build.gradle b/osgi-dependencies/selenium/build.gradle deleted file mode 100644 index fe1d824a5..000000000 --- a/osgi-dependencies/selenium/build.gradle +++ /dev/null @@ -1,35 +0,0 @@ -plugins { - id 'com.cognifide.aet.java-conventions' - id 'biz.aQute.bnd.builder' -} - -dependencies { - implementation 'org.seleniumhq.selenium:jetty-repacked:7.6.1.1' - implementation "org.seleniumhq.selenium:selenium-java:${seleniumVersion}" - implementation "org.seleniumhq.selenium:selenium-api:${seleniumVersion}" - implementation "org.seleniumhq.selenium:selenium-chrome-driver:${seleniumVersion}" - implementation "org.seleniumhq.selenium:selenium-firefox-driver:${seleniumVersion}" - implementation 'org.seleniumhq.selenium:selenium-htmlunit-driver:2.52.0' - implementation "org.seleniumhq.selenium:selenium-ie-driver:${seleniumVersion}" - implementation "org.seleniumhq.selenium:selenium-remote-driver:${seleniumVersion}" - implementation "org.seleniumhq.selenium:selenium-support:${seleniumVersion}" - implementation "org.seleniumhq.selenium:selenium-server:${seleniumVersion}" - implementation 'org.apache.commons:commons-exec:1.3' - implementation 'com.sun.jna:jna:3.0.9' - implementation 'net.java.dev.jna:jna:3.3.0' - implementation 'net.java.dev.jna:platform:3.5.2' -} - -jar { - manifest { - attributes( - 'Bundle-Vendor': 'Cognifide Ltd.', - 'Export-Package': "org.openqa.*;version=\"${seleniumVersion}\"", - 'Import-Package': 'com.beust.jcommander;resolution:=optional;version="[1.48,2)",com.beust.jcommander.converters;resolution:=optional;version="[1.48,2)",com.gargoylesoftware.htmlunit.javascript.host;resolution:=optional,com.gargoylesoftware.htmlunit.javascript.host.dom;resolution:=optional,com.gargoylesoftware.htmlunit.javascript.host.event;resolution:=optional,com.gargoylesoftware.htmlunit.javascript.host.html;resolution:=optional,javax.servlet;resolution:=optional;version="[3.1,4)",javax.servlet.http;resolution:=optional;version="[3.1,4)",org.eclipse.jetty.client;resolution:=optional;version="[9.4,10)",org.eclipse.jetty.client.security;resolution:=optional,org.eclipse.jetty.client.webdav;resolution:=optional,org.eclipse.jetty.continuation;resolution:=optional,org.eclipse.jetty.http;resolution:=optional;version="[9.4,10)",org.eclipse.jetty.http.gzip;resolution:=optional,org.eclipse.jetty.io;resolution:=optional;version="[9.4,10)",org.eclipse.jetty.io.bio;resolution:=optional,org.eclipse.jetty.io.nio;resolution:=optional,org.eclipse.jetty.jmx;resolution:=optional,org.eclipse.jetty.security;resolution:=optional,org.eclipse.jetty.security.authentication;resolution:=optional,org.eclipse.jetty.server;resolution:=optional,org.eclipse.jetty.server.bio;resolution:=optional,org.eclipse.jetty.server.handler;resolution:=optional,org.eclipse.jetty.server.handler.jmx;resolution:=optional,org.eclipse.jetty.server.jmx;resolution:=optional,org.eclipse.jetty.server.nio;resolution:=optional,org.eclipse.jetty.server.session;resolution:=optional,org.eclipse.jetty.server.session.jmx;resolution:=optional,org.eclipse.jetty.server.ssl;resolution:=optional,org.eclipse.jetty.servlet;resolution:=optional,org.eclipse.jetty.servlet.api;resolution:=optional,org.eclipse.jetty.servlet.jmx;resolution:=optional,org.eclipse.jetty.servlet.listener;resolution:=optional,org.eclipse.jetty.servlets;resolution:=optional,org.eclipse.jetty.util;resolution:=optional;version="[9.4,10)",org.eclipse.jetty.util.ajax;resolution:=optional,org.eclipse.jetty.util.component;resolution:=optional;version="[9.4,10)",org.eclipse.jetty.util.log;resolution:=optional;version="[9.4,10)",org.eclipse.jetty.util.resource;resolution:=optional;version="[9.4,10)",org.eclipse.jetty.util.security;resolution:=optional;version="[9.4,10)",org.eclipse.jetty.util.ssl;resolution:=optional;version="[9.4,10)",org.eclipse.jetty.util.statistic;resolution:=optional;version="[9.4,10)",org.eclipse.jetty.util.thread;resolution:=optional;version="[9.4,10)",org.eclipse.jetty.webapp;resolution:=optional,org.eclipse.jetty.xml;resolution:=optional;version="[9.4,10)",org.mortbay.log;resolution:=optional,org.mortbay.util.ajax;resolution:=optional,org.seleniumhq.jetty7.jmx;resolution:=optional,org.seleniumhq.jetty9.security;resolution:=optional,org.seleniumhq.jetty9.server;resolution:=optional,org.seleniumhq.jetty9.servlet;resolution:=optional,org.seleniumhq.jetty9.util.security;resolution:=optional,org.seleniumhq.jetty9.util.thread;resolution:=optional,net.bytebuddy;resolution:=optional;version="[1.7,2)",net.bytebuddy.description.annotation;resolution:=optional;version="[1.7,2)",net.bytebuddy.dynamic;resolution:=optional;version="[1.7,2)",net.bytebuddy.implementation;resolution:=optional;version="[1.7,2)",net.bytebuddy.matcher;resolution:=optional;version="[1.7,2)",org.openqa.selenium.safari;resolution:=optional,org.openqa.selenium.security;resolution:=optional,com.gargoylesoftware.htmlunit,com.gargoylesoftware.htmlunit.html,com.gargoylesoftware.htmlunit.javascript,com.gargoylesoftware.htmlunit.util,com.google.common.base;version="[25.1,26)",com.google.common.cache;version="[25.1,26)",com.google.common.collect;version="[25.1,26)",com.google.common.io;version="[25.1,26)",com.google.common.net;version="[25.1,26)",com.google.common.primitives;version="[25.1,26)",com.google.common.reflect;version="[25.1,26)",com.google.common.util.concurrent;version="[25.1,26)",com.google.gson;version="[2.8,3)",com.google.gson.annotations;version="[2.8,3)",com.google.gson.reflect;version="[2.8,3)",com.google.gson.stream;version="[2.8,3)",javax.imageio,javax.management,javax.naming,javax.net,javax.net.ssl,javax.security.auth,javax.security.cert,javax.sql,javax.swing,javax.swing.text,javax.xml.namespace,javax.xml.parsers,javax.xml.xpath,net.jcip.annotations,net.sourceforge.htmlunit.corejs.javascript,org.apache.http,org.apache.http.auth,org.apache.http.client,org.apache.http.client.config,org.apache.http.client.methods,org.apache.http.config,org.apache.http.conn,org.apache.http.conn.routing,org.apache.http.conn.socket,org.apache.http.conn.ssl,org.apache.http.entity,org.apache.http.impl.client,org.apache.http.impl.conn,org.apache.http.message,org.apache.http.protocol,org.apache.http.util,org.ietf.jgss,org.openqa.grid.common;version="[3.8,4)",org.openqa.grid.common.exception;version="[3.8,4)",org.openqa.grid.internal;version="[3.8,4)",org.openqa.grid.internal.exception;version="[3.8,4)",org.openqa.grid.internal.listeners;version="[3.8,4)",org.openqa.grid.internal.utils;version="[3.8,4)",org.openqa.grid.internal.utils.configuration;version="[3.8,4)",org.openqa.grid.internal.utils.configuration.converters;version="[3.8,4)",org.openqa.grid.internal.utils.configuration.validators;version="[3.8,4)",org.openqa.grid.selenium.node;version="[3.8,4)",org.openqa.grid.shared;version="[3.8,4)",org.openqa.grid.web;version="[3.8,4)",org.openqa.grid.web.servlet;version="[3.8,4)",org.openqa.grid.web.servlet.beta;version="[3.8,4)",org.openqa.grid.web.servlet.handler;version="[3.8,4)",org.openqa.grid.web.utils;version="[3.8,4)",org.openqa.selenium;version="[3.8,4)",org.openqa.selenium.firefox;version="[3.8,4)",org.openqa.selenium.firefox.internal;version="[3.8,4)",org.openqa.selenium.html5;version="[3.8,4)",org.openqa.selenium.interactions;version="[3.8,4)",org.openqa.selenium.interactions.internal;version="[3.8,4)",org.openqa.selenium.internal;version="[3.8,4)",org.openqa.selenium.io;version="[3.8,4)",org.openqa.selenium.json;version="[3.8,4)",org.openqa.selenium.logging;version="[3.8,4)",org.openqa.selenium.logging.profiler;version="[3.8,4)",org.openqa.selenium.mobile;version="[3.8,4)",org.openqa.selenium.net;version="[3.8,4)",org.openqa.selenium.remote;version="[3.8,4)",org.openqa.selenium.remote.html5;version="[3.8,4)",org.openqa.selenium.remote.http;version="[3.8,4)",org.openqa.selenium.remote.internal;version="[3.8,4)",org.openqa.selenium.remote.mobile;version="[3.8,4)",org.openqa.selenium.remote.server;version="[3.8,4)",org.openqa.selenium.remote.server.commandhandler;version="[3.8,4)",org.openqa.selenium.remote.server.handler;version="[3.8,4)",org.openqa.selenium.remote.server.handler.html5;version="[3.8,4)",org.openqa.selenium.remote.server.handler.interactions;version="[3.8,4)",org.openqa.selenium.remote.server.handler.interactions.touch;version="[3.8,4)",org.openqa.selenium.remote.server.handler.internal;version="[3.8,4)",org.openqa.selenium.remote.server.handler.mobile;version="[3.8,4)",org.openqa.selenium.remote.server.jmx;version="[3.8,4)",org.openqa.selenium.remote.server.log;version="[3.8,4)",org.openqa.selenium.remote.server.rest;version="[3.8,4)",org.openqa.selenium.remote.server.xdrpc;version="[3.8,4)",org.openqa.selenium.remote.service;version="[3.8,4)",org.openqa.selenium.remote.session;version="[3.8,4)",org.openqa.selenium.support;version="[3.8,4)",org.openqa.selenium.support.events;version="[3.8,4)",org.openqa.selenium.support.events.internal;version="[3.8,4)",org.openqa.selenium.support.pagefactory;version="[3.8,4)",org.openqa.selenium.support.pagefactory.internal;version="[3.8,4)",org.openqa.selenium.support.ui;version="[3.8,4)",org.slf4j,org.slf4j.helpers,org.slf4j.spi,org.w3c.css.sac,org.w3c.dom,org.xml.sax,org.xml.sax.helpers', - 'Embed-Directory': 'OSGI-INF/lib', - 'Embed-Transitive': 'false' - ) - } -} - -description = 'AET :: OSGi Dependencies :: Selenium' diff --git a/osgi-dependencies/selenium/build.gradle.kts b/osgi-dependencies/selenium/build.gradle.kts new file mode 100644 index 000000000..241773f27 --- /dev/null +++ b/osgi-dependencies/selenium/build.gradle.kts @@ -0,0 +1,39 @@ +plugins { + id("com.cognifide.aet.java-conventions") + id("biz.aQute.bnd.builder") +} + +val seleniumVersion = "3.8.1" +dependencies { + implementation("org.seleniumhq.selenium:jetty-repacked:7.6.1.1") + implementation("org.seleniumhq.selenium:selenium-java:${seleniumVersion}") + implementation("org.seleniumhq.selenium:selenium-api:${seleniumVersion}") + implementation("org.seleniumhq.selenium:selenium-chrome-driver:${seleniumVersion}") + implementation("org.seleniumhq.selenium:selenium-firefox-driver:${seleniumVersion}") + implementation("org.seleniumhq.selenium:selenium-htmlunit-driver:2.52.0") + implementation("org.seleniumhq.selenium:selenium-ie-driver:${seleniumVersion}") + implementation("org.seleniumhq.selenium:selenium-remote-driver:${seleniumVersion}") + implementation("org.seleniumhq.selenium:selenium-support:${seleniumVersion}") + implementation("org.seleniumhq.selenium:selenium-server:${seleniumVersion}") + implementation("org.apache.commons:commons-exec:1.3") + implementation("com.sun.jna:jna:3.0.9") + implementation("net.java.dev.jna:jna:3.3.0") + implementation("net.java.dev.jna:platform:3.5.2") +} + +tasks.jar { + manifest { + attributes( + Pair("Bundle-Vendor", "Cognifide Ltd."), + Pair("Export-Package", "org.openqa.*;version=\"${seleniumVersion}\""), + Pair( + "Import-Package", + "com.beust.jcommander;resolution:=optional;version='[1.48,2)',com.beust.jcommander.converters;resolution:=optional;version='[1.48,2)',com.gargoylesoftware.htmlunit.javascript.host;resolution:=optional,com.gargoylesoftware.htmlunit.javascript.host.dom;resolution:=optional,com.gargoylesoftware.htmlunit.javascript.host.event;resolution:=optional,com.gargoylesoftware.htmlunit.javascript.host.html;resolution:=optional,javax.servlet;resolution:=optional;version='[3.1,4)',javax.servlet.http;resolution:=optional;version='[3.1,4)',org.eclipse.jetty.client;resolution:=optional;version='[9.4,10)',org.eclipse.jetty.client.security;resolution:=optional,org.eclipse.jetty.client.webdav;resolution:=optional,org.eclipse.jetty.continuation;resolution:=optional,org.eclipse.jetty.http;resolution:=optional;version='[9.4,10)',org.eclipse.jetty.http.gzip;resolution:=optional,org.eclipse.jetty.io;resolution:=optional;version='[9.4,10)',org.eclipse.jetty.io.bio;resolution:=optional,org.eclipse.jetty.io.nio;resolution:=optional,org.eclipse.jetty.jmx;resolution:=optional,org.eclipse.jetty.security;resolution:=optional,org.eclipse.jetty.security.authentication;resolution:=optional,org.eclipse.jetty.server;resolution:=optional,org.eclipse.jetty.server.bio;resolution:=optional,org.eclipse.jetty.server.handler;resolution:=optional,org.eclipse.jetty.server.handler.jmx;resolution:=optional,org.eclipse.jetty.server.jmx;resolution:=optional,org.eclipse.jetty.server.nio;resolution:=optional,org.eclipse.jetty.server.session;resolution:=optional,org.eclipse.jetty.server.session.jmx;resolution:=optional,org.eclipse.jetty.server.ssl;resolution:=optional,org.eclipse.jetty.servlet;resolution:=optional,org.eclipse.jetty.servlet.api;resolution:=optional,org.eclipse.jetty.servlet.jmx;resolution:=optional,org.eclipse.jetty.servlet.listener;resolution:=optional,org.eclipse.jetty.servlets;resolution:=optional,org.eclipse.jetty.util;resolution:=optional;version='[9.4,10)',org.eclipse.jetty.util.ajax;resolution:=optional,org.eclipse.jetty.util.component;resolution:=optional;version='[9.4,10)',org.eclipse.jetty.util.log;resolution:=optional;version='[9.4,10)',org.eclipse.jetty.util.resource;resolution:=optional;version='[9.4,10)',org.eclipse.jetty.util.security;resolution:=optional;version='[9.4,10)',org.eclipse.jetty.util.ssl;resolution:=optional;version='[9.4,10)',org.eclipse.jetty.util.statistic;resolution:=optional;version='[9.4,10)',org.eclipse.jetty.util.thread;resolution:=optional;version='[9.4,10)',org.eclipse.jetty.webapp;resolution:=optional,org.eclipse.jetty.xml;resolution:=optional;version='[9.4,10)',org.mortbay.log;resolution:=optional,org.mortbay.util.ajax;resolution:=optional,org.seleniumhq.jetty7.jmx;resolution:=optional,org.seleniumhq.jetty9.security;resolution:=optional,org.seleniumhq.jetty9.server;resolution:=optional,org.seleniumhq.jetty9.servlet;resolution:=optional,org.seleniumhq.jetty9.util.security;resolution:=optional,org.seleniumhq.jetty9.util.thread;resolution:=optional,net.bytebuddy;resolution:=optional;version='[1.7,2)',net.bytebuddy.description.annotation;resolution:=optional;version='[1.7,2)',net.bytebuddy.dynamic;resolution:=optional;version='[1.7,2)',net.bytebuddy.implementation;resolution:=optional;version='[1.7,2)',net.bytebuddy.matcher;resolution:=optional;version='[1.7,2)',org.openqa.selenium.safari;resolution:=optional,org.openqa.selenium.security;resolution:=optional,com.gargoylesoftware.htmlunit,com.gargoylesoftware.htmlunit.html,com.gargoylesoftware.htmlunit.javascript,com.gargoylesoftware.htmlunit.util,com.google.common.base;version='[25.1,26)',com.google.common.cache;version='[25.1,26)',com.google.common.collect;version='[25.1,26)',com.google.common.io;version='[25.1,26)',com.google.common.net;version='[25.1,26)',com.google.common.primitives;version='[25.1,26)',com.google.common.reflect;version='[25.1,26)',com.google.common.util.concurrent;version='[25.1,26)',com.google.gson;version='[2.8,3)',com.google.gson.annotations;version='[2.8,3)',com.google.gson.reflect;version='[2.8,3)',com.google.gson.stream;version='[2.8,3)',javax.imageio,javax.management,javax.naming,javax.net,javax.net.ssl,javax.security.auth,javax.security.cert,javax.sql,javax.swing,javax.swing.text,javax.xml.namespace,javax.xml.parsers,javax.xml.xpath,net.jcip.annotations,net.sourceforge.htmlunit.corejs.javascript,org.apache.http,org.apache.http.auth,org.apache.http.client,org.apache.http.client.config,org.apache.http.client.methods,org.apache.http.config,org.apache.http.conn,org.apache.http.conn.routing,org.apache.http.conn.socket,org.apache.http.conn.ssl,org.apache.http.entity,org.apache.http.impl.client,org.apache.http.impl.conn,org.apache.http.message,org.apache.http.protocol,org.apache.http.util,org.ietf.jgss,org.openqa.grid.common;version='[3.8,4)',org.openqa.grid.common.exception;version='[3.8,4)',org.openqa.grid.internal;version='[3.8,4)',org.openqa.grid.internal.exception;version='[3.8,4)',org.openqa.grid.internal.listeners;version='[3.8,4)',org.openqa.grid.internal.utils;version='[3.8,4)',org.openqa.grid.internal.utils.configuration;version='[3.8,4)',org.openqa.grid.internal.utils.configuration.converters;version='[3.8,4)',org.openqa.grid.internal.utils.configuration.validators;version='[3.8,4)',org.openqa.grid.selenium.node;version='[3.8,4)',org.openqa.grid.shared;version='[3.8,4)',org.openqa.grid.web;version='[3.8,4)',org.openqa.grid.web.servlet;version='[3.8,4)',org.openqa.grid.web.servlet.beta;version='[3.8,4)',org.openqa.grid.web.servlet.handler;version='[3.8,4)',org.openqa.grid.web.utils;version='[3.8,4)',org.openqa.selenium;version='[3.8,4)',org.openqa.selenium.firefox;version='[3.8,4)',org.openqa.selenium.firefox.internal;version='[3.8,4)',org.openqa.selenium.html5;version='[3.8,4)',org.openqa.selenium.interactions;version='[3.8,4)',org.openqa.selenium.interactions.internal;version='[3.8,4)',org.openqa.selenium.internal;version='[3.8,4)',org.openqa.selenium.io;version='[3.8,4)',org.openqa.selenium.json;version='[3.8,4)',org.openqa.selenium.logging;version='[3.8,4)',org.openqa.selenium.logging.profiler;version='[3.8,4)',org.openqa.selenium.mobile;version='[3.8,4)',org.openqa.selenium.net;version='[3.8,4)',org.openqa.selenium.remote;version='[3.8,4)',org.openqa.selenium.remote.html5;version='[3.8,4)',org.openqa.selenium.remote.http;version='[3.8,4)',org.openqa.selenium.remote.internal;version='[3.8,4)',org.openqa.selenium.remote.mobile;version='[3.8,4)',org.openqa.selenium.remote.server;version='[3.8,4)',org.openqa.selenium.remote.server.commandhandler;version='[3.8,4)',org.openqa.selenium.remote.server.handler;version='[3.8,4)',org.openqa.selenium.remote.server.handler.html5;version='[3.8,4)',org.openqa.selenium.remote.server.handler.interactions;version='[3.8,4)',org.openqa.selenium.remote.server.handler.interactions.touch;version='[3.8,4)',org.openqa.selenium.remote.server.handler.internal;version='[3.8,4)',org.openqa.selenium.remote.server.handler.mobile;version='[3.8,4)',org.openqa.selenium.remote.server.jmx;version='[3.8,4)',org.openqa.selenium.remote.server.log;version='[3.8,4)',org.openqa.selenium.remote.server.rest;version='[3.8,4)',org.openqa.selenium.remote.server.xdrpc;version='[3.8,4)',org.openqa.selenium.remote.service;version='[3.8,4)',org.openqa.selenium.remote.session;version='[3.8,4)',org.openqa.selenium.support;version='[3.8,4)',org.openqa.selenium.support.events;version='[3.8,4)',org.openqa.selenium.support.events.internal;version='[3.8,4)',org.openqa.selenium.support.pagefactory;version='[3.8,4)',org.openqa.selenium.support.pagefactory.internal;version='[3.8,4)',org.openqa.selenium.support.ui;version='[3.8,4)',org.slf4j,org.slf4j.helpers,org.slf4j.spi,org.w3c.css.sac,org.w3c.dom,org.xml.sax,org.xml.sax.helpers" + ), + Pair("Embed-Directory", "OSGI-INF/lib"), + Pair("Embed-Transitive", "false") + ) + } +} + +description = "AET :: OSGi Dependencies :: Selenium" diff --git a/osgi-dependencies/w3chtml5validator/build.gradle b/osgi-dependencies/w3chtml5validator/build.gradle deleted file mode 100644 index 4ce1d9cb8..000000000 --- a/osgi-dependencies/w3chtml5validator/build.gradle +++ /dev/null @@ -1,42 +0,0 @@ -plugins { - id 'com.cognifide.aet.java-conventions' - id 'biz.aQute.bnd.builder' -} - -dependencies { - implementation 'nu.validator:validator:17.11.1' - implementation 'com.cybozu.labs:langdetect:1.1-20120112' - implementation 'com.shapesecurity:salvation:2.3.0' - implementation 'net.arnx:jsonic:1.3.9' - implementation 'org.eclipse.jetty:jetty-util-ajax:9.2.9.v20150224' - implementation 'com.ibm.icu:icu4j:58.2' - implementation 'nu.validator:galimatias:0.1.2' - implementation 'isorelax:isorelax:20030108' - implementation 'net.sf.saxon:Saxon-HE:9.6.0-4' - implementation 'nu.validator:htmlparser:1.4.7' - implementation 'nu.validator:jing:20171006VNU' - implementation 'org.mozilla:rhino:1.7R5' - implementation 'xom:xom:1.1' - implementation 'net.sourceforge.jchardet:jchardet:1.0' - compileOnly 'commons-fileupload:commons-fileupload:1.3.3' - compileOnly 'org.eclipse.jetty:jetty-http:9.3.14.v20161028' - compileOnly 'org.eclipse.jetty:jetty-io:9.3.14.v20161028' - compileOnly 'org.eclipse.jetty:jetty-security:9.3.14.v20161028' - compileOnly 'org.eclipse.jetty:jetty-server:9.3.14.v20161028' - compileOnly 'org.eclipse.jetty:jetty-servlets:9.3.14.v20161028' - compileOnly 'org.eclipse.jetty:jetty-util:9.3.14.v20161028' -} - -jar { - manifest { - attributes( - 'Bundle-Vendor': 'Cognifide Ltd.', - 'Export-Package': 'nu.validator.*', - 'Include-Resource': 'validator-17.11.1.jar,langdetect-1.1-20120112.jar,salvation-2.3.0.jar,jsonic-1.3.9.jar,jetty-util-ajax-9.2.9.v20150224.jar,icu4j-58.2.jar,galimatias-0.1.2.jar,isorelax-20030108.jar,Saxon-HE-9.6.0-4.jar,htmlparser-1.4.7.jar,jing-20171006VNU.jar,rhino-1.7R5.jar,xom-1.1.jar,jchardet-1.0.jar', - 'Bundle-ClassPath': '.,validator-17.11.1.jar,langdetect-1.1-20120112.jar,salvation-2.3.0.jar,jsonic-1.3.9.jar,jetty-util-ajax-9.2.9.v20150224.jar,icu4j-58.2.jar,galimatias-0.1.2.jar,isorelax-20030108.jar,Saxon-HE-9.6.0-4.jar,htmlparser-1.4.7.jar,jing-20171006VNU.jar,rhino-1.7R5.jar,xom-1.1.jar,jchardet-1.0.jar', - 'Import-Package': 'com.icl.saxon;resolution:=optional,com.sun.org.apache.xerces.internal.parsers;resolution:=optional,com.sun.org.apache.xerces.internal.util;resolution:=optional,com.sun.org.apache.xerces.internal.xni.parser;resolution:=optional,jp.co.swiftinc.relax.schema;resolution:=optional,jp.co.swiftinc.relax.verifier;resolution:=optional,junit.framework;resolution:=optional,org.apache.xmlbeans;resolution:=optional,org.apache.xerces.impl;resolution:=optional,org.apache.xerces.impl.validation;resolution:=optional,org.apache.xerces.impl.xpath.regex;resolution:=optional,org.apache.xerces.impl.xs;resolution:=optional,org.apache.xerces.parsers;resolution:=optional,org.apache.xerces.util;resolution:=optional,org.apache.xerces.xni;resolution:=optional,org.apache.xerces.xni.grammars;resolution:=optional,org.apache.xerces.xni.parser;resolution:=optional,com.google.inject;resolution:=optional,org.fest.assertions;resolution:=optional,org.junit;resolution:=optional,org.junit.experimental.theories;resolution:=optional,org.junit.rules;resolution:=optional,org.junit.runner;resolution:=optional,org.junit.runners;resolution:=optional,org.seasar.framework.container;resolution:=optional,org.seasar.framework.container.factory;resolution:=optional,org.seasar.framework.log;resolution:=optional,org.springframework.web.context;resolution:=optional,org.springframework.web.context.support;resolution:=optional,javax.annotation,javax.net.ssl,javax.script,javax.servlet;version="[3.1,4)",javax.servlet.http;version="[3.1,4)",javax.swing,javax.swing.border,javax.swing.event,javax.swing.filechooser,javax.swing.table,javax.swing.text,javax.swing.tree,javax.xml.datatype,javax.xml.namespace,javax.xml.parsers,javax.xml.stream,javax.xml.stream.events,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.sax,javax.xml.transform.stax,javax.xml.transform.stream,javax.xml.xpath,nu.validator.checker.table,nu.validator.collections,nu.validator.datatype.data,nu.validator.datatype.tools,nu.validator.gnu.xml.aelfred2,nu.validator.htmlparser.common,nu.validator.htmlparser.impl,nu.validator.htmlparser.io,nu.validator.htmlparser.rewindable,nu.validator.htmlparser.sax,nu.validator.json,nu.validator.localentities,nu.validator.messages.types,nu.validator.saxtree,nu.validator.source,org.apache.commons.beanutils,org.apache.commons.fileupload;version="[1.3,2)",org.apache.commons.fileupload.servlet;version="[1.3,2)",org.apache.commons.logging;version="[1.2,2)",org.apache.http,org.apache.http.client,org.apache.http.client.config,org.apache.http.client.methods,org.apache.http.config,org.apache.http.conn,org.apache.http.conn.socket,org.apache.http.conn.ssl,org.apache.http.impl.client,org.apache.http.impl.conn,org.apache.log4j;version="[1.2,2)",org.apache.tools.ant,org.apache.tools.ant.types,org.apache.xalan.processor;resolution:=optional,org.apache.xml.resolver,org.apache.xml.resolver.helpers,org.eclipse.jetty.server;version="[9.3,10)",org.eclipse.jetty.servlet,org.eclipse.jetty.servlets;version="[9.3,10)",org.eclipse.jetty.util;version="[9.3,10)",org.eclipse.jetty.util.log;version="[9.3,10)",org.eclipse.jetty.util.thread;version="[9.3,10)",org.slf4j,org.springframework.context,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers,javax.portlet;resolution:=optional,org.gjt.xpp;resolution:=optional,org.xmlpull.v1;resolution:=optional' - ) - } -} - -description = 'AET :: OSGi Dependencies :: HTML validator' diff --git a/osgi-dependencies/w3chtml5validator/build.gradle.kts b/osgi-dependencies/w3chtml5validator/build.gradle.kts new file mode 100644 index 000000000..e3a39302e --- /dev/null +++ b/osgi-dependencies/w3chtml5validator/build.gradle.kts @@ -0,0 +1,51 @@ +plugins { + id("com.cognifide.aet.java-conventions") + id("biz.aQute.bnd.builder") +} + +dependencies { + implementation("nu.validator:validator:17.11.1") + implementation("com.cybozu.labs:langdetect:1.1-20120112") + implementation("com.shapesecurity:salvation:2.3.0") + implementation("net.arnx:jsonic:1.3.9") + implementation("org.eclipse.jetty:jetty-util-ajax:9.2.9.v20150224") + implementation("com.ibm.icu:icu4j:58.2") + implementation("nu.validator:galimatias:0.1.2") + implementation("isorelax:isorelax:20030108") + implementation("net.sf.saxon:Saxon-HE:9.6.0-4") + implementation("nu.validator:htmlparser:1.4.7") + implementation("nu.validator:jing:20171006VNU") + implementation("org.mozilla:rhino:1.7R5") + implementation("xom:xom:1.1") + implementation("net.sourceforge.jchardet:jchardet:1.0") + compileOnly("commons-fileupload:commons-fileupload:1.3.3") + compileOnly("org.eclipse.jetty:jetty-http:9.3.14.v20161028") + compileOnly("org.eclipse.jetty:jetty-io:9.3.14.v20161028") + compileOnly("org.eclipse.jetty:jetty-security:9.3.14.v20161028") + compileOnly("org.eclipse.jetty:jetty-server:9.3.14.v20161028") + compileOnly("org.eclipse.jetty:jetty-servlets:9.3.14.v20161028") + compileOnly("org.eclipse.jetty:jetty-util:9.3.14.v20161028") +} + +tasks.jar { + manifest { + attributes( + Pair("Bundle-Vendor", "Cognifide Ltd."), + Pair("Export-Package", "nu.validator.*"), + Pair( + "Include-Resource", + "validator-17.11.1.jar,langdetect-1.1-20120112.jar,salvation-2.3.0.jar,jsonic-1.3.9.jar,jetty-util-ajax-9.2.9.v20150224.jar,icu4j-58.2.jar,galimatias-0.1.2.jar,isorelax-20030108.jar,Saxon-HE-9.6.0-4.jar,htmlparser-1.4.7.jar,jing-20171006VNU.jar,rhino-1.7R5.jar,xom-1.1.jar,jchardet-1.0.jar" + ), + Pair( + "Bundle-ClassPath", + ".,validator-17.11.1.jar,langdetect-1.1-20120112.jar,salvation-2.3.0.jar,jsonic-1.3.9.jar,jetty-util-ajax-9.2.9.v20150224.jar,icu4j-58.2.jar,galimatias-0.1.2.jar,isorelax-20030108.jar,Saxon-HE-9.6.0-4.jar,htmlparser-1.4.7.jar,jing-20171006VNU.jar,rhino-1.7R5.jar,xom-1.1.jar,jchardet-1.0.jar" + ), + Pair( + "Import-Package", + "com.icl.saxon;resolution:=optional,com.sun.org.apache.xerces.internal.parsers;resolution:=optional,com.sun.org.apache.xerces.internal.util;resolution:=optional,com.sun.org.apache.xerces.internal.xni.parser;resolution:=optional,jp.co.swiftinc.relax.schema;resolution:=optional,jp.co.swiftinc.relax.verifier;resolution:=optional,junit.framework;resolution:=optional,org.apache.xmlbeans;resolution:=optional,org.apache.xerces.impl;resolution:=optional,org.apache.xerces.impl.validation;resolution:=optional,org.apache.xerces.impl.xpath.regex;resolution:=optional,org.apache.xerces.impl.xs;resolution:=optional,org.apache.xerces.parsers;resolution:=optional,org.apache.xerces.util;resolution:=optional,org.apache.xerces.xni;resolution:=optional,org.apache.xerces.xni.grammars;resolution:=optional,org.apache.xerces.xni.parser;resolution:=optional,com.google.inject;resolution:=optional,org.fest.assertions;resolution:=optional,org.junit;resolution:=optional,org.junit.experimental.theories;resolution:=optional,org.junit.rules;resolution:=optional,org.junit.runner;resolution:=optional,org.junit.runners;resolution:=optional,org.seasar.framework.container;resolution:=optional,org.seasar.framework.container.factory;resolution:=optional,org.seasar.framework.log;resolution:=optional,org.springframework.web.context;resolution:=optional,org.springframework.web.context.support;resolution:=optional,javax.annotation,javax.net.ssl,javax.script,javax.servlet;version='[3.1,4)',javax.servlet.http;version='[3.1,4)',javax.swing,javax.swing.border,javax.swing.event,javax.swing.filechooser,javax.swing.table,javax.swing.text,javax.swing.tree,javax.xml.datatype,javax.xml.namespace,javax.xml.parsers,javax.xml.stream,javax.xml.stream.events,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.sax,javax.xml.transform.stax,javax.xml.transform.stream,javax.xml.xpath,nu.validator.checker.table,nu.validator.collections,nu.validator.datatype.data,nu.validator.datatype.tools,nu.validator.gnu.xml.aelfred2,nu.validator.htmlparser.common,nu.validator.htmlparser.impl,nu.validator.htmlparser.io,nu.validator.htmlparser.rewindable,nu.validator.htmlparser.sax,nu.validator.json,nu.validator.localentities,nu.validator.messages.types,nu.validator.saxtree,nu.validator.source,org.apache.commons.beanutils,org.apache.commons.fileupload;version='[1.3,2)',org.apache.commons.fileupload.servlet;version='[1.3,2)',org.apache.commons.logging;version='[1.2,2)',org.apache.http,org.apache.http.client,org.apache.http.client.config,org.apache.http.client.methods,org.apache.http.config,org.apache.http.conn,org.apache.http.conn.socket,org.apache.http.conn.ssl,org.apache.http.impl.client,org.apache.http.impl.conn,org.apache.log4j;version='[1.2,2)',org.apache.tools.ant,org.apache.tools.ant.types,org.apache.xalan.processor;resolution:=optional,org.apache.xml.resolver,org.apache.xml.resolver.helpers,org.eclipse.jetty.server;version='[9.3,10)',org.eclipse.jetty.servlet,org.eclipse.jetty.servlets;version='[9.3,10)',org.eclipse.jetty.util;version='[9.3,10)',org.eclipse.jetty.util.log;version='[9.3,10)',org.eclipse.jetty.util.thread;version='[9.3,10)',org.slf4j,org.springframework.context,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers,javax.portlet;resolution:=optional,org.gjt.xpp;resolution:=optional,org.xmlpull.v1;resolution:=optional" + ) + ) + } +} + +description = "AET :: OSGi Dependencies :: HTML validator" diff --git a/rest-endpoint/build.gradle b/rest-endpoint/build.gradle deleted file mode 100644 index 0d559290c..000000000 --- a/rest-endpoint/build.gradle +++ /dev/null @@ -1,39 +0,0 @@ -plugins { - id 'com.cognifide.aet.java-conventions' - id 'biz.aQute.bnd.builder' -} - -dependencies { - testImplementation 'junit:junit:4.11' - testImplementation 'org.hamcrest:hamcrest-all:1.3' - testImplementation 'org.mockito:mockito-all:1.9.5' - testImplementation 'com.github.stefanbirkner:system-rules:1.18.0' - projectCompile project(':communication-api') - projectCompile project(':datastorage-api') - projectCompile project(':accessibility-report') - implementation 'org.apache.commons:commons-lang3:3.7' - compileOnly 'org.osgi:org.osgi.compendium:4.2.0' - compileOnly 'org.ops4j.pax.web:pax-web-runtime:1.1.17' - compileOnly 'com.google.guava:guava:25.1-jre' - compileOnly 'commons-io:commons-io:2.6' - compileOnly 'javax.validation:validation-api:1.1.0.Final' - compileOnly 'org.apache.geronimo.specs:geronimo-servlet_2.5_spec:1.2' - compileOnly 'com.google.code.gson:gson:2.8.5' - compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0' - compileOnly 'org.osgi:org.osgi.annotation:6.0.0' - compileOnly 'org.osgi:org.osgi.service.metatype.annotations:1.3.0' - compileOnly 'org.freemarker:freemarker:2.3.29' - compileOnly 'org.slf4j:slf4j-api:1.7.7' - compileOnly 'org.osgi:org.osgi.core:4.3.0' -} - -jar { - manifest { - attributes( - 'Bundle-Vendor': 'Cognifide Ltd.', - 'Export-Package': 'com.cognifide.aet.rest.*' - ) - } -} - -description = 'AET :: Rest Endpoint' diff --git a/rest-endpoint/build.gradle.kts b/rest-endpoint/build.gradle.kts new file mode 100644 index 000000000..88e2bb97c --- /dev/null +++ b/rest-endpoint/build.gradle.kts @@ -0,0 +1,39 @@ +plugins { + id("com.cognifide.aet.java-conventions") + id("biz.aQute.bnd.builder") +} + +dependencies { + testImplementation("junit:junit:4.11") + testImplementation("org.hamcrest:hamcrest-all:1.3") + testImplementation("org.mockito:mockito-all:1.9.5") + testImplementation("com.github.stefanbirkner:system-rules:1.18.0") + projectCompile(project(":communication-api")) + projectCompile(project(":datastorage-api")) + projectCompile(project(":accessibility-report")) + implementation("org.apache.commons:commons-lang3:3.7") + compileOnly("org.osgi:org.osgi.compendium:4.2.0") + compileOnly("org.ops4j.pax.web:pax-web-runtime:1.1.17") + compileOnly("com.google.guava:guava:25.1-jre") + compileOnly("commons-io:commons-io:2.6") + compileOnly("javax.validation:validation-api:1.1.0.Final") + compileOnly("org.apache.geronimo.specs:geronimo-servlet_2.5_spec:1.2") + compileOnly("com.google.code.gson:gson:2.8.5") + compileOnly("org.osgi:org.osgi.service.component.annotations:1.3.0") + compileOnly("org.osgi:org.osgi.annotation:6.0.0") + compileOnly("org.osgi:org.osgi.service.metatype.annotations:1.3.0") + compileOnly("org.freemarker:freemarker:2.3.29") + compileOnly("org.slf4j:slf4j-api:1.7.7") + compileOnly("org.osgi:org.osgi.core:4.3.0") +} + +tasks.jar { + manifest { + attributes( + Pair("Bundle-Vendor", "Cognifide Ltd."), + Pair("Export-Package", "com.cognifide.aet.rest.*") + ) + } +} + +description = "AET :: Rest Endpoint" diff --git a/test-executor/build.gradle b/test-executor/build.gradle deleted file mode 100644 index 29c71e82a..000000000 --- a/test-executor/build.gradle +++ /dev/null @@ -1,41 +0,0 @@ -plugins { - id 'com.cognifide.aet.java-conventions' - id 'biz.aQute.bnd.builder' -} - -dependencies { - testImplementation 'junit:junit:4.11' - testImplementation 'org.hamcrest:hamcrest-all:1.3' - testImplementation 'org.mockito:mockito-all:1.9.5' - projectCompile project(':communication-api') - projectCompile project(':datastorage-api') - projectCompile project(':rest-endpoint') - implementation 'javax.jms:jms:1.1' - implementation 'com.google.guava:guava:25.1-jre' - implementation 'org.simpleframework:simple-xml:2.7.1' - implementation 'org.slf4j:slf4j-api:1.7.7' - compileOnly 'org.osgi:org.osgi.compendium:4.2.0' - compileOnly 'org.ops4j.pax.web:pax-web-runtime:1.1.17' - compileOnly 'commons-io:commons-io:2.6' - compileOnly 'commons-fileupload:commons-fileupload:1.3.3' - compileOnly 'org.apache.commons:commons-lang3:3.7' - compileOnly 'javax.validation:validation-api:1.1.0.Final' - compileOnly 'org.apache.geronimo.specs:geronimo-servlet_2.5_spec:1.2' - compileOnly 'com.google.code.gson:gson:2.8.5' - compileOnly 'org.apache.activemq:activemq-osgi:5.15.2' - compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0' - compileOnly 'org.osgi:org.osgi.annotation:6.0.0' - compileOnly 'org.osgi:org.osgi.service.metatype.annotations:1.3.0' - compileOnly 'org.slf4j:slf4j-api:1.7.7' -} - -jar { - manifest { - attributes( - 'Bundle-Vendor': 'Cognifide Ltd.', - 'Export-Package': '' - ) - } -} - -description = 'AET :: Test Executor' diff --git a/test-executor/build.gradle.kts b/test-executor/build.gradle.kts new file mode 100644 index 000000000..f54988147 --- /dev/null +++ b/test-executor/build.gradle.kts @@ -0,0 +1,41 @@ +plugins { + id("com.cognifide.aet.java-conventions") + id("biz.aQute.bnd.builder") +} + +dependencies { + testImplementation("junit:junit:4.11") + testImplementation("org.hamcrest:hamcrest-all:1.3") + testImplementation("org.mockito:mockito-all:1.9.5") + projectCompile(project(":communication-api")) + projectCompile(project(":datastorage-api")) + projectCompile(project(":rest-endpoint")) + implementation("javax.jms:jms:1.1") + implementation("com.google.guava:guava:25.1-jre") + implementation("org.simpleframework:simple-xml:2.7.1") + implementation("org.slf4j:slf4j-api:1.7.7") + compileOnly("org.osgi:org.osgi.compendium:4.2.0") + compileOnly("org.ops4j.pax.web:pax-web-runtime:1.1.17") + compileOnly("commons-io:commons-io:2.6") + compileOnly("commons-fileupload:commons-fileupload:1.3.3") + compileOnly("org.apache.commons:commons-lang3:3.7") + compileOnly("javax.validation:validation-api:1.1.0.Final") + compileOnly("org.apache.geronimo.specs:geronimo-servlet_2.5_spec:1.2") + compileOnly("com.google.code.gson:gson:2.8.5") + compileOnly("org.apache.activemq:activemq-osgi:5.15.2") + compileOnly("org.osgi:org.osgi.service.component.annotations:1.3.0") + compileOnly("org.osgi:org.osgi.annotation:6.0.0") + compileOnly("org.osgi:org.osgi.service.metatype.annotations:1.3.0") + compileOnly("org.slf4j:slf4j-api:1.7.7") +} + +tasks.jar { + manifest { + attributes( + Pair("Bundle-Vendor", "Cognifide Ltd."), + Pair("Export-Package", "") + ) + } +} + +description = "AET :: Test Executor" diff --git a/zip/build.gradle b/zip/build.gradle deleted file mode 100644 index faec238f8..000000000 --- a/zip/build.gradle +++ /dev/null @@ -1,64 +0,0 @@ -plugins { - id 'com.cognifide.aet.java-conventions' -} - -def packages = "${buildDir}/packages-${project.version}" - -task zipBundles(type: Zip) { - dependsOn rootProject.getTasksByName('build', true) - archiveFileName = 'bundles.zip' - destinationDirectory = file("$packages") - includeEmptyDirs = false - rootProject.subprojects { subproject -> - from("${subproject.buildDir}/libs") { - include "**/${subproject.name}*.jar" - exclude "*aet-maven-plugin*.jar" - exclude "*-test*.jar" - exclude "*client*.jar" - exclude "*sample-site*.jar" - exclude "*zip*" - rename { "${project.group}.${subproject.name}.jar" } - } - } -} - -task zipConfigs(type: Zip) { - destinationDirectory = file("$packages") - archiveFileName = "configs.zip" - from("${project(':configs').projectDir}/src/main/resources") -} - -task zipFeatures(type: Zip) { - destinationDirectory = file("$packages") - archiveFileName = "features.zip" - includeEmptyDirs = false - from("${rootDir}/osgi-dependencies") { - include "**/aet-features.xml" - include "**/aet-webconsole.xml" - } -} - -task zipReport(type: Copy) { - dependsOn project(":report").getTasksByName('build', true) - from "${project(':report').buildDir}/distributions/report.zip" - into "$packages" -} - -task zipSampleSite(type: Zip) { - dependsOn project(":sample-site").getTasksByName('build', true) - destinationDirectory = file("$packages") - archiveFileName = "sample-site.zip" - from(project(":sample-site").buildDir) { - include "**/*.war" - } -} - -task make { - dependsOn tasks.zipBundles - dependsOn tasks.zipConfigs - dependsOn tasks.zipFeatures - dependsOn tasks.zipReport - dependsOn tasks.zipSampleSite -} - -description = 'AET' diff --git a/zip/build.gradle.kts b/zip/build.gradle.kts new file mode 100644 index 000000000..ed728d7ff --- /dev/null +++ b/zip/build.gradle.kts @@ -0,0 +1,64 @@ +plugins { + id("com.cognifide.aet.java-conventions") +} + +val packages = "${buildDir}/packages-${project.version}" + +tasks.register("zipBundles") { + dependsOn(rootProject.getTasksByName("build", true)) + archiveFileName.set("bundles.zip") + destinationDirectory.set(file(packages)) + includeEmptyDirs = false + rootProject.subprojects.forEach { subproject -> + from("${subproject.buildDir}/libs") { + include("**/${subproject.name}*.jar") + exclude("*aet-maven-plugin*.jar") + exclude("*-test*.jar") + exclude("*client*.jar") + exclude("*sample-site*.jar") + exclude("*zip*") + rename { "${project.group}.${subproject.name}.jar" } + } + } +} + +tasks.register("zipConfigs") { + destinationDirectory.set(file(packages)) + archiveFileName.set("configs.zip") + from("${project(":configs").projectDir}/src/main/resources") +} + +tasks.register("zipFeatures") { + destinationDirectory.set(file(packages)) + archiveFileName.set("features.zip") + includeEmptyDirs = false + from("${rootDir}/osgi-dependencies") { + include("**/aet-features.xml") + include("**/aet-webconsole.xml") + } +} + +tasks.register("zipReport") { + dependsOn(project(":report").getTasksByName("build", true)) + from("${project(":report").buildDir}/distributions/report.zip") + into(packages) +} + +tasks.register("zipSampleSite") { + dependsOn(project(":sample-site").getTasksByName("build", true)) + destinationDirectory.set(file(packages)) + archiveFileName.set("sample-site.zip") + from(project(":sample-site").buildDir) { + include("**/*.war") + } +} + +tasks.register("make") { + dependsOn(tasks["zipBundles"]) + dependsOn(tasks["zipConfigs"]) + dependsOn(tasks["zipFeatures"]) + dependsOn(tasks["zipReport"]) + dependsOn(tasks["zipSampleSite"]) +} + +description = "AET" From 8b58b394a0d79de6540eab89e6f636bf099653d8 Mon Sep 17 00:00:00 2001 From: Bartosz Zbytniewski Date: Thu, 11 Feb 2021 13:51:55 +0100 Subject: [PATCH 12/15] feature: Add support for license check --- build.gradle.kts | 89 ++++++++++++++++++++++++++++++++++++++++++++++++ pom.xml | 1 + 2 files changed, 90 insertions(+) create mode 100644 build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 000000000..64dbf0a1e --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,89 @@ +plugins { + id("com.cognifide.aet.java-conventions") + id("org.nosphere.apache.rat") version "0.7.0" +} + +defaultTasks(":zip:make") + +tasks.rat { + // general + excludes.add("**/LICENSE") + excludes.add("**/NOTICE") + excludes.add(".travis.yml") + excludes.add("eclipse-java-google-style.xml") + excludes.add("intellij-java-google-style.xml") + excludes.add("**/*.md") + excludes.add("**/*.jar") + excludes.add("**/*.war") + excludes.add("**/*.zip") + excludes.add("**/*.json") + excludes.add("**/*.svg") + + // Eclipse files + excludes.add("**/.project") + excludes.add("**/.classpath") + + // IntelliJ files + excludes.add("**/.idea/**") + excludes.add("**/*.iml") + + // mvn files + excludes.add("**/target/**") + excludes.add("**/pom.xml") + + // gradle files + excludes.add("**/build/**") + excludes.add("**/*.gradle.kts") + excludes.add("**/*.gradle") + excludes.add("**/.gradle/**") + excludes.add("**/gradle.properties") + excludes.add("**/gradle-wrapper.properties") + + // sample-site + excludes.add("**/integration-tests/sample-site/src/main/resources/mock/**/*.html") + excludes.add("**/integration-tests/sample-site/src/main/webapp/assets/demo_files/accessibility/bootstrap.css") + excludes.add("**/integration-tests/sample-site/src/main/webapp/assets/demo_files/bootstrap.css") + excludes.add("**/integration-tests/sample-site/src/main/webapp/assets/demo_files/bootstrap.min.js") + excludes.add("**/integration-tests/sample-site/src/main/webapp/assets/demo_files/bootswatch.min.css") + excludes.add("**/integration-tests/sample-site/src/main/webapp/assets/demo_files/combined.js") + excludes.add("**/integration-tests/sample-site/src/main/webapp/assets/demo_files/ie10-viewport-bug-workaround.js") + excludes.add("**/integration-tests/sample-site/src/main/webapp/assets/demo_files/jquery.min.js") + excludes.add("**/integration-tests/sample-site/src/main/webapp/assets/snippets/change-bg-snippet.js") + excludes.add("**/integration-tests/sample-site/src/main/webapp/assets/secured/change-bg-snippet.js") + + // jobs + excludes.add("**/core/jobs/src/test/resources/mock/**/*.html") + + // report + excludes.add("**/report/src/main/webapp/node/**") + excludes.add("**/report/src/main/webapp/.csslintrc") + excludes.add("**/report/src/main/webapp/.jsbeautifyrc") + excludes.add("**/report/src/main/webapp/.jshintrc") + excludes.add("**/report/src/main/webapp/.babelrc") + excludes.add("**/report/src/main/webapp/assets/libs/**") + excludes.add("**/report/src/main/webapp/assets/js/**") + excludes.add("**/report/src/test/jasmine/lib/**") + excludes.add("**/report/src/main/webapp/node_modules/**") + excludes.add("**/report/src/main/webapp/.sass-cache/**") + excludes.add("**/report/src/main/webapp/assets/fonts/**") + excludes.add("**/report/src/main/webapp/assets/img/**") + excludes.add("**/report/src/main/webapp/assets/icons/**") + excludes.add("**/report/src/main/webapp/assets/css/**") + + // documentation + excludes.add("**/documentation/src/main/node/**") + excludes.add("**/documentation/src/main/node_modules/**") + + // misc + excludes.add("**/misc/plugins-report.txt") + excludes.add("**/misc/dependencies-report.txt") + excludes.add("**/vagrant/.vagrant/**") + excludes.add("**/vagrant/Berksfile.lock") + excludes.add("**/vagrant/cookbooks/**") + + // worker + excludes.add("**/core/worker/firefox/chrome.manifest") +} + +tasks["rat"].outputs.upToDateWhen { false } +tasks["build"].dependsOn(tasks["rat"]) diff --git a/pom.xml b/pom.xml index b46961e50..2382e2da8 100644 --- a/pom.xml +++ b/pom.xml @@ -689,6 +689,7 @@ **/build/** **/*.gradle + **/*.gradle.kts **/.gradle/** **/gradle.properties **/gradle-wrapper.properties From 493f4bfc6509d2c0d88c20210fec85d50ea8bb2a Mon Sep 17 00:00:00 2001 From: Bartosz Zbytniewski Date: Thu, 11 Feb 2021 14:26:32 +0100 Subject: [PATCH 13/15] fix: Move java-conventions to kts --- buildSrc/build.gradle | 10 ------ buildSrc/build.gradle.kts | 4 +-- .../com.cognifide.aet.java-conventions.gradle | 35 ------------------- .../com.cognifide.aet.java-conventions.gradle | 35 ------------------- ....cognifide.aet.java-conventions.gradle.kts | 32 +++++++++++++++++ 5 files changed, 34 insertions(+), 82 deletions(-) delete mode 100644 buildSrc/build.gradle delete mode 100644 buildSrc/src/main/gradle/com.cognifide.aet.java-conventions.gradle delete mode 100644 buildSrc/src/main/groovy/com.cognifide.aet.java-conventions.gradle create mode 100644 buildSrc/src/main/kotlin/com.cognifide.aet.java-conventions.gradle.kts diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle deleted file mode 100644 index 288e99ea5..000000000 --- a/buildSrc/build.gradle +++ /dev/null @@ -1,10 +0,0 @@ -plugins { - // Support convention plugins written in Groovy. Convention plugins are build scripts in 'src/main' that automatically become available as plugins in the main build. - id 'groovy-gradle-plugin' -} - -repositories { - // Use the plugin portal to apply community plugins in convention plugins. - gradlePluginPortal() -} - diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index c4a4146e1..eceaa3e91 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - // Support convention plugins written in Groovy. Convention plugins are build scripts in 'src/main' that automatically become available as plugins in the main build. - id("groovy-gradle-plugin") + // Support convention plugins written in Kotlin. Convention plugins are build scripts in 'src/main' that automatically become available as plugins in the main build. + `kotlin-dsl` } repositories { diff --git a/buildSrc/src/main/gradle/com.cognifide.aet.java-conventions.gradle b/buildSrc/src/main/gradle/com.cognifide.aet.java-conventions.gradle deleted file mode 100644 index f2b9083d8..000000000 --- a/buildSrc/src/main/gradle/com.cognifide.aet.java-conventions.gradle +++ /dev/null @@ -1,35 +0,0 @@ -plugins { - id 'java-library' - id 'maven-publish' -} - -repositories { - maven { - url = 'http://repository.jboss.org/nexus/content/groups/public' - } - mavenCentral() - jcenter() -} - -group = 'com.cognifide.aet' -version = '3.4.1-SNAPSHOT' -java.sourceCompatibility = JavaVersion.VERSION_1_8 - -publishing { - publications { - maven(MavenPublication) { - from(components.java) - } - } -} - -tasks.withType(JavaCompile) { - options.encoding = 'UTF-8' -} - -configurations { projectCompile } - -sourceSets.main.compileClasspath += configurations.projectCompile -sourceSets.test.compileClasspath += configurations.projectCompile -sourceSets.test.runtimeClasspath += configurations.projectCompile - diff --git a/buildSrc/src/main/groovy/com.cognifide.aet.java-conventions.gradle b/buildSrc/src/main/groovy/com.cognifide.aet.java-conventions.gradle deleted file mode 100644 index f2b9083d8..000000000 --- a/buildSrc/src/main/groovy/com.cognifide.aet.java-conventions.gradle +++ /dev/null @@ -1,35 +0,0 @@ -plugins { - id 'java-library' - id 'maven-publish' -} - -repositories { - maven { - url = 'http://repository.jboss.org/nexus/content/groups/public' - } - mavenCentral() - jcenter() -} - -group = 'com.cognifide.aet' -version = '3.4.1-SNAPSHOT' -java.sourceCompatibility = JavaVersion.VERSION_1_8 - -publishing { - publications { - maven(MavenPublication) { - from(components.java) - } - } -} - -tasks.withType(JavaCompile) { - options.encoding = 'UTF-8' -} - -configurations { projectCompile } - -sourceSets.main.compileClasspath += configurations.projectCompile -sourceSets.test.compileClasspath += configurations.projectCompile -sourceSets.test.runtimeClasspath += configurations.projectCompile - diff --git a/buildSrc/src/main/kotlin/com.cognifide.aet.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/com.cognifide.aet.java-conventions.gradle.kts new file mode 100644 index 000000000..16937f12a --- /dev/null +++ b/buildSrc/src/main/kotlin/com.cognifide.aet.java-conventions.gradle.kts @@ -0,0 +1,32 @@ +plugins { + `java-library` + `maven-publish` +} + +repositories { + maven { + url = uri("http://repository.jboss.org/nexus/content/groups/public") + } + mavenCentral() + jcenter() +} + +group = "com.cognifide.aet" +version = "3.4.1-SNAPSHOT" +java.sourceCompatibility = JavaVersion.VERSION_1_8 + +publishing { + publications.create("maven") { + from(components["java"]) + } +} + +tasks.withType() { + options.encoding = "UTF-8" +} + +val projectCompile by configurations.creating + +sourceSets.main.get().compileClasspath += configurations["projectCompile"] +sourceSets.test.get().compileClasspath += configurations["projectCompile"] +sourceSets.test.get().runtimeClasspath += configurations["projectCompile"] \ No newline at end of file From bcd9c56d50b771d4346f5bf2d09fb67f1002c01f Mon Sep 17 00:00:00 2001 From: Bartosz Zbytniewski Date: Thu, 11 Feb 2021 14:31:22 +0100 Subject: [PATCH 14/15] fix: Remove clean script --- report/src/main/webapp/package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/report/src/main/webapp/package.json b/report/src/main/webapp/package.json index 287862dd3..2794038a0 100644 --- a/report/src/main/webapp/package.json +++ b/report/src/main/webapp/package.json @@ -4,8 +4,7 @@ "description": "aet", "main": "index.js", "scripts": { - "gulp": "gulp build", - "clean": "rm -rf ./node_modules && rm -rf ./node" + "gulp": "gulp build" }, "author": "Cognifide", "license": "Apache-2.0", From 5f94fd16e8d41f36b8c62a86b538ccfceae7bf7e Mon Sep 17 00:00:00 2001 From: Bartosz Zbytniewski Date: Fri, 12 Feb 2021 08:49:15 +0100 Subject: [PATCH 15/15] docs: Update docs about creating zip artifacts --- zip/README.md | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/zip/README.md b/zip/README.md index 644dd9a60..5b17235fb 100644 --- a/zip/README.md +++ b/zip/README.md @@ -7,15 +7,22 @@

## Zip - This module purpose is to package all AET artifacts into zip archives. -After installing all AET modules in local repository type: +After installing all AET modules in local repository type in the root dir: - mvn clean install -Pzip +- maven: + ``` + mvn clean install -Pzip + ``` +- gradle + ``` + ./gradlew # or ./gradlew :zip:make + ``` + Please find archives containing all AET artifacts in -`zip/target/packages-${project.version}` folder +`zip/target/packages-${project.version}` for maven and `zip/build/packages-${prpject.version}` for gradle -You could even upload this archive to remote location with: +You can use maven upload this archive to remote location with: mvn clean install -Pzip,upload \ -Dtarget.zip.ServerId=remote-location \