From b11466f468590e25057c68736e2a4c5032c22723 Mon Sep 17 00:00:00 2001
From: Victory Petrenko <victory.bedrosova@jetbrains.com>
Date: Fri, 3 Mar 2017 13:48:17 +0100
Subject: [PATCH] use proper java source and class versions, use amazon-util
 version 31

---
 aws-codepipeline-server/build.gradle |  3 +++
 build.gradle                         |  8 +++-----
 class-version-rules.txt              | 23 +++++++++++++++++++++++
 3 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 class-version-rules.txt

diff --git a/aws-codepipeline-server/build.gradle b/aws-codepipeline-server/build.gradle
index 704dfa5..94479a2 100644
--- a/aws-codepipeline-server/build.gradle
+++ b/aws-codepipeline-server/build.gradle
@@ -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")
diff --git a/build.gradle b/build.gradle
index c3db912..8219332 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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'
@@ -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'
diff --git a/class-version-rules.txt b/class-version-rules.txt
new file mode 100644
index 0000000..e91dd7e
--- /dev/null
+++ b/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/