Maven dependency problem+admin consoel as war

This commit is contained in:
Nicolas Héron 2018-10-11 11:30:45 +02:00
commit d454ebc3e2
2 changed files with 46 additions and 5 deletions

View file

@ -8,12 +8,20 @@
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>war</packaging>
<artifactId>drools-framework-admin-console</artifactId>
<build> <build>
<finalName>drools-framework-admin-console</finalName> <finalName>drools-framework-admin-console</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.2.2</version>
</plugin>
</plugins>
</build> </build>
<artifactId>drools-framework-admin-console</artifactId>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.offbytwo.jenkins</groupId> <groupId>com.offbytwo.jenkins</groupId>
@ -30,9 +38,34 @@
<groupId>com.vaadin</groupId> <groupId>com.vaadin</groupId>
<artifactId>vaadin-spring-boot-starter</artifactId> <artifactId>vaadin-spring-boot-starter</artifactId>
<version>1.2.0</version> <version>1.2.0</version>
<exclusions>
<exclusion>
<artifactId>spring-boot-autoconfigure</artifactId>
<groupId>org.springframework.boot</groupId>
</exclusion>
<exclusion>
<artifactId>spring-boot</artifactId>
<groupId>org.springframework.boot</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<version>1.5.1.Release</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId>
<version>1.5.1.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot</artifactId>
<version>1.5.1.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId> <artifactId>jackson-core</artifactId>

View file

@ -4,6 +4,8 @@ package org.chtijbug.drools.console;
import org.chtijbug.drools.console.service.util.ApplicationContextProvider; import org.chtijbug.drools.console.service.util.ApplicationContextProvider;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.support.SpringBootServletInitializer;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.ImportResource; import org.springframework.context.annotation.ImportResource;
@ -14,7 +16,13 @@ import org.springframework.context.annotation.PropertySource;
//@ComponentScan({"com.assurfleet.front.courtier.petiteflotte.maj","com.assurfleet.jms.services"}) //@ComponentScan({"com.assurfleet.front.courtier.petiteflotte.maj","com.assurfleet.jms.services"})
@PropertySource("classpath:application.properties") @PropertySource("classpath:application.properties")
@ImportResource("classpath:applicationContext.xml") @ImportResource("classpath:applicationContext.xml")
public class DroolsSpringBootConsoleApplication { public class DroolsSpringBootConsoleApplication extends SpringBootServletInitializer {
@Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
return application.sources(DroolsSpringBootConsoleApplication.class);
}
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(DroolsSpringBootConsoleApplication.class, args); SpringApplication.run(DroolsSpringBootConsoleApplication.class, args);
} }