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

Merge branch 'develop'

Browse Source 
Conflicts:
	core-js/pom.xml
	mindplot/pom.xml
	pom.xml
	web2d/pom.xml
	wise-editor/pom.xml
	wise-webapp/pom.xml
This commit is contained in:
Paulo Gustavo Veiga
2015-02-06 22:48:58 -03:00
parent dfaa8ccd89 8436ad286c
commit 6ce24d39df
215 changed files with 22759 additions and 10220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
pom.xml
View File

@@ -4,15 +4,19 @@
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<properties>
<com.wisemapping.version>3.0.4</com.wisemapping.version>
<com.wisemapping.version>4.0.0</com.wisemapping.version>
<superpom.dir>${project.basedir}/wise-webapps</superpom.dir>
</properties>
<scm>
<developerConnection>scm:git:git@bitbucket.org:wisemapping/wisemapping-open-source.git</developerConnection>
</scm>
<modelVersion>4.0.0</modelVersion>
<groupId>org.wisemapping</groupId>
<artifactId>wisemapping</artifactId>
<name>WiseMapping Project</name>
<version>3.0.4</version>
<version>4.0.0</version>
<packaging>pom</packaging>
<licenses>
@@ -90,6 +94,16 @@
<artifactId>native2ascii-maven-plugin</artifactId>
<version>1.0-beta-1</version>
</plugin>
<plugin>
<groupId>com.github.searls</groupId>
<artifactId>jasmine-maven-plugin</artifactId>
<version>1.3.1.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -173,6 +187,15 @@
</reportPlugins>
</configuration>
</plugin>
<plugin>
<groupId>external.atlassian.jgitflow</groupId>
<artifactId>jgitflow-maven-plugin</artifactId>
<version>1.0-m4.3</version>
<configuration>
<masterBranchName>master</masterBranchName>
<developBranchName>develop</developBranchName>
</configuration>
</plugin>
</plugins>
</build>