diff -Nru gradle-1.0/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/CustomModelBuilder.java gradle-1.0-gil/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/CustomModelBuilder.java --- gradle-1.0/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/CustomModelBuilder.java 2011-10-25 05:52:58.000000000 +0200 +++ gradle-1.0-gil/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/CustomModelBuilder.java 2012-09-21 20:04:18.564045008 +0200 @@ -20,19 +20,21 @@ import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException; import org.gradle.api.internal.artifacts.PlexusLoggerAdapter; import org.slf4j.LoggerFactory; +/* import org.sonatype.maven.polyglot.execute.ExecuteManager; import org.sonatype.maven.polyglot.execute.ExecuteManagerImpl; import org.sonatype.maven.polyglot.groovy.builder.ModelBuilder; - +*/ import java.lang.reflect.Field; import java.util.Map; /** * This is a slightly modified version as shipped with polyglot Maven. */ -public class CustomModelBuilder extends ModelBuilder { - +//public class CustomModelBuilder extends ModelBuilder { +public class CustomModelBuilder { public CustomModelBuilder(Model model) { + /* ExecuteManager executeManager = new ExecuteManagerImpl(); setProp(executeManager.getClass(), executeManager, "log", new PlexusLoggerAdapter(LoggerFactory.getLogger(ExecuteManagerImpl.class))); @@ -48,6 +50,8 @@ factories.remove("project"); ModelFactory modelFactory = new ModelFactory(model); registerFactory(modelFactory.getName(), null, modelFactory); + */ + throw new UnsupportedOperationException("CustomModelBuilder"); } public static void setProp(Class c, Object obj, String fieldName, Object value) { diff -Nru gradle-1.0/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ModelFactory.java gradle-1.0-gil/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ModelFactory.java --- gradle-1.0/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ModelFactory.java 2011-10-25 05:52:58.000000000 +0200 +++ gradle-1.0-gil/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ModelFactory.java 2012-09-21 20:04:18.565044951 +0200 @@ -17,26 +17,30 @@ import groovy.util.FactoryBuilderSupport; import org.apache.maven.model.Model; -import org.sonatype.maven.polyglot.groovy.builder.factory.NamedFactory; +//import org.sonatype.maven.polyglot.groovy.builder.factory.NamedFactory; import java.util.Map; /** * This is a slightly modified version as shipped with polyglot Maven. */ -public class ModelFactory extends NamedFactory { +//public class ModelFactory extends NamedFactory { +public class ModelFactory { private Model model; public ModelFactory(Model model) { + /* super("project"); this.model = model; + */ + throw new UnsupportedOperationException("ModelFactory"); } public Object newInstance(FactoryBuilderSupport builder, Object name, Object value, Map attrs) throws InstantiationException, IllegalAccessException { return model; } - @Override + //@Override public void onNodeCompleted(FactoryBuilderSupport builder, Object parent, Object node) { Model model = (Model)node; } diff -Nru gradle-1.0/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/pombuilder/CustomModelBuilder.java gradle-1.0-gil/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/pombuilder/CustomModelBuilder.java --- gradle-1.0/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/pombuilder/CustomModelBuilder.java 2011-06-23 21:14:12.000000000 +0200 +++ gradle-1.0-gil/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/pombuilder/CustomModelBuilder.java 2012-09-21 20:04:18.566044894 +0200 @@ -23,16 +23,20 @@ import org.apache.maven.model.Model; import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException; import org.slf4j.LoggerFactory; +/* import org.sonatype.maven.polyglot.execute.ExecuteManager; import org.sonatype.maven.polyglot.execute.ExecuteManagerImpl; import org.sonatype.maven.polyglot.groovy.builder.ModelBuilder; +*/ /** * This is a slightly modified version as shipped with polyglot Maven. */ -public class CustomModelBuilder extends ModelBuilder { +//public class CustomModelBuilder extends ModelBuilder { +public class CustomModelBuilder { public CustomModelBuilder(Model model) { + /* ExecuteManager executeManager = new ExecuteManagerImpl(); setProp(executeManager.getClass(), executeManager, "log", new PlexusLoggerAdapter(LoggerFactory.getLogger(ExecuteManagerImpl.class))); @@ -48,6 +52,8 @@ factories.remove("project"); ModelFactory modelFactory = new ModelFactory(model); registerFactory(modelFactory.getName(), null, modelFactory); + */ + throw new UnsupportedOperationException("CustomModelBuilder"); } public static void setProp(Class c, Object obj, String fieldName, Object value) { diff -Nru gradle-1.0/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/pombuilder/ModelFactory.java gradle-1.0-gil/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/pombuilder/ModelFactory.java --- gradle-1.0/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/pombuilder/ModelFactory.java 2011-06-23 21:14:12.000000000 +0200 +++ gradle-1.0-gil/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/pombuilder/ModelFactory.java 2012-09-21 20:04:18.567044837 +0200 @@ -20,24 +20,28 @@ import groovy.util.FactoryBuilderSupport; import org.apache.maven.model.Model; -import org.sonatype.maven.polyglot.groovy.builder.factory.NamedFactory; +//import org.sonatype.maven.polyglot.groovy.builder.factory.NamedFactory; /** * This is a slightly modified version as shipped with polyglot Maven. */ -public class ModelFactory extends NamedFactory { +//public class ModelFactory extends NamedFactory { +public class ModelFactory { private Model model; public ModelFactory(Model model) { + /* super("project"); this.model = model; + */ + throw new UnsupportedOperationException("ModelFactory"); } public Object newInstance(FactoryBuilderSupport builder, Object name, Object value, Map attrs) throws InstantiationException, IllegalAccessException { return model; } - @Override + //@Override public void onNodeCompleted(FactoryBuilderSupport builder, Object parent, Object node) { Model model = (Model) node; }