Merge tag '1.5.0'

Release 1.5.0

.travis.yml

@@ -1,8 +1,9 @@
 language: java
 jdk:
   - oraclejdk8
-  - openjdk7
+  - oraclejdk11
   - openjdk8
+  - openjdk11
 
 stages:
   - test
@@ -14,6 +15,10 @@ stages:
 before_install:
   - if [ ! -z "$GPG_SECRET_KEYS" ]; then echo $GPG_SECRET_KEYS | base64 --decode | $GPG_EXECUTABLE --import; fi
   - if [ ! -z "$GPG_OWNERTRUST" ]; then echo $GPG_OWNERTRUST | base64 --decode | $GPG_EXECUTABLE --import-ownertrust; fi
+  - wget https://www-eu.apache.org/dist/maven/maven-3/3.6.0/binaries/apache-maven-3.6.0-bin.zip
+  - unzip -qq apache-maven-3.6.0-bin.zip
+  - export M2_HOME=$PWD/apache-maven-3.6.0
+  - export PATH=$M2_HOME/bin:$PATH
 
 install:
   - mvn --settings .travis/settings.xml install -Dgpg.skip -Dmaven.javadoc.skip=true -B -V

BUILD.md

@@ -2,7 +2,9 @@ Branches
 ========
 
 `master` = "Release" branch, contains always version that's release to Maven Central
+
 `develop` = Developent time branch. All PRs should be targetted (and usually also started) from here. 
+
 `gh-pages` = Github internal branch containing
 
 Building
@@ -32,11 +34,11 @@ Releasing
 
 osx:
 ```bash
-grep -rl 'sion>1.4.9</ver' ./ | xargs sed -i '' 's|sion>1.4.9</ver|sion>1.5</ver|g'
+grep -rl 'sion>1.5.0</ver' ./ | xargs sed -i '' 's|sion>1.5.0</ver|sion>1.6</ver|g'
 ```
 linux:
 ```bash
-grep -rl 'sion>1.4.9</ver' ./ | xargs sed -i 's|sion>1.4.9</ver|sion>1.5</ver|g'
+grep -rl 'sion>1.5.0</ver' ./ | xargs sed -i 's|sion>1.5.0</ver|sion>1.6</ver|g'
 ```
 Last you should update those rows above.
 
@@ -58,8 +60,8 @@ mvn site:site
 * Commit to git
 
 ```bash
-git commit -am "version 1.5"
-git tag 1.5
+git commit -am "version 1.6"
+git tag -a 1.6 
 git push
 git push --tags
 ```

README.md

@@ -37,7 +37,7 @@ Add the plugin to your build:
       <plugin>
         <groupId>org.robotframework</groupId>
         <artifactId>robotframework-maven-plugin</artifactId>
-        <version>1.4.9</version>
+        <version>1.5.0</version>
         <executions>
           <execution>
             <goals>
@@ -62,3 +62,5 @@ Third party libraries (e.g. Selenium Library) can be added to ${project.basedir}
 During mvn install invocation, run command will be invoked during the integration-test phase.
 
 For more detailed documentation please see http://robotframework.github.com/MavenPlugin/
+
+*NOTE*: If needing plugin with Java 1.7, latest version supporting that is 1.4.9

pom.xml

@@ -7,7 +7,7 @@
 	<groupId>org.robotframework</groupId>
 	<artifactId>robotframework-maven-plugin</artifactId>
 	<packaging>maven-plugin</packaging>
-	<version>1.4.9</version>
+	<version>1.5.0</version>
 	<name>Robot Framework Maven Plugin</name>
 	<description>
         Maven plugin for the Robot Framework.
@@ -63,14 +63,14 @@
 		<url>https://travis-ci.org/robotframework/MavenPlugin</url>
 	</ciManagement>
 	<profiles>
-		<!-- 2 first profiles needed for tests to have tools.jar in classpath -->
 		<profile>
 			<id>default</id>
 			<activation>
 				<property>
 					<name>java.vendor</name>
 					<value>!Apple Inc.</value>
 				</property>
+				<jdk>[,1.9)</jdk>
 			</activation>
 			<dependencies>
 				<dependency>
@@ -90,6 +90,7 @@
 					<name>java.vendor</name>
 					<value>Apple Inc.</value>
 				</property>
+				<jdk>[,1.9)</jdk>
 			</activation>
 			<dependencies>
 				<dependency>
@@ -195,7 +196,7 @@
 		<dependency>
 			<groupId>org.apache.maven</groupId>
 			<artifactId>maven-plugin-api</artifactId>
-			<version>2.2.1</version>
+			<version>3.5.3</version>
 		</dependency>
 
 		<dependency>
@@ -212,8 +213,8 @@
 
 		<dependency>
 			<groupId>junit</groupId>
-			<artifactId>junit-dep</artifactId>
-			<version>4.10</version>
+			<artifactId>junit</artifactId>
+			<version>4.11</version>
 			<scope>test</scope>
 			<exclusions>
 				<exclusion>
@@ -233,14 +234,14 @@
 		<dependency>
 			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>2.3.2</version>
+			<version>2.4.1</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
-			<version>1.10.8</version>
+			<version>2.19.0</version>
 			<scope>test</scope>
 			<exclusions>
 				<exclusion>
@@ -252,23 +253,58 @@
 		<dependency>
 			<groupId>org.powermock</groupId>
 			<artifactId>powermock-module-junit4</artifactId>
-			<version>1.5.6</version>
+			<version>2.0.0-beta.5</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.powermock</groupId>
-			<artifactId>powermock-api-mockito</artifactId>
-			<version>1.5.6</version>
+			<artifactId>powermock-api-mockito2</artifactId>
+			<version>2.0.0-beta.5</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.maven.plugin-testing</groupId>
 			<artifactId>maven-plugin-testing-harness</artifactId>
-			<version>1.3</version>
+			<version>3.3.0</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-compat</artifactId>
+			<version>3.5.3</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-core</artifactId>
+			<version>3.5.3</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-model</artifactId>
+			<version>3.5.3</version>
 			<scope>test</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-aether-provider</artifactId>
+			<version>3.3.9</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.maven.plugin-tools</groupId>
+			<artifactId>maven-plugin-annotations</artifactId>
+			<version>3.5.2</version>
+			<scope>provided</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>org.apache.maven.shared</groupId>
 			<artifactId>maven-verifier</artifactId>
@@ -284,25 +320,30 @@
 	</properties>
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>3.1.0</version>
+			</plugin>
 			<plugin>
 				<inherited>true</inherited>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.2</version>
+				<version>3.7.0</version>
 				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 			</plugin>
 			<plugin>
-				<!-- integration tests can be skipped using -DskipITs, or -Darguments="-DskipITs" 
+				<!-- integration tests can be skipped using -DskipITs, or -Darguments="-DskipITs"
 					in a release build, note that you need -D twice in the latter case -->
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-failsafe-plugin</artifactId>
-				<version>2.17</version>
+				<version>2.21.0</version>
 				<configuration>
 					<environmentVariables>
-						<MavenLibrary.version>${project.version}</MavenLibrary.version>
+						<MAVEN_LIBRARY_VERSION>${project.version}</MAVEN_LIBRARY_VERSION>
 					</environmentVariables>
 				</configuration>
 				<executions>
@@ -363,14 +404,19 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-plugin-plugin</artifactId>
+				<version>3.5.2</version>
+			</plugin>
 		</plugins>
 	</build>
 	<reporting>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-plugin-plugin</artifactId>
-				<version>3.3</version>
+				<version>3.5.2</version>
 			</plugin>
 		</plugins>
 	</reporting>

src/main/java/org/robotframework/mavenplugin/AbstractMojoWithLoadedClasspath.java

@@ -34,14 +34,14 @@ public abstract class AbstractMojoWithLoadedClasspath
     private static String ROBOT_ARTIFACT = join(File.separator, "org", "robotframework", "robotframework");
 
     /**
-     * @parameter expression="${project.testClasspathElements}"
+     * @parameter property="project.testClasspathElements"
      * @required
      * @readonly
      */
     private List<String> classpathElements;
 
     /**
-     * @parameter expression="${settings.localRepository}"
+     * @parameter property="settings.localRepository"
      * @required
      * @readonly
      */