Skip to content

Commit

Permalink
Re-enable a load of stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
Ric Klaren committed Jun 6, 2016
1 parent 3079558 commit dfb3ce0
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 26 deletions.
7 changes: 3 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,9 @@ buildscript {
}
}
}

dependencies {
classpath "com.xebialabs.gradle.plugins:gradle-xl-defaults-plugin:0.2.4-SNAPSHOT"
classpath "com.xebialabs.gradle.plugins:gradle-xl-restdoc-plugin:0.1.0"
classpath "com.xebialabs.gradle.plugins:gradle-xl-dependency-plugin:1.2.3"
classpath "com.xebialabs.gradle.plugins:gradle-xl-plugins-plugin:${xlPluginPluginVersion}"
classpath "com.xebialabs.gradle.plugins:gradle-xl-restdoc-plugin:${xlRestDocPluginVersion}"
}
}

Expand All @@ -24,6 +22,7 @@ apply plugin: 'xebialabs.dependency'

allprojects {
group = 'com.xebialabs.deployit.temp4test'

apply plugin: 'idea'
}

Expand Down
13 changes: 4 additions & 9 deletions commercial-plugin/build.gradle
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
// commercial plugin like
/*
apply plugin: 'commercial-plugin'

apply plugin: "xebialabs.opinions"
apply plugin: "xebialabs.plugin.xld"

docgen.testManual = [title: 'Test Plugin Manual', appendCiReference: true, prefixes: ['overthere', 'test', 'generic'], 'DATABASE_USERNAME': '{{DATABASE_USERNAME}}', 'DATABASE_PASSWORD': '{{DATABASE_PASSWORD}}']

dependencies {
// compile 'com.xebialabs.deployit:udm-plugin-api:4.1.0-alpha-1'
compile 'com.xebialabs.deployit:udm-plugin-api:4.0.0'
}
uploadDocumentation {
projectPath = "temp4test"
compile 'com.xebialabs.deployit:udm-plugin-api:2016.1.2'
}
*/
3 changes: 3 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
languageLevel=1.8
xlPluginPluginVersion=0.3.0
xlReleaseNotesPluginVersion=0.1.1
xlRestDocPluginVersion=0.1.0
12 changes: 8 additions & 4 deletions gradle/dependencies.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
dependencyManagement {
versions {
docBaseStyleVersion: "2.0.11"
licenseDatabaseVersion: "1.0.90"
overcastVersion: "2.5.1"
overthereVersion: "4.3.2"
xlPlatformVersion: "2016.1.2"
slf4jVersion: "1.7.21"
}
dependencies: [
Expand All @@ -13,11 +18,10 @@ dependencyManagement {
"slf4j-api"
]
}
"org.assertj:assertj-core:3.4.0"
"nl.javadude.t2bus:t2-bus:1.2.1"
"com.google.guava:guava:19.0"
"com.xebialabs.deployit.gradle:license-data:$licenseDatabaseVersion"
"nl.javadude.t2bus:t2-bus:1.2.1"
"org.assertj:assertj-core:3.4.0"
]
// TODO: 2.11 scalaVersion
blacklist: [ "com.typesafe.akka:akka-persistence_2.11" ]
}

8 changes: 1 addition & 7 deletions java-module/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,13 @@
apply plugin: "java"
apply plugin: "xebialabs.opinions"
apply plugin: "xebialabs.artifact"

/* apply plugin: 'restdoc'
apply plugin: "xebialabs.restdoc"

restdoc {
printJson = false
productName = "t4t"
}

uploadDocumentation {
projectPath = "t4t"
}
dependencies {
compile project(':commercial-plugin')
}
*/

3 changes: 1 addition & 2 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
//include 'commercial-plugin', 'java-module', 'deployit-plugin'
include 'simple-java-module'
include 'commercial-plugin', 'java-module', 'deployit-plugin', 'simple-java-module'

0 comments on commit dfb3ce0

Please sign in to comment.