Skip to content

Commit

Permalink
Travis preparation
Browse files Browse the repository at this point in the history
  • Loading branch information
apryamostanov committed Jan 16, 2019
1 parent 184ddac commit a021b16
Show file tree
Hide file tree
Showing 7 changed files with 76 additions and 75 deletions.
71 changes: 69 additions & 2 deletions .gitignore
Expand Up @@ -19,7 +19,74 @@
*.tar.gz
*.rar

.idea/

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*

# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf
.idea/*
.idea/
.idea

# Generated files
.idea/**/contentModel.xml

# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml

# Gradle
.idea/**/gradle.xml
.idea/**/libraries

# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/modules.xml
# .idea/*.iml
# .idea/modules

# CMake
cmake-build-*/

# Mongo Explorer plugin
.idea/**/mongoSettings.xml

# File-based project format
*.iws
*.iml
*.ipr

# IntelliJ
out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Cursive Clojure plugin
.idea/replstate.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

# Editor-based Rest Client
.idea/httpRequests
2 changes: 1 addition & 1 deletion .travis.yml
@@ -1,4 +1,4 @@
language: groovy
after_success:
- bash <(curl -s https://codecov.io/bash)
- ./gradlew artifactoryPublish -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER
- ./gradlew :pigeon-lib:artifactoryPublish -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER
9 changes: 4 additions & 5 deletions pigeon-lib/build.gradle
Expand Up @@ -24,7 +24,6 @@ repositories {
maven {
url "https://oss.jfrog.org/artifactory/oss-snapshot-local"
}
mavenLocal()
}
sourceSets {
main.groovy.srcDirs = ["src/main/groovy"]
Expand All @@ -35,9 +34,9 @@ dependencies {
compile 'org.springframework.boot:spring-boot-starter-data-rest'
compile 'org.springframework.boot:spring-boot-starter-data-jpa'
compile group: 'org.springframework.boot', name: 'spring-boot-starter-actuator'
compile "io.infinite:bobbin:2.0.0-20190114.154724-14"
compile "io.infinite:bobbin:2.0.0-20190115.135206-15"
compile "io.infinite:supplies:1.0.1-20190114.154218-9"
compile 'io.infinite:blackbox:1.0.6-SNAPSHOT'
compile 'io.infinite:blackbox:1.0.6-20190116.110607-4'
compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.9.7'
compile 'com.h2database:h2:1.4.197'
compile group: 'org.apache.commons', name: 'commons-lang3'
Expand Down Expand Up @@ -93,8 +92,8 @@ artifactory {
publish {
repository {
repoKey = 'oss-snapshot-local'
username = System.getProperty("bintrayuser")
password = System.getProperty("bintraypassword")
username = System.getProperty("bintray.user")
password = System.getProperty("bintray.key")
}
defaults {
publications('groovyMaven')
Expand Down
43 changes: 0 additions & 43 deletions pigeon-lib/build/resources/main/Bobbin.json

This file was deleted.

22 changes: 0 additions & 22 deletions pigeon-lib/build/resources/main/application.properties

This file was deleted.

Expand Up @@ -20,7 +20,7 @@ class SenderDefaultHttp extends SenderDefault {
log.warn("UNSECURE TEST PLAINTEXT HTTP CONNECTION")
log.warn("DO NOT USE ON PRODUCTION")
if (url.getProtocol().contains("https")) {
throw new PigeonException("Invalid protocol \"https\" for SenderDefaultHttp in ${httpRequest.url}. Use \"http\" protocol.")
throw new PigeonException("Invalid protocol 'https' for SenderDefaultHttp in ${httpRequest.url}. Use 'http' protocol.")
}
super.sendHttpMessage()
}
Expand Down
@@ -1,4 +1,4 @@
package io.infinite.blackbox
package io.infinite.pigeon


class MethodLevelTest extends GroovyTestCase {
Expand Down

0 comments on commit a021b16

Please sign in to comment.