Add widgets-module to Eclipse (#15544)

Change-Id: Ida08d51d26c97a8c1e92fc6cd49c8885e91cd052

diff --git a/.classpath b/.classpath
index 847fe8f769695006488d81d7f7de708096094be4..517b2366616e308a8d3f0c9fd54546a82a3b38e9 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -10,6 +10,7 @@
        <classpathentry kind="src" path="uitest/src"/>
        <classpathentry kind="src" path="buildhelpers/src"/>
        <classpathentry kind="src" path="shared/src"/>
+       <classpathentry kind="src" path="widgets/src"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
                <attributes>
                        <attribute name="owner.project.facets" value="java"/>
@@ -25,5 +26,6 @@
        <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
        <classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;ivyXmlPath=buildhelpers%2Fivy.xml&amp;confs=ide&amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles=build.properties"/>
        <classpathentry exported="true" kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;ivyXmlPath=gwt%2Fivy.xml&amp;confs=ide&amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles=%24%7Bworkspace_loc%3Avaadin%2Fbuild.properties%7D"/>
+       <classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;ivyXmlPath=widgets%2Fivy.xml&amp;confs=ide&amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles=build.properties"/>
        <classpathentry kind="output" path="build/classes"/>
 </classpath>

diff --git a/widgets/ivy.xml b/widgets/ivy.xml
index 3a304eeec60663d6c0786f6150478cc6cca8c173..d7c29631f4b65ebc5572729514d5276d84953e46 100644 (file)
--- a/widgets/ivy.xml
+++ b/widgets/ivy.xml
@@ -19,7 +19,7 @@
         <artifact type="javadoc" ext="jar" m:classifier="javadoc" />
         <artifact type="pom" ext="pom" />
     </publications>
-    <dependencies defaultconf="build" defaultconfmapping="build,ide->default">
+    <dependencies defaultconf="build" defaultconfmapping="build->default">
         <!-- API DEPENDENCIES -->
 
         <!-- LIBRARY DEPENDENCIES (compile time) -->
@@ -41,10 +41,7 @@
             <exclude type="pom" conf="test" />
         </dependency>
         <dependency org="com.vaadin" name="vaadin-sass-compiler"
-                    rev="${vaadin.sass.version}"
-                    conf="build-provided->default" />
-        <dependency org="junit" name="junit" rev="4.11"
-            conf="test->default" />
+            rev="${vaadin.sass.version}" conf="build-provided->default" />
 
     </dependencies>