Skip to content

Commit

Permalink
upgrading plugin versions
Browse files Browse the repository at this point in the history
  • Loading branch information
klieber committed Feb 11, 2013
1 parent 0ae1cba commit 105b5e2
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>2.5.1</version>
<version>3.2</version>
<configuration>
<goalPrefix>jasmine</goalPrefix>
</configuration>
Expand All @@ -178,7 +178,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<version>3.0</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
Expand All @@ -187,7 +187,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.1.2</version>
<version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -202,7 +202,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.8</version>
<version>2.13</version>
<configuration>
<excludes>
<exclude>**/*IntegrationTest.java</exclude>
Expand All @@ -212,7 +212,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.8</version>
<version>2.13</version>
<executions>
<execution>
<id>integration-test</id>
Expand Down
22 changes: 11 additions & 11 deletions src/main/java/com/github/searls/jasmine/AbstractJasmineMojo.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ public abstract class AbstractJasmineMojo extends AbstractMojo {
/** Properties in order of most-to-least interesting for client projects to override **/

/**
* @parameter default-value="${project.basedir}${file.separator}src${file.separator}main${file.separator}javascript" expression="${jsSrcDir}"
* @parameter default-value="${project.basedir}${file.separator}src${file.separator}main${file.separator}javascript" property="jsSrcDir"
*/
private File jsSrcDir;

/**
* @parameter default-value="${project.basedir}${file.separator}src${file.separator}test${file.separator}javascript" expression="${jsTestSrcDir}"
* @parameter default-value="${project.basedir}${file.separator}src${file.separator}test${file.separator}javascript" property="jsTestSrcDir"
*/
private File jsTestSrcDir;

Expand Down Expand Up @@ -60,7 +60,7 @@ public abstract class AbstractJasmineMojo extends AbstractMojo {
protected String format;

/**
* @parameter default-value="js" expression="${packageJavaScriptPath}"
* @parameter default-value="js" property="packageJavaScriptPath"
*/
protected String packageJavaScriptPath;

Expand Down Expand Up @@ -114,12 +114,12 @@ public abstract class AbstractJasmineMojo extends AbstractMojo {


/**
* @parameter expression="${skipTests}"
* @parameter property="skipTests"
*/
protected boolean skipTests;

/**
* @parameter default-value="true" expression="${haltOnFailure}"
* @parameter default-value="true" property="haltOnFailure"
*/
protected boolean haltOnFailure;

Expand Down Expand Up @@ -175,30 +175,30 @@ public abstract class AbstractJasmineMojo extends AbstractMojo {
/**
* @parameter
*/
private List<String> sourceIncludes = ScansDirectory.DEFAULT_INCLUDES;
private final List<String> sourceIncludes = ScansDirectory.DEFAULT_INCLUDES;

/**
* @parameter
*/
private List<String> sourceExcludes = Collections.emptyList();
private final List<String> sourceExcludes = Collections.emptyList();

/**
* @parameter
*/
private List<String> specIncludes = ScansDirectory.DEFAULT_INCLUDES;
private final List<String> specIncludes = ScansDirectory.DEFAULT_INCLUDES;

/**
* @parameter
*/
private List<String> specExcludes = Collections.emptyList();
private final List<String> specExcludes = Collections.emptyList();

/**
* @parameter default-value="${project}"
*/
protected MavenProject mavenProject;

/**
* @parameter default-value="8234" expression="${jasmine.serverPort}"
* @parameter default-value="8234" property="jasmine.serverPort"
*/
protected int serverPort;

Expand All @@ -209,7 +209,7 @@ public abstract class AbstractJasmineMojo extends AbstractMojo {
*
* Some valid examples: REQUIRE_JS
*
* @parameter default-value="DEFAULT" expression="${jasmine.specRunnerTemplate}"
* @parameter default-value="DEFAULT" property="jasmine.specRunnerTemplate"
*/
protected SpecRunnerTemplate specRunnerTemplate;

Expand Down

0 comments on commit 105b5e2

Please sign in to comment.