zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing merge conflicts

Browse Source
This commit is contained in:
Ezequiel Bergamaschi
2014-01-25 19:54:28 -03:00
committed by Ezequiel Bergamaschi
parent 0d11dee06c 94812cd96a
commit 02cb53d082
48 changed files with 10371 additions and 1984 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
wise-webapp/pom.xml
View File

@@ -288,7 +288,6 @@
<artifactId>jackson-core-asl</artifactId>
<version>1.9.4</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
@@ -319,6 +318,11 @@
<artifactId>jsoup</artifactId>
<version>1.7.1</version>
</dependency>
<dependency>
<groupId>com.mangofactory</groupId>
<artifactId>swagger-springmvc</artifactId>
<version>0.6.6</version>
</dependency>
</dependencies>
<profiles>
<profile>
@@ -340,6 +344,11 @@
</configuration>
<dependencies>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.5</version>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
@@ -347,7 +356,6 @@
</dependency>
</dependencies>
<executions>
<execution>
<id>drop-schemas</id>
@@ -363,7 +371,7 @@
<includes>
<include>config/database/hsql/drop-schemas.sql</include>
<include>config/database/hsql/create-schemas.sql</include>
<include>config/database/hsql/atest-data.sql</include>
<include>config/database/hsql/apopulate-schemas.sql</include>
</includes>
</fileset>
</configuration>
@@ -506,9 +514,24 @@
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
<version>2.0</version>
<configuration>
<path>/wisemapping</path>
<warFile>${project.build.directory}/wisemapping.war</warFile>
<mode>war</mode>
<update>true</update>
<systemProperties>
<database.base.url>${project.build.directory}</database.base.url>
</systemProperties>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>8.1.14.v20131031</version>
<version>9.1.0.v20131115</version>
<configuration>
<stopKey>foo</stopKey>
<stopPort>9999</stopPort>
@@ -531,7 +554,6 @@
<value>${project.build.directory}</value>
</systemProperty>
</systemProperties>
<!--<scanIntervalSeconds>10</scanIntervalSeconds>-->
</configuration>
<executions>
<execution>
@@ -554,22 +576,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
<version>2.0</version>
<configuration>
<path>/wisemapping</path>
<warFile>${project.build.directory}/wisemapping.war</warFile>
<mode>war</mode>
<update>true</update>
<systemProperties>
<database.base.url>${project.build.directory}</database.base.url>
</systemProperties>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>