Skip to content

Commit

Permalink
Merge 9e3afa7 into 88e4387
Browse files Browse the repository at this point in the history
  • Loading branch information
@klieber
klieber committed Sep 13, 2016
2 parents 88e4387 + 9e3afa7 commit 8f5f61c
Showing 1 changed file with 31 additions and 33 deletions.
64 changes: 31 additions & 33 deletions pom.xml
View file
Expand Up @@ -132,18 +132,21 @@
<url>https://travis-ci.org/searls/jasmine-maven-plugin</url>
</ciManagement>
<properties>
<powermock.version>1.6.4</powermock.version>
<jetty.version>8.1.18.v20150929</jetty.version>
<selenium.version>2.48.2</selenium.version>
<powermock.version>1.6.5</powermock.version>
<jetty.version>8.2.0.v20160908</jetty.version>
<selenium.version>2.53.1</selenium.version>
<jasmine.version>2.4.1</jasmine.version>
<htmlunit.version>2.18</htmlunit.version>
<htmlunit.version>2.19</htmlunit.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.6</java.version>
<maven.compiler.target>${java.version}</maven.compiler.target>
<maven.compiler.source>${java.version}</maven.compiler.source>
</properties>

<prerequisites>
<maven>3.1.0</maven>
</prerequisites>
<prerequisites>
<maven>3.1.0</maven>
</prerequisites>

<dependencies>
<!-- Mojo Dependencies -->
Expand Down Expand Up @@ -308,7 +311,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.1</version>
<version>2.5.3</version>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<useReleaseProfile>false</useReleaseProfile>
Expand All @@ -319,7 +322,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.7</version>
<version>3.0.1</version>
<configuration>
<useDefaultDelimiters>false</useDefaultDelimiters>
<delimiters>
Expand All @@ -330,7 +333,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.4</version>
<version>3.5.1</version>
<configuration>
<skipDeploy>true</skipDeploy>
<attributes>
Expand All @@ -342,14 +345,14 @@
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-markdown</artifactId>
<version>1.6</version>
<version>1.7</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>2.6.1</version>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -369,25 +372,25 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.5</version>
<version>3.0.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.4</version>
<version>3.0.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.1</version>
<version>2.10.4</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.4</version>
<version>3.5</version>
<configuration>
<goalPrefix>jasmine</goalPrefix>
<!-- see http://jira.codehaus.org/browse/MNG-5346 -->
Expand All @@ -411,16 +414,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
<version>3.5.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.18.1</version>
<version>2.19.1</version>
<configuration>
<excludes>
<exclude>**/*IntegrationTest.java</exclude>
Expand All @@ -430,7 +429,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.18.1</version>
<version>2.19.1</version>
<executions>
<execution>
<id>integration-test</id>
Expand All @@ -454,7 +453,6 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.4.201502262128</version>
<executions>
<execution>
<goals>
Expand All @@ -466,20 +464,20 @@
<excludes>
<exclude>com/github/searls/jasmine/mojo/HelpMojo*</exclude>
<!-- prevent 'Method code too large' exception -->
<!-- see http://goo.gl/5THrnt -->
<!-- see http://goo.gl/5THrnt -->
<exclude>**com.steadystate*</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>3.0.1</version>
<version>4.2.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.9.1</version>
<version>1.12</version>
<executions>
<execution>
<phase>pre-site</phase>
Expand Down Expand Up @@ -510,7 +508,7 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.5</version>
<version>1.6.7</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
Expand Down Expand Up @@ -540,7 +538,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.8</version>
<version>2.9</version>
<reportSets>
<reportSet>
<reports>
Expand All @@ -561,7 +559,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
<version>2.11</version>
<version>2.12</version>
<configuration>
<columnNames>Id,Summary,Reporter,Assignee,Status,Type,Created,Fix Version</columnNames>
</configuration>
Expand All @@ -581,17 +579,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>2.18.1</version>
<version>2.19.1</version>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.4.201502262128</version>
<version>0.7.7.201606060606</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.4</version>
<version>3.6</version>
<configuration>
<rulesets>
<ruleset>/rulesets/java/basic.xml</ruleset>
Expand Down

0 comments on commit 8f5f61c

Please sign in to comment.