Skip to content

Commit

Permalink
Moved devtool dependencies from infomodel.web/pom.xml to devtool/pom.xml
Browse files Browse the repository at this point in the history
Signed-off-by: shiv12095 <shiv12095@iiitd.ac.in>
  • Loading branch information
shiv12095 committed Jul 25, 2016
1 parent 488c15e commit 572827f
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 44 deletions.
30 changes: 0 additions & 30 deletions bundles/org.eclipse.vorto.editor.infomodel.web/pom.xml
Expand Up @@ -113,36 +113,6 @@
<artifactId>org.eclipse.xtend.lib</artifactId>
<version>${xtext.version}</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>requirejs</artifactId>
<version>2.1.15</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery</artifactId>
<version>2.1.1</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>ace</artifactId>
<version>1.2.0</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>angularjs</artifactId>
<version>1.3.13</version>
</dependency>
<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>angular-route</artifactId>
<version>1.3.13</version>
</dependency>
<dependency>
<groupId>org.webjars.npm</groupId>
<artifactId>angular-smart-table</artifactId>
<version>2.1.6</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-annotations</artifactId>
Expand Down
44 changes: 30 additions & 14 deletions server/devtool/pom.xml
Expand Up @@ -117,19 +117,35 @@
<artifactId>commons-lang3</artifactId>
<version>3.1</version>
</dependency>

<!-- <dependency> <groupId>org.eclipse.xtext</groupId> <artifactId>org.eclipse.xtext.web.servlet</artifactId>
<version>${xtext.version}</version> </dependency> <dependency> <groupId>org.eclipse.xtend</groupId>
<artifactId>org.eclipse.xtend.lib</artifactId> <version>${xtext.version}</version>
<exclusions> <exclusion> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId>
</exclusion> </exclusions> </dependency> <dependency> <groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext</artifactId> <version>${xtext.version}</version>
<exclusions> <exclusion> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId>
</exclusion> </exclusions> </dependency> <dependency> <groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.xbase</artifactId> <version>${xtext.version}</version>
<exclusions> <exclusion> <groupId>org.ow2.asm</groupId> <artifactId>asm</artifactId>
</exclusion> <exclusion> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId>
</exclusion> </exclusions> </dependency> -->

<dependency>
<groupId>org.webjars</groupId>
<artifactId>requirejs</artifactId>
<version>2.1.15</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery</artifactId>
<version>2.1.1</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>ace</artifactId>
<version>1.2.0</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>angularjs</artifactId>
<version>1.3.13</version>
</dependency>
<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>angular-route</artifactId>
<version>1.3.13</version>
</dependency>
<dependency>
<groupId>org.webjars.npm</groupId>
<artifactId>angular-smart-table</artifactId>
<version>2.1.6</version>
</dependency>
</dependencies>
</project>

0 comments on commit 572827f

Please sign in to comment.