 Index: src/java/org/dellroad/stuff/vaadin/PropertyDef.java
 ===================================================================
---- src/java/org/dellroad/stuff/vaadin/PropertyDef.java	(revision 367)
+--- src/java/org/dellroad/stuff/vaadin/PropertyDef.java	(revision 370)
 +++ src/java/org/dellroad/stuff/vaadin/PropertyDef.java	(working copy)
-@@ -30,7 +30,7 @@
+@@ -32,7 +32,7 @@
   *  ...
   *  int age = def.read(item);
   *  ...

 
Index: src/java/org/dellroad/stuff/vaadin/ContextApplication.java
===================================================================
--- src/java/org/dellroad/stuff/vaadin/ContextApplication.java	(revision 362)
+++ src/java/org/dellroad/stuff/vaadin/ContextApplication.java	(working copy)
@@ -10,9 +10,11 @@
 import com.vaadin.Application;

      * Perform any application-specific shutdown work. This will be invoked at shutdown after this Vaadin application and the
Index: src/java/org/dellroad/stuff/vaadin/SimpleContainer.java
===================================================================
--- src/java/org/dellroad/stuff/vaadin/SimpleContainer.java	(revision 371)
+++ src/java/org/dellroad/stuff/vaadin/SimpleContainer.java	(working copy)
@@ -118,7 +118,7 @@
     }
 
     @Override
-    public Property getContainerProperty(Object itemId, Object propertyId) {        // TODO: VAADIN7
+    public Property<?> getContainerProperty(Object itemId, Object propertyId) {
         SimpleItem<T> entityItem = this.getItem(itemId);
         if (entityItem == null)
             return null;
Index: src/java/org/dellroad/stuff/vaadin/SimpleProperty.java
===================================================================
--- src/java/org/dellroad/stuff/vaadin/SimpleProperty.java	(revision 371)
+++ src/java/org/dellroad/stuff/vaadin/SimpleProperty.java	(working copy)
@@ -23,7 +23,7 @@
  * @see SimpleItem
  */
 @SuppressWarnings("serial")
-public class SimpleProperty<T, V> extends AbstractProperty {                // TODO: VAADIN7
+public class SimpleProperty<T, V> extends AbstractProperty<V> {
 
     private final T object;
     private final PropertyDef<V> propertyDef;
Index: src/ivy/ivy.xml
===================================================================
--- src/ivy/ivy.xml	(revision 368)
+++ src/ivy/ivy.xml	(working copy)
@@ -15,7 +15,7 @@
     </configurations>
