Update java to 11, spring to 2.1.1.RELEASE and vaadin to 8.6.2

master
Markus Kreth 7 years ago
parent 2f90c92b3b
commit f4af25afa3
  1. 8
      .classpath
  2. 8
      .settings/org.eclipse.jdt.core.prefs
  3. 2
      .settings/org.eclipse.wst.common.project.facet.core.xml
  4. 15
      pom.xml
  5. 2
      src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/CalendarComponent.java
  6. 22
      src/main/webapp/VAADIN/themes/vaadin-clubhelpertheme/styles.css

@ -30,16 +30,16 @@
<attribute name="test" value="true"/> <attribute name="test" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> <classpathentry kind="src" output="target/classes" path="target/generated-resources/gwt">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
<attribute name="optional" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="src" output="target/classes" path="target/generated-resources/gwt"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
<attribute name="optional" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>

@ -1,10 +1,10 @@
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=generate org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.compiler.source=11

@ -3,6 +3,6 @@
<fixed facet="wst.jsdt.web"/> <fixed facet="wst.jsdt.web"/>
<installed facet="jpt.jpa" version="2.1"/> <installed facet="jpt.jpa" version="2.1"/>
<installed facet="wst.jsdt.web" version="1.0"/> <installed facet="wst.jsdt.web" version="1.0"/>
<installed facet="java" version="1.8"/>
<installed facet="jst.web" version="4.0"/> <installed facet="jst.web" version="4.0"/>
<installed facet="java" version="11"/>
</faceted-project> </faceted-project>

@ -19,17 +19,15 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.0.RELEASE</version> <version>2.1.1.RELEASE</version>
<relativePath /> <!-- lookup parent from repository --> <relativePath /> <!-- lookup parent from repository -->
</parent> </parent>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version> <java.version>11</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source> <vaadin.version>8.6.2</vaadin.version>
<maven.compiler.target>${java.version}</maven.compiler.target>
<vaadin.version>8.5.2</vaadin.version>
<google-api-version>1.23.0</google-api-version> <google-api-version>1.23.0</google-api-version>
<google-api-sheets-version>v4-rev488-1.23.0</google-api-sheets-version> <google-api-sheets-version>v4-rev488-1.23.0</google-api-sheets-version>
<google-api-calendar-version>v3-rev271-1.23.0</google-api-calendar-version> <google-api-calendar-version>v3-rev271-1.23.0</google-api-calendar-version>
@ -250,6 +248,13 @@
<gwtSdkFirstInClasspath>true</gwtSdkFirstInClasspath> <gwtSdkFirstInClasspath>true</gwtSdkFirstInClasspath>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<release>${java.version}</release>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>

@ -25,7 +25,6 @@ import org.vaadin.addon.calendar.ui.CalendarComponentEvents.ForwardEvent;
import org.vaadin.addon.calendar.ui.CalendarComponentEvents.ItemClickHandler; import org.vaadin.addon.calendar.ui.CalendarComponentEvents.ItemClickHandler;
import com.vaadin.contextmenu.ContextMenu; import com.vaadin.contextmenu.ContextMenu;
import com.vaadin.contextmenu.MenuItem;
import com.vaadin.server.StreamResource; import com.vaadin.server.StreamResource;
import com.vaadin.shared.Registration; import com.vaadin.shared.Registration;
import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.AbstractComponent;
@ -35,6 +34,7 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.CustomComponent; import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label; import com.vaadin.ui.Label;
import com.vaadin.ui.MenuBar.MenuItem;
import com.vaadin.ui.Notification; import com.vaadin.ui.Notification;
import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window; import com.vaadin.ui.Window;

@ -1091,7 +1091,7 @@
*/ */
.v-vaadin-version:after { .v-vaadin-version:after {
content: "8.5.2"; content: "8.6.2";
} }
.v-widget { .v-widget {
@ -4903,6 +4903,10 @@ div.v-layout.v-horizontal.v-widget {
left: 0; left: 0;
} }
.vaadin-clubhelpertheme .v-grid-body .v-grid-header > .v-grid-row {
position: relative;
}
.vaadin-clubhelpertheme .v-grid-row { .vaadin-clubhelpertheme .v-grid-row {
display: block; display: block;
} }
@ -9551,6 +9555,10 @@ div.v-layout.v-horizontal.v-widget {
left: 0; left: 0;
} }
.vaadin-clubhelpertheme .v-tree8-body .v-tree8-header > .v-tree8-row {
position: relative;
}
.vaadin-clubhelpertheme .v-tree8-row { .vaadin-clubhelpertheme .v-tree8-row {
display: block; display: block;
} }
@ -10629,6 +10637,10 @@ div.v-layout.v-horizontal.v-widget {
left: 0; left: 0;
} }
.vaadin-clubhelpertheme .v-treegrid-body .v-treegrid-header > .v-treegrid-row {
position: relative;
}
.vaadin-clubhelpertheme .v-treegrid-row { .vaadin-clubhelpertheme .v-treegrid-row {
display: block; display: block;
} }
@ -13007,6 +13019,14 @@ div.v-layout.v-horizontal.v-widget {
text-align: right; text-align: right;
} }
.vaadin-clubhelpertheme .v-tabsheet-right-aligned-tabs .v-tabsheet-spacertd {
display: inline-block !important;
}
.vaadin-clubhelpertheme .v-tabsheet-right-aligned-tabs .v-tabsheet-scroller {
padding-left: 9px;
}
.vaadin-clubhelpertheme .v-tabsheet-padded-tabbar > .v-tabsheet-tabcontainer .v-tabsheet-tabs { .vaadin-clubhelpertheme .v-tabsheet-padded-tabbar > .v-tabsheet-tabcontainer .v-tabsheet-tabs {
padding: 0 9px; padding: 0 9px;
} }

Loading…
Cancel
Save