Skip to content

Commit

Permalink
changed parent pom of webeditor module
Browse files Browse the repository at this point in the history
  • Loading branch information
@aedelmann
aedelmann committed Sep 28, 2016
1 parent 172ae16 commit 2fe4a67
Show file tree
Hide file tree
Showing 3 changed files with 77 additions and 61 deletions.
5 changes: 0 additions & 5 deletions bundles/org.eclipse.vorto.editor.functionblock.web/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,6 @@

<dependencies>
<!-- http://mvnrepository.com/artifact/org.springframework/spring-web -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>4.3.0.RELEASE</version>
</dependency>
<dependency>
<groupId>org.eclipse.vorto</groupId>
<artifactId>org.eclipse.vorto.core</artifactId>
Expand Down
5 changes: 0 additions & 5 deletions bundles/org.eclipse.vorto.editor.infomodel.web/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,6 @@

<dependencies>
<!-- http://mvnrepository.com/artifact/org.springframework/spring-web -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>4.3.0.RELEASE</version>
</dependency>
<dependency>
<groupId>org.eclipse.vorto</groupId>
<artifactId>org.eclipse.vorto.core</artifactId>
Expand Down
128 changes: 77 additions & 51 deletions server/devtool/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,86 +4,88 @@

<modelVersion>4.0.0</modelVersion>

<groupId>org.eclipse.vorto.server</groupId>
<artifactId>devtool</artifactId>
<version>0.9.0-SNAPSHOT</version>
<packaging>war</packaging>
<name>Vorto Devtool</name>
<description>A web editor to create and edit Vorto models</description>

<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.3.0.RELEASE</version>
<groupId>org.eclipse.vorto</groupId>
<artifactId>server</artifactId>
<version>0.9.0-SNAPSHOT</version>
</parent>

<properties>
<xtext.version>2.9.2</xtext.version>
</properties>
<artifactId>devtool</artifactId>
<packaging>jar</packaging>
<name>Vorto Web Editor</name>
<description>A web editor to describe devices using information models and share them with the Vorto Repository</description>

<build>
<finalName>webeditor</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<jvmArguments>
-Xdebug
-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005
</jvmArguments>
<archive>
<manifest>
<mainClass>org.eclipse.vorto.server.devtool.DevToolServer</mainClass>
</manifest>
</archive>
</configuration>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>

<dependencies>
<!-- Core dependencies -->
<dependency>
<groupId>org.eclipse.vorto</groupId>
<artifactId>repo-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.vorto</groupId>
<artifactId>repo-http-models</artifactId>
<version>${project.version}</version>
</dependency>

<!-- Spring Boot dependencies -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
</dependency>

<!-- Spring Dependencies -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>

<!-- Swagger Dependencies -->
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>1.5.6</version>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
<version>1.5.6</version>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</dependency>

<!-- Vorto Dependencies -->
<dependency>
<groupId>org.eclipse.vorto</groupId>
<artifactId>org.eclipse.vorto.core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.vorto</groupId>
Expand All @@ -98,7 +100,6 @@
<dependency>
<groupId>org.eclipse.vorto</groupId>
<artifactId>org.eclipse.vorto.editor.functionblock</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.vorto</groupId>
Expand All @@ -119,7 +120,6 @@
<dependency>
<groupId>org.eclipse.vorto</groupId>
<artifactId>org.eclipse.vorto.editor.infomodel</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.vorto</groupId>
Expand All @@ -142,9 +142,35 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.1</version>
</dependency>

<!-- Swagger -->
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>1.5.6</version>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
<version>1.5.6</version>
</dependency>

<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>2.3.0</version>
<exclusions>
<exclusion>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Webjar Dependencies -->
<dependency>
Expand Down Expand Up @@ -196,7 +222,7 @@
<groupId>org.webjars.npm</groupId>
<artifactId>angular-smart-table</artifactId>
<version>2.1.6</version>
</dependency>
</dependency>

<!-- Test dependencies -->
<dependency>
Expand All @@ -214,7 +240,7 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>


</dependencies>
</project>

0 comments on commit 2fe4a67

Please sign in to comment.