gradle wrapper upgrade

added additional jetty configurations
closes gradle-jetty-eclipse-plugin#1

CHANGELOG.md

@@ -1,7 +1,8 @@
-1.9.1 (not released yet)
+1.9.1
 -----
 * aded ability to turn off annotation scanning
 * added ability to skip tasks during automatic builds
+* added support for FragmentConfiguration and MetaInfConfiguration
 
 1.9.0
 -----

build.gradle

@@ -18,7 +18,7 @@ def v = [
         guava: '15.0',
         slf4j: '1.6.6',
         servletApi: '2.5',
-        jetty: '9.0.6.v20130930',
+        jetty: '9.1.1.v20140108',
         jdt: '3.8.2.v20130121',
         spock: '0.6-groovy-1.8'
 ]
@@ -54,7 +54,7 @@ dependencies {
 }
 
 task wrapper(type: Wrapper, description: 'Gradle Wrapper task') {
-    gradleVersion = '1.8'
+    gradleVersion = '1.10'
 }
 
 compileJava {
@@ -70,13 +70,13 @@ compileJava {
     // on a linux system this would be eg.
     // jdk_1_6_home=/opt/java/64/jdk1.6.0_31
     // jdk_1_6_bootClasspath=/opt/java/64/jdk1.6.0_31/jre/lib/rt.jar
-    def compatibilityVersion = 1.6
+    def compatibilityVersion = 1.7
     sourceCompatibility = compatibilityVersion
     targetCompatibility = compatibilityVersion
-    if(project.hasProperty('jdk_1_6_bootClasspath'))
-        options.bootClasspath = "${jdk_1_6_bootClasspath}"
-    else if(project.hasProperty('jdk_1_6_home'))
-        options.bootClasspath = "${jdk_1_6_home}/jre/lib/rt.jar"
+    if(project.hasProperty('jdk_1_7_bootClasspath'))
+        options.bootClasspath = "${jdk_1_7_bootClasspath}"
+    else if(project.hasProperty('jdk_1_7_home'))
+        options.bootClasspath = "${jdk_1_7_home}/jre/lib/rt.jar"
     logger.info "Compiling using compatibility $compatibilityVersion and bootClasspath ${options.bootClasspath}"
 }
 
@@ -143,9 +143,9 @@ publishing {
             }
         }
     }
-    generatePomFileForMavenGroovyPublication {
-        destination = file("$buildDir/generated-pom.xml")
-    }
+//    generatePomFileForMavenGroovyPublication {
+//        destination = file("$buildDir/generated-pom.xml")
+//    }
 }
 
 task install(dependsOn: 'publishMavenGroovyPublicationToMavenLocal') << {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Sep 28 11:02:03 CEST 2013
+#Wed Feb 05 23:53:25 CET 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-all.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

src/main/groovy/com/sahlbach/gradle/plugins/jettyEclipse/JettyEclipsePluginWebAppContext.groovy

@@ -15,31 +15,29 @@
  */
 
 package com.sahlbach.gradle.plugins.jettyEclipse
-
 import org.eclipse.jetty.annotations.AnnotationConfiguration
 import org.eclipse.jetty.plus.webapp.EnvConfiguration
 import org.eclipse.jetty.plus.webapp.PlusConfiguration
 import org.eclipse.jetty.util.log.Log
 import org.eclipse.jetty.util.log.Logger
-import org.eclipse.jetty.webapp.AbstractConfiguration
-import org.eclipse.jetty.webapp.Configuration
-import org.eclipse.jetty.webapp.JettyWebXmlConfiguration
-import org.eclipse.jetty.webapp.WebAppContext
-import org.eclipse.jetty.webapp.WebInfConfiguration
-import org.eclipse.jetty.webapp.WebXmlConfiguration
+import org.eclipse.jetty.webapp.*
 
 class JettyEclipsePluginWebAppContext extends WebAppContext {
     private static final Logger logger = Log.getLogger(WebAppContext.class);
     private List<File> classpathFiles;
     private File       jettyEnvXmlFile;
     private File       webXmlFile;
-    private WebXmlConfiguration      webXmlConfiguration = new WebXmlConfiguration()
     private WebInfConfiguration      webInfConfig        = new WebInfConfiguration()
+    private WebXmlConfiguration      webXmlConfiguration = new WebXmlConfiguration()
+    private MetaInfConfiguration    metaInfConfiguration = new MetaInfConfiguration()
+    private FragmentConfiguration  fragmentConfiguration = new FragmentConfiguration()
     private EnvConfiguration         envConfig           = new EnvConfiguration()
     private PlusConfiguration        plusConfiguration   = new PlusConfiguration()
     private JettyWebXmlConfiguration jettyWebConfig      = new JettyWebXmlConfiguration()
-    private List<AbstractConfiguration> configs          = [webXmlConfiguration,
-                                                            webInfConfig,
+    private List<AbstractConfiguration> configs          = [webInfConfig,
+                                                            webXmlConfiguration,
+                                                            metaInfConfiguration,
+                                                            fragmentConfiguration,
                                                             envConfig,
                                                             plusConfiguration,
                                                             jettyWebConfig] as AbstractConfiguration[]

src/main/groovy/com/sahlbach/gradle/plugins/jettyEclipse/JettyEclipseStop.groovy

@@ -14,22 +14,6 @@
  * limitations under the License.
  */
 
-/*
- * Copyright 2012-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 package com.sahlbach.gradle.plugins.jettyEclipse
 import org.gradle.api.DefaultTask
 import org.gradle.api.InvalidUserDataException