mirror of
https://bitbucket.org/wisemapping/wisemapping-open-source.git
synced 2024-11-22 14:17:57 +01:00
More fixes
This commit is contained in:
parent
d03a9e5eea
commit
fc66a52232
5
pom.xml
5
pom.xml
@ -61,11 +61,6 @@
|
|||||||
<groupId>org.codehaus.mojo</groupId>
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
<version>3.0.0</version>
|
<version>3.0.0</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-surefire-plugin</artifactId>
|
|
||||||
<version>2.16</version>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-resources-plugin</artifactId>
|
<artifactId>maven-resources-plugin</artifactId>
|
||||||
|
@ -47,15 +47,22 @@
|
|||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-test</artifactId>
|
<artifactId>spring-boot-starter-test</artifactId>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
<exclusions>
|
<exclusions>
|
||||||
<exclusion>
|
<exclusion>
|
||||||
<groupId>junit</groupId>
|
<groupId>org.junit.vintage</groupId>
|
||||||
<artifactId>junit</artifactId>
|
<artifactId>junit-vintage-engine</artifactId>
|
||||||
</exclusion>
|
</exclusion>
|
||||||
</exclusions>
|
</exclusions>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<!-- <dependency>-->
|
||||||
|
<!-- <groupId>org.springframework.boot</groupId>-->
|
||||||
|
<!-- <artifactId>spring-boot-devtools</artifactId>-->
|
||||||
|
<!-- <optional>true</optional>-->
|
||||||
|
<!-- </dependency>-->
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework</groupId>
|
<groupId>org.springframework</groupId>
|
||||||
<artifactId>spring-test</artifactId>
|
<artifactId>spring-test</artifactId>
|
||||||
@ -215,46 +222,11 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||||
</plugin>
|
<!-- <configuration>-->
|
||||||
<plugin>
|
<!-- <jvmArguments>-->
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<!-- -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005-->
|
||||||
<artifactId>maven-war-plugin</artifactId>
|
<!-- </jvmArguments>-->
|
||||||
<version>3.4.0</version>
|
<!-- </configuration>-->
|
||||||
<configuration>
|
|
||||||
<warName>wisemapping</warName>
|
|
||||||
<overlays>
|
|
||||||
<overlay>
|
|
||||||
<groupId>org.wisemapping</groupId>
|
|
||||||
<artifactId>wise-ui</artifactId>
|
|
||||||
<targetPath>/static/mindplot/</targetPath>
|
|
||||||
<includes>
|
|
||||||
<include>wisemapping-mindplot/package/dist/*</include>
|
|
||||||
</includes>
|
|
||||||
</overlay>
|
|
||||||
<overlay>
|
|
||||||
<groupId>org.wisemapping</groupId>
|
|
||||||
<artifactId>wise-ui</artifactId>
|
|
||||||
<targetPath>/static/webapp/</targetPath>
|
|
||||||
<includes>
|
|
||||||
<include>wisemapping-webapp/package/dist/*</include>
|
|
||||||
</includes>
|
|
||||||
</overlay>
|
|
||||||
</overlays>
|
|
||||||
<archiveClasses>true</archiveClasses>
|
|
||||||
<packagingExcludes>
|
|
||||||
WEB-INF/lib/commons-logging-*.jar,
|
|
||||||
</packagingExcludes>
|
|
||||||
<webResources>
|
|
||||||
<resource>
|
|
||||||
<directory>src/main/resources</directory>
|
|
||||||
<targetPath>WEB-INF</targetPath>
|
|
||||||
<includes>
|
|
||||||
<include>*.wsdl</include>
|
|
||||||
<include>*.xsd</include>
|
|
||||||
</includes>
|
|
||||||
</resource>
|
|
||||||
</webResources>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
@ -3,9 +3,7 @@ SpringBoot Common
|
|||||||
##################################################################################
|
##################################################################################
|
||||||
|
|
||||||
# JPA
|
# JPA
|
||||||
spring.datasource.initialize=true
|
|
||||||
spring.main.allow-circular-references=true
|
spring.main.allow-circular-references=true
|
||||||
|
|
||||||
spring.jpa.open-in-view=true
|
spring.jpa.open-in-view=true
|
||||||
spring.jpa.hibernate.ddl-auto=none
|
spring.jpa.hibernate.ddl-auto=none
|
||||||
spring.jpa.properties.hibernate.current_session_context_class=thread
|
spring.jpa.properties.hibernate.current_session_context_class=thread
|
||||||
@ -13,8 +11,7 @@ spring.jpa.properties.hibernate.format_sql=true
|
|||||||
spring.sql.init.mode=always
|
spring.sql.init.mode=always
|
||||||
|
|
||||||
# LOG
|
# LOG
|
||||||
|
logging.level.root=INFO
|
||||||
logging.level.root=TRACE
|
|
||||||
logging.level.org.apache.tomcat=INFO
|
logging.level.org.apache.tomcat=INFO
|
||||||
|
|
||||||
##################################################################################
|
##################################################################################
|
||||||
@ -130,5 +127,6 @@ database.base.url=/Users/veigap/
|
|||||||
spring.datasource.url=jdbc:hsqldb:file:${database.base.url}/db/wisemapping
|
spring.datasource.url=jdbc:hsqldb:file:${database.base.url}/db/wisemapping
|
||||||
spring.datasource.username=sa
|
spring.datasource.username=sa
|
||||||
spring.datasource.password=
|
spring.datasource.password=
|
||||||
|
|
||||||
spring.datasource.driver-class-name = org.hsqldb.jdbc.JDBCDriver
|
spring.datasource.driver-class-name = org.hsqldb.jdbc.JDBCDriver
|
||||||
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.HSQLDialect
|
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.HSQLDialect
|
||||||
|
Loading…
Reference in New Issue
Block a user