Skip to content

Commit

Permalink
use proper java source and class versions, use amazon-util version 31
Browse files Browse the repository at this point in the history
  • Loading branch information
vbedrosova committed Mar 3, 2017
1 parent bed57ef commit b11466f
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 5 deletions.
3 changes: 3 additions & 0 deletions aws-codepipeline-server/build.gradle
Expand Up @@ -21,6 +21,9 @@ dependencies {
agent project(path: ':aws-codepipeline-agent', configuration: 'plugin')
}

sourceCompatibility = "1.8"
targetCompatibility = "1.8"

teamcity {
server {
descriptor = file("$rootDir/teamcity-plugin.xml")
Expand Down
8 changes: 3 additions & 5 deletions build.gradle
Expand Up @@ -32,9 +32,7 @@ ext.teamcityDir = hasProperty('teamcity.dir') ? property('teamcity.dir') : "$roo
ext.teamcityDataDir = "$rootDir/teamcity/data/" + teamcityVersion
ext.teamcityJavaHome = System.properties['java.home']

ext.javaVersion = hasProperty('plugin.java.version') ? property('plugin.java.version') : '1.8'

ext.amazonUtilVersion = hasProperty('amazon.util.version') ? property('amazon.util.version') : '29'
ext.amazonUtilVersion = hasProperty('amazon.util.version') ? property('amazon.util.version') : '31'


apply plugin: 'idea'
Expand All @@ -51,8 +49,8 @@ subprojects {
configure(subprojects) {
apply plugin: 'java'

sourceCompatibility = javaVersion
targetCompatibility = javaVersion
sourceCompatibility = "1.6"
targetCompatibility = "1.6"

tasks.withType(JavaCompile) {
options.encoding = 'UTF-8'
Expand Down
23 changes: 23 additions & 0 deletions class-version-rules.txt
@@ -0,0 +1,23 @@
; this is comment line
;
; each line represent a patching rule
;
; - => path
; this is exclude rule. It excludes all paths that starts with given prefix
; xx => path
; this is the rule to enforce check of java classes of version xx, where xx could
; be one of the following: 1.2, 1.3, 1.4, 1.5, 1.6, 1.7
;
; see example below
;
; all paths are relative to scan folder
;
;
; have fun
;


; agent part of plugin is 1.6
1.6 => aws-codepipeline-plugin.zip!agent/
; server part of plugin is 1.8
1.8 => aws-codepipeline-plugin.zip!server/

0 comments on commit b11466f

Please sign in to comment.