Skip to content

Commit

Permalink
Work in progress new gradle structure
Browse files Browse the repository at this point in the history
  • Loading branch information
Ric Klaren committed May 18, 2016
1 parent 1b1cd74 commit d3d62a3
Show file tree
Hide file tree
Showing 8 changed files with 77 additions and 19 deletions.
30 changes: 27 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,30 @@
apply plugin: 'document-combined-archive'
apply plugin: 'release-plugin'
buildscript {
repositories {
mavenLocal()
['releases', 'public'].each { r ->
maven {
url "${nexusBaseUrl}/repositories/${r}"
credentials {
username nexusUserName
password nexusPassword
}
}
}
}

group = 'com.xebialabs.deployit.temp4test'
dependencies {
classpath "com.xebialabs.gradle.plugins:gradle-xl-defaults-plugin:0.2.3-dev.0.uncommitted+ffaf069"
classpath "com.xebialabs.gradle.plugins:gradle-xl-restdoc-plugin:0.1.0"
classpath "com.xebialabs.gradle.plugins:gradle-xl-dependency-plugin:1.2.2"
}
}

apply plugin: 'xebialabs.root.opinions'
apply plugin: 'xebialabs.dependency'

allprojects {
group = 'com.xebialabs.deployit.temp4test'
apply plugin: 'idea'
}

print "done"
2 changes: 2 additions & 0 deletions commercial-plugin/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// commercial plugin like
/*
apply plugin: 'commercial-plugin'
docgen.testManual = [title: 'Test Plugin Manual', appendCiReference: true, prefixes: ['overthere', 'test', 'generic'], 'DATABASE_USERNAME': '{{DATABASE_USERNAME}}', 'DATABASE_PASSWORD': '{{DATABASE_PASSWORD}}']
Expand All @@ -12,3 +13,4 @@ uploadDocumentation {
projectPath = "temp4test"
}
*/
4 changes: 2 additions & 2 deletions deployit-plugin/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// bundled plugin like
apply plugin: 'deployit-plugin'
apply plugin: 'document-generator'
//apply plugin: 'deployit-plugin'
//apply plugin: 'document-generator'
30 changes: 21 additions & 9 deletions gradle/dependencies.conf
Original file line number Diff line number Diff line change
@@ -1,11 +1,23 @@
xebialabs {
dependencies {
versions {
licenseDatabaseVersion="1.0.13"
xlPlatformVersion="2016.1.0-alpha-32"
xlDeployVersion="4.0.0"
cloudPackVersion="4.0.2"
docBaseStyleVersion="1.0.0"
}
dependencyManagement {
versions {
slf4jVersion: "1.7.21"
}
dependencies: [
{
group: "org.slf4j"
version: "$slf4jVersion"
artifacts: [
"jcl-over-slf4j"
"jul-to-slf4j"
"log4j-over-slf4j"
"slf4j-api"
]
}
"org.assertj:assertj-core:3.4.0"
"nl.javadude.t2bus:t2-bus:1.2.1"
"com.google.guava:guava:19.0"
]
// TODO: 2.11 scalaVersion
blacklist: [ "com.typesafe.akka:akka-persistence_2.11" ]
}

12 changes: 8 additions & 4 deletions java-module/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
// java modules like plugin-api/engine etc.
apply plugin: 'deployit-java'
apply plugin: 'deployit-artifact'
apply plugin: 'restdoc'

apply plugin: "java"
apply plugin: "xebialabs.opinions"
apply plugin: "xebialabs.artifact"

/* apply plugin: 'restdoc'
restdoc {
printJson = false
Expand All @@ -11,7 +14,8 @@ restdoc {
uploadDocumentation {
projectPath = "t4t"
}

dependencies {
compile project(':commercial-plugin')
}
*/

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

apply plugin: "java"
apply plugin: "xebialabs.opinions"
apply plugin: "xebialabs.artifact"

// this gets us slf4j-api as added by opinions
// and a guava that's managed upwards
dependencies {
compile "nl.javadude.t2bus:t2-bus"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package simple_java_module;

public class Simple {

}

0 comments on commit d3d62a3

Please sign in to comment.