### Eclipse Workspace Patch 1.0 #P wicket-rad-core Index: src/test/resources/wicketVersion =================================================================== --- src/test/resources/wicketVersion (revision 319) +++ src/test/resources/wicketVersion (working copy) @@ -1 +1 @@ -wicket.version=1.3.4 \ No newline at end of file +wicket.version=1.4-SNAPSHOT \ No newline at end of file Index: src/main/java/org/wicketrad/FeedbackLabel.java =================================================================== --- src/main/java/org/wicketrad/FeedbackLabel.java (revision 319) +++ src/main/java/org/wicketrad/FeedbackLabel.java (working copy) @@ -111,12 +111,12 @@ @Override protected void onBeforeRender() { super.onBeforeRender(); - this.setModel(null); + this.setDefaultModel(null); if (component.getFeedbackMessage() != null) { if (this.text != null) { - this.setModel(text); + this.setDefaultModel(text); } else { - this.setModel(new Model(component.getFeedbackMessage() + this.setDefaultModel(new Model(component.getFeedbackMessage() .getMessage())); } @@ -126,7 +126,7 @@ + component.getFeedbackMessage() .getLevelAsString()))); } else { - this.setModel(null); + this.setDefaultModel(null); } } } Index: pom.xml =================================================================== --- pom.xml (revision 319) +++ pom.xml (working copy) @@ -61,27 +61,27 @@ org.apache.wicket wicket - 1.3.5 + 1.4-SNAPSHOT org.apache.wicket wicket-guice - 1.3.5 + 1.4-SNAPSHOT org.wicketstuff wicket-contrib-tinymce - 1.3.5 + 1.4-SNAPSHOT org.apache.wicket wicket-extensions - 1.3.5 + 1.4-SNAPSHOT org.apache.wicket wicket-datetime - 1.3.5 + 1.4-SNAPSHOT org.wicketstuff #P wicket-contrib-tinymce Index: pom.xml =================================================================== --- pom.xml (revision 319) +++ pom.xml (working copy) @@ -6,7 +6,7 @@ org.wicketstuff wicket-contrib-tinymce jar - 1.3.5 + 1.4-SNAPSHOT Wicket Contrib TinyMCE http://wicket-stuff.sourceforge.net @@ -90,7 +90,7 @@ org.apache.wicket wicket - 1.3.5 + 1.4-SNAPSHOT provided @@ -185,6 +185,14 @@ org.codehaus.mojo surefire-report-maven-plugin + + org.apache.maven.plugins + maven-compiler-plugin + + 1.5 + 1.5 + + @@ -194,6 +202,7 @@ 1.0-beta-2 +