Permalink
Switch branches/tags
Commits on Dec 20, 2012
  1. test for http://jira.grails.org/browse/GRAILS-9695, currently marked as

    graemerocher committed Dec 20, 2012
    @Ignore until we fix it. Add a few other tests from datastore as well
Commits on Dec 18, 2012
  1. version 2.2.0

    jeffbrown committed Dec 18, 2012
Commits on Dec 17, 2012
  1. Merge branch '2.1.x' into 2.2.x

    jeffbrown committed Dec 17, 2012
    Conflicts:
    	build.gradle
  2. use springloaded 1.1.1

    jeffbrown committed Dec 11, 2012
    Conflicts:
    	build.gradle
    	grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/cli/fork/ForkedGrailsProcess.groovy
  3. fix merge problem

    jeffbrown committed Dec 17, 2012
  4. Merge branch '2.1.x' into 2.2.x

    jeffbrown committed Dec 17, 2012
    Conflicts:
    	grails-core/build.gradle
Commits on Dec 16, 2012
  1. Revert "use Artifactory URL to get around issues external access issu…

    jeffbrown committed Dec 16, 2012
    …es on build server"
    
    This reverts commit b702c74.
Commits on Dec 15, 2012
  1. clean up merge problem

    jeffbrown committed Dec 15, 2012
  2. Merge branch '2.1.x' into 2.2.x

    jeffbrown committed Dec 15, 2012
    Conflicts:
    	grails-resources/src/grails/grails-app/conf/BuildConfig.groovy
    	grails-resources/src/grails/plugin/grails-app/conf/BuildConfig.groovy
  3. include poms in the plugins dir

    jeffbrown committed Dec 10, 2012
    This is copying the poms for plugins that we ship in the release into the plugins dir.  We still need to rig up core to look for these poms.
  4. introduce new configuration option that disables parsing of dependenc…

    graemerocher committed with jeffbrown Dec 4, 2012
    …ies.groovy completely so that only POM data is used. Parsing dependencies.groovy is disabled by default for new applications.
    
    Conflicts:
    	grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/AbstractIvyDependencyManager.java
Commits on Dec 14, 2012
Commits on Dec 13, 2012
  1. 2.2.0.RC4

    jeffbrown committed Dec 13, 2012
  2. fix a couple javadoc warnings

    jeffbrown committed Dec 13, 2012
Commits on Dec 12, 2012
  1. Merge branch '2.1.x' into 2.2.x

    graemerocher committed Dec 12, 2012
    Conflicts:
    	build.gradle
    	build.properties
    	grails-test-suite-uber/src/test/groovy/grails/util/GrailsUtilTests.java
  2. update to datastore 1.1.2

    graemerocher committed Dec 12, 2012
Commits on Dec 11, 2012
  1. use springloaded 1.1.1

    jeffbrown committed Dec 11, 2012
Commits on Dec 10, 2012
  1. Revert "update version to 2.2.0 RC3"

    jeffbrown committed Dec 10, 2012
    This reverts commit 4b079cd.
  2. include poms in the plugins dir

    jeffbrown committed Dec 10, 2012
    This is copying the poms for plugins that we ship in the release into the plugins dir.  We still need to rig up core to look for these poms.
Commits on Dec 7, 2012
  1. Revert "Revert "introduce new configuration option that disables pars…

    jeffbrown committed Dec 7, 2012
    …ing of dependencies.groovy completely so that only POM data is used. Parsing dependencies.groovy is disabled by default for new applications.""
    
    This reverts commit 2758a05.
Commits on Dec 6, 2012
  1. Revert "introduce new configuration option that disables parsing of d…

    jeffbrown committed Dec 6, 2012
    …ependencies.groovy completely so that only POM data is used. Parsing dependencies.groovy is disabled by default for new applications."
    
    This reverts commit 56ff6d2.
    
    This revert is temporary as we troubleshoot issues with the build server.
  2. GRAILS-9646 - fix wrapper

    jeffbrown committed Dec 6, 2012
    The previous code was matching any groovy jar file which began with groovy-all-.  Since we include source and javadoc jars now, those broke that logic.  Now we look for a jar name that matches a more specific regex.
  3. GRAILS-9646 - fix wrapper

    jeffbrown committed Dec 6, 2012
    The previous code was matching any groovy jar file which began with groovy-all-.  Since we include source and javadoc jars now, those broke that logic.  Now we look for a jar name that matches a more specific regex.
  4. 2.1.3.BUILD-SNAPSHOT

    jeffbrown committed Dec 6, 2012
Commits on Dec 5, 2012
  1. update version to 2.1.2

    graemerocher committed Dec 5, 2012