mirror of
https://github.com/nasa/openmct.git
synced 2025-06-06 17:31:40 +00:00
Merge remote-tracking branch 'upstream/master' into mobile
This commit is contained in:
commit
678d11832c
6
.gitignore
vendored
6
.gitignore
vendored
@ -3,9 +3,13 @@
|
|||||||
*.gzip
|
*.gzip
|
||||||
*.tgz
|
*.tgz
|
||||||
*.DS_Store
|
*.DS_Store
|
||||||
*.idea
|
|
||||||
*.sass-cache
|
*.sass-cache
|
||||||
|
|
||||||
|
# Intellij project configuration files
|
||||||
|
*.idea
|
||||||
|
*.iml
|
||||||
|
|
||||||
# External dependencies
|
# External dependencies
|
||||||
|
|
||||||
# Build output
|
# Build output
|
||||||
|
11
pom.xml
11
pom.xml
@ -176,6 +176,17 @@
|
|||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
|
<!-- To start this WAR in an embedded Tomcat Servlet Container -->
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.tomcat.maven</groupId>
|
||||||
|
<artifactId>tomcat7-maven-plugin</artifactId>
|
||||||
|
<version>2.2</version>
|
||||||
|
<configuration>
|
||||||
|
<httpPort>8080</httpPort>
|
||||||
|
<path>/mct</path>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user