Skip to content

Commit

Permalink
Merge pull request #391 from CoreMedia/gradle
Browse files Browse the repository at this point in the history
Update gradle-jpi-plugin to 0.10.0
  • Loading branch information
daspilker committed Feb 28, 2015
2 parents 9475943 + cd4ba47 commit ee8c39d
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 368 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -17,6 +17,7 @@ gradle-app.setting
*.bak
/local*
build
generated
/out
/classes

Expand Down
9 changes: 6 additions & 3 deletions README.md
Expand Up @@ -142,9 +142,12 @@ Build job-dsl.hpi to be installed in Jenkins:

./gradlew jpi

IntelliJ IDEA and Eclipse (STS) have the ability to open Gradle projects directly, but they both have their own issues
actually running Gradle and running tests. As a workaround Maven POMs have been added and those can be opened
directly in IntelliJ IDEA to create a project.
IntelliJ IDEA and Eclipse (STS) have the ability to open Gradle projects directly, but they both have issues. IDEA
sometimes does not detect all plugin dependencies (e.g. `hudson.maven.MavenModuleSet`) and as a workaround you need to
hit the refresh button in the Gradle tool window until it does. You also need to run the `localizer` task to generate
the `Messages` class before building and testing the project in the IDE:

./gradlew localizer

Authors
-------
Expand Down
58 changes: 0 additions & 58 deletions job-dsl-core/pom.xml

This file was deleted.

14 changes: 9 additions & 5 deletions job-dsl-plugin/build.gradle
Expand Up @@ -3,14 +3,17 @@ buildscript {
jcenter()
}
dependencies {
classpath 'org.jenkins-ci.tools:gradle-jpi-plugin:0.9.1'
classpath 'org.jenkins-ci.tools:gradle-jpi-plugin:0.10.0'
}
}

apply plugin: 'org.jenkins-ci.jpi'

description = 'Jenkins plugin to leverage job-dsl-core to programmatic create jobs from inside Jenkins.'

// keep the generated sources outside of the build directory, see http://stackoverflow.com/a/21003914/1271460
def generatedSourcesDir = 'generated'

jenkinsPlugin {
coreVersion = '1.554.2'
displayName = 'Job DSL'
Expand All @@ -19,6 +22,7 @@ jenkinsPlugin {
maskClasses = 'groovy.grape'
compatibleSinceVersion = '1.29'
pluginFirstClassLoader = true
localizerOutputDir = "$generatedSourcesDir/localizer"
developers {
developer {
id 'quidryan'
Expand All @@ -43,6 +47,10 @@ jenkinsPlugin {
}
}

clean {
delete generatedSourcesDir
}

configurations {
forceInclude {}
}
Expand All @@ -58,8 +66,4 @@ dependencies {
optionalJenkinsPlugins 'org.jenkins-ci.plugins:credentials:1.9.4@jar'
optionalJenkinsPlugins 'org.jenkins-ci.plugins:vsphere-cloud:1.1.11@jar'
optionalJenkinsPlugins 'org.jenkins-ci.plugins:config-file-provider:2.7@jar'
jenkinsTest 'org.jenkins-ci.plugins:ant:1.2@jar' // see JENKINS-17129
jenkinsTest 'org.jenkins-ci.main:maven-plugin:2.0@jar'
jenkinsTest 'org.jenkins-ci.plugins:javadoc:1.1@jar'
jenkinsTest 'org.jenkins-ci.plugins:mailer:1.1@jar'
}
80 changes: 0 additions & 80 deletions job-dsl-plugin/pom.xml

This file was deleted.

0 comments on commit ee8c39d

Please sign in to comment.