markus
/
vaadin-clubhelper
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Spring and Vaadin updates

Browse Source
master
Markus Kreth 7 years ago
parent 21c2d17a3f
commit 7cec6e7824
6 changed files with 39 additions and 19 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 10
      .classpath
  2. 12
      .settings/org.eclipse.wst.common.component
  3. 2
      .settings/org.eclipse.wst.common.project.facet.core.xml
  4. 22
      pom.xml
  5. 4
      src/main/resources/application.properties
  6. 8
      src/main/webapp/VAADIN/themes/vaadin-clubhelpertheme/styles.css

10
.classpath
Unescape View File

@ -24,20 +24,18 @@
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/> <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="target/generated-resources/gwt"> <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes> <attributes>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" 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 excluding="**" kind="src" output="target/classes" path="target/generated-resources/gwt">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>

12
.settings/org.eclipse.wst.common.component
Unescape View File

@ -1,12 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0"> <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="vaadin-clubhelper-0.0.1-SNAPSHOT"> <wb-module deploy-name="vaadin-clubhelper-0.0.1-SNAPSHOT">
<wb-resource deploy-path="/" source-path="/WebContent"/> <wb-resource deploy-path="/" source-path="/WebContent"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-resources/gwt"/>
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/> <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/> <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-resources/gwt"/>
<property name="context-root" value="vaadin-clubhelper"/> <property name="context-root" value="vaadin-clubhelper"/>
<property name="java-output-path" value="/vaadin-clubhelper/target/classes"/> <property name="java-output-path" value="/vaadin-clubhelper/target/classes"/>
</wb-module> </wb-module>
</project-modules> </project-modules>

2
.settings/org.eclipse.wst.common.project.facet.core.xml
Unescape View File

@ -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="jst.web" version="3.1"/>
<installed facet="java" version="1.8"/> <installed facet="java" version="1.8"/>
<installed facet="jst.web" version="4.0"/>
</faceted-project> </faceted-project>

22
pom.xml
Unescape View File

@ -15,7 +15,7 @@
<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.0.6.RELEASE</version> <version>2.1.0.RELEASE</version>
<relativePath /> <!-- lookup parent from repository --> <relativePath /> <!-- lookup parent from repository -->
</parent> </parent>
@ -25,7 +25,7 @@
<java.version>1.8</java.version> <java.version>1.8</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<vaadin.version>8.4.4</vaadin.version> <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>
@ -186,7 +186,13 @@
<groupId>org.glassfish.jaxb</groupId> <groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId> <artifactId>jaxb-runtime</artifactId>
<version>2.4.0-b180830.0438</version> <version>2.4.0-b180830.0438</version>
</dependency><!-- https://mvnrepository.com/artifact/org.javassist/javassist -->
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>3.23.1-GA</version>
</dependency> </dependency>
</dependencies> </dependencies>
<dependencyManagement> <dependencyManagement>
@ -243,12 +249,12 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.22.1</version> <version>2.22.1</version>
<!-- <configuration> --> <!-- <configuration> -->
<!-- <argLine> --> <!-- <argLine> -->
<!-- -javaagent:${sonar.jacoco.jar}=destfile=${sonar.jacoco.reportPath} --> <!-- -javaagent:${sonar.jacoco.jar}=destfile=${sonar.jacoco.reportPath} -->
<!-- </argLine> --> <!-- </argLine> -->
<!-- <test>**/*.java</test> --> <!-- <test>**/*.java</test> -->
<!-- </configuration> --> <!-- </configuration> -->
<dependencies> <dependencies>
<dependency> <dependency>

4
src/main/resources/application.properties
Unescape View File

@ -2,8 +2,8 @@ spring.datasource.url=jdbc:mysql://localhost:3306/clubhelper?useUnicode=yes&char
spring.datasource.username=markus spring.datasource.username=markus
spring.datasource.password=0773 spring.datasource.password=0773
security.ignored=/** security.ignored=/**
security.basic.enable: false security.basic.enable=false
management.security.enabled: false management.security.enabled=false
spring.jpa.hibernate.naming-strategy = org.hibernate.cfg.ImprovedNamingStrategy spring.jpa.hibernate.naming-strategy = org.hibernate.cfg.ImprovedNamingStrategy
spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl

8
src/main/webapp/VAADIN/themes/vaadin-clubhelpertheme/styles.css
Unescape View File

@ -1091,7 +1091,7 @@
*/ */
.v-vaadin-version:after { .v-vaadin-version:after {
content: "8.4.4"; content: "8.5.2";
} }
.v-widget { .v-widget {
@ -5078,6 +5078,8 @@ div.v-layout.v-horizontal.v-widget {
-webkit-box-shadow: 1px 0 2px rgba(0, 0, 0, 0.1); -webkit-box-shadow: 1px 0 2px rgba(0, 0, 0, 0.1);
box-shadow: 1px 0 2px rgba(0, 0, 0, 0.1); box-shadow: 1px 0 2px rgba(0, 0, 0, 0.1);
border-right: 1px solid #d4d4d4; border-right: 1px solid #d4d4d4;
position: relative;
z-index: 11;
} }
.vaadin-clubhelpertheme .v-grid-cell.frozen + th, .vaadin-clubhelpertheme .v-grid-cell.frozen + td { .vaadin-clubhelpertheme .v-grid-cell.frozen + th, .vaadin-clubhelpertheme .v-grid-cell.frozen + td {
@ -9724,6 +9726,8 @@ div.v-layout.v-horizontal.v-widget {
-webkit-box-shadow: 1px 0 2px rgba(0, 0, 0, 0.1); -webkit-box-shadow: 1px 0 2px rgba(0, 0, 0, 0.1);
box-shadow: 1px 0 2px rgba(0, 0, 0, 0.1); box-shadow: 1px 0 2px rgba(0, 0, 0, 0.1);
border-right: 1px solid #d4d4d4; border-right: 1px solid #d4d4d4;
position: relative;
z-index: 11;
} }
.vaadin-clubhelpertheme .v-tree8-cell.frozen + th, .vaadin-clubhelpertheme .v-tree8-cell.frozen + td { .vaadin-clubhelpertheme .v-tree8-cell.frozen + th, .vaadin-clubhelpertheme .v-tree8-cell.frozen + td {
@ -10800,6 +10804,8 @@ div.v-layout.v-horizontal.v-widget {
-webkit-box-shadow: 1px 0 2px rgba(0, 0, 0, 0.1); -webkit-box-shadow: 1px 0 2px rgba(0, 0, 0, 0.1);
box-shadow: 1px 0 2px rgba(0, 0, 0, 0.1); box-shadow: 1px 0 2px rgba(0, 0, 0, 0.1);
border-right: 1px solid #d4d4d4; border-right: 1px solid #d4d4d4;
position: relative;
z-index: 11;
} }
.vaadin-clubhelpertheme .v-treegrid-cell.frozen + th, .vaadin-clubhelpertheme .v-treegrid-cell.frozen + td { .vaadin-clubhelpertheme .v-treegrid-cell.frozen + th, .vaadin-clubhelpertheme .v-treegrid-cell.frozen + td {

Write Preview
Loading…
Cancel
Save