Merge pull request #129 from dougmorato/master
Maven-tomcat plugin fix and correct typo on JS file
This commit is contained in:
commit
44d944bceb
@ -30,7 +30,8 @@ deploy:
|
|||||||
branch: master
|
branch: master
|
||||||
jdk: oraclejdk8
|
jdk: oraclejdk8
|
||||||
after_success:
|
after_success:
|
||||||
- mvn clean cobertura:cobertura org.eluder.coveralls:coveralls-maven-plugin:report
|
- mvn versioneye:update
|
||||||
|
- mvn clean cobertura:cobertura coveralls:report
|
||||||
notifications:
|
notifications:
|
||||||
slack:
|
slack:
|
||||||
secure: S9VFew5NSE8WDzYD1VDBUULKKT0fzgblQACznwQ85699b2yeX9TX58N3RZvRS1JVagVP1wu2xOrwN2g+AWx4Ro3UBZD5XG86uTJWpCLD4cRWHBoGMH2TfvI7/IzsWmgxH4MBxFRvZr/eEhlVAux+N9H4EoEdS4CKsJXEqV37PlA=
|
secure: S9VFew5NSE8WDzYD1VDBUULKKT0fzgblQACznwQ85699b2yeX9TX58N3RZvRS1JVagVP1wu2xOrwN2g+AWx4Ro3UBZD5XG86uTJWpCLD4cRWHBoGMH2TfvI7/IzsWmgxH4MBxFRvZr/eEhlVAux+N9H4EoEdS4CKsJXEqV37PlA=
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
[](https://scan.coverity.com/projects/webgoat-webgoat)
|
[](https://scan.coverity.com/projects/webgoat-webgoat)
|
||||||
[](https://coveralls.io/github/WebGoat/WebGoat?branch=master)
|
[](https://coveralls.io/github/WebGoat/WebGoat?branch=master)
|
||||||
[](https://www.codacy.com/app/dm/WebGoat)
|
[](https://www.codacy.com/app/dm/WebGoat)
|
||||||
|
[](https://www.versioneye.com/user/projects/562da95ae346d7000e0369aa)
|
||||||
|
|
||||||
# Important Information
|
# Important Information
|
||||||
|
|
||||||
|
27
pom.xml
27
pom.xml
@ -156,9 +156,10 @@
|
|||||||
<spring.security.version>3.2.4.RELEASE</spring.security.version>
|
<spring.security.version>3.2.4.RELEASE</spring.security.version>
|
||||||
<standard.version>1.1.2</standard.version>
|
<standard.version>1.1.2</standard.version>
|
||||||
<tiles.version>2.2.2</tiles.version>
|
<tiles.version>2.2.2</tiles.version>
|
||||||
<tomcat7-maven-plugin.version>2.2</tomcat7-maven-plugin.version>
|
<tomcat7-maven-plugin.version>2.3-SNAPSHOT</tomcat7-maven-plugin.version>
|
||||||
<wsdl4j.version>1.5.1</wsdl4j.version>
|
<wsdl4j.version>1.5.1</wsdl4j.version>
|
||||||
<tomcat-catalina.version>7.0.63</tomcat-catalina.version>
|
<tomcat-catalina.version>7.0.63</tomcat-catalina.version>
|
||||||
|
<versioneye-maven-plugin.version>3.5.1</versioneye-maven-plugin.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
@ -172,6 +173,21 @@
|
|||||||
</snapshotRepository>
|
</snapshotRepository>
|
||||||
</distributionManagement>
|
</distributionManagement>
|
||||||
|
|
||||||
|
<pluginRepositories>
|
||||||
|
<pluginRepository>
|
||||||
|
<id>apache.snapshots</id>
|
||||||
|
<url>http://repository.apache.org/snapshots/</url>
|
||||||
|
<!-- The releases element here is due to an issue in Maven 2.0 that will be
|
||||||
|
fixed in future releases. This should be able to be disabled altogether. -->
|
||||||
|
<releases>
|
||||||
|
<updatePolicy>daily</updatePolicy>
|
||||||
|
</releases>
|
||||||
|
<snapshots>
|
||||||
|
<updatePolicy>daily</updatePolicy>
|
||||||
|
</snapshots>
|
||||||
|
</pluginRepository>
|
||||||
|
</pluginRepositories>
|
||||||
|
|
||||||
<profiles>
|
<profiles>
|
||||||
<profile>
|
<profile>
|
||||||
<id>release</id>
|
<id>release</id>
|
||||||
@ -267,6 +283,15 @@
|
|||||||
<aggregate>true</aggregate>
|
<aggregate>true</aggregate>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>com.versioneye</groupId>
|
||||||
|
<artifactId>versioneye-maven-plugin</artifactId>
|
||||||
|
<version>${versioneye-maven-plugin.version}</version>
|
||||||
|
<configuration>
|
||||||
|
<apiKey>a1e4a9da4ed34ee44cab</apiKey>
|
||||||
|
<projectId>562da95be346d7000e0369ac</projectId>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
|
@ -173,7 +173,7 @@
|
|||||||
<version>${tomcat7-maven-plugin.version}</version>
|
<version>${tomcat7-maven-plugin.version}</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<server>local_tomcat</server>
|
<server>local_tomcat</server>
|
||||||
<url>http://localhost:8080/manager</url>
|
<url>http://localhost:8080/manager/text</url>
|
||||||
<path>/WebGoat</path>
|
<path>/WebGoat</path>
|
||||||
<attachArtifactClassifier>exec</attachArtifactClassifier>
|
<attachArtifactClassifier>exec</attachArtifactClassifier>
|
||||||
<contextReloadable>true</contextReloadable>
|
<contextReloadable>true</contextReloadable>
|
||||||
|
@ -17,4 +17,4 @@ define(['jquery',
|
|||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
});6
|
});
|
Loading…
x
Reference in New Issue
Block a user