maven-surefire git commit: Fix M2Eclipse error and consistency.
Repository: maven-surefire
Updated Branches:
refs/heads/master d60225741 -> ef06e4194
Fix M2Eclipse error and consistency.
Since the whole target/generated-sources was added to the classpath, m2e
considered the package declaration of the HelpMojo (generated inside
target/generated-sources/plugin) to be incorrect -- the fix is to unpack
the logging classes of maven-shared-utils into a dedicated folder.
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/ef06e419
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/ef06e419
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/ef06e419
Branch: refs/heads/master
Commit: ef06e41943b5402a2fb640f993b4a20626196627
Parents: d602257
Author: Tunaki
Authored: Thu Sep 22 00:43:19 2016 +0200
Committer: Tunaki
Committed: Thu Sep 22 00:43:19 2016 +0200
--
maven-surefire-report-plugin/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/ef06e419/maven-surefire-report-plugin/pom.xml
--
diff --git a/maven-surefire-report-plugin/pom.xml
b/maven-surefire-report-plugin/pom.xml
index e911c6e..81e0214 100644
--- a/maven-surefire-report-plugin/pom.xml
+++ b/maven-surefire-report-plugin/pom.xml
@@ -146,7 +146,7 @@
-${project.build.directory}/generated-sources
+
${project.build.directory}/generated-sources/dependency
@@ -162,7 +162,7 @@
unpack
-
${project.build.directory}/generated-sources
+
${project.build.directory}/generated-sources/dependency
false
org.apache.maven.shared:maven-shared-utils:3.1.0:jar:sources
org/apache/maven/shared/utils/logging/*.java
svn commit: r1761802 - /maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java
Author: khmarbaise
Date: Wed Sep 21 19:37:48 2016
New Revision: 1761802
URL: http://svn.apache.org/viewvc?rev=1761802&view=rev
Log:
Followed renaming methods in InstallProject interface.
Modified:
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java
Modified:
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java?rev=1761802&r1=1761801&r2=1761802&view=diff
==
---
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java
(original)
+++
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java
Wed Sep 21 19:37:48 2016
@@ -138,7 +138,7 @@ public class InstallMojo
{
try
{
-installer.installProject( session.getProjectBuildingRequest(), pir,
+installer.install( session.getProjectBuildingRequest(), pir,
localRepository );
}
catch ( IOException e )
svn commit: r1761801 - /maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java
Author: khmarbaise
Date: Wed Sep 21 19:37:25 2016
New Revision: 1761801
URL: http://svn.apache.org/viewvc?rev=1761801&view=rev
Log:
Followed renaming methods in DeployProject interface.
Modified:
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java
Modified:
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java?rev=1761801&r1=1761800&r2=1761801&view=diff
==
---
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java
(original)
+++
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java
Wed Sep 21 19:37:25 2016
@@ -195,7 +195,7 @@ public class DeployMojo
{
try
{
-projectDeployer.deployProject( pbr, pir, repo );
+projectDeployer.deploy( pbr, pir, repo );
}
catch ( IOException e )
{
svn commit: r1761800 - in /maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project: deploy/ deploy/internal/ install/ install/internal/
Author: khmarbaise
Date: Wed Sep 21 19:36:48 2016
New Revision: 1761800
URL: http://svn.apache.org/viewvc?rev=1761800&view=rev
Log:
Consistently renamed methods in interfaces
ProjectDeployer from deployProject() into deploy().
ProjectInstaller from installProject() into install().
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/deploy/ProjectDeployer.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/deploy/internal/DefaultProjectDeployer.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/ProjectInstaller.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/internal/DualDigester.java
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/deploy/ProjectDeployer.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/deploy/ProjectDeployer.java?rev=1761800&r1=1761799&r2=1761800&view=diff
==
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/deploy/ProjectDeployer.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/deploy/ProjectDeployer.java
Wed Sep 21 19:36:48 2016
@@ -56,19 +56,20 @@ public interface ProjectDeployer
* appropriate remote repository.
*
*
- * ..
+ * @Parameter( defaultValue = "${session}", required=true, readonly =
true)
* MavenSession session;
+ * @Parameter( defaultValue = "${project}", required=true, readonly =
true)
* MavenProject project;
* ..
- * @Inject
+ * @Component
* ProjectDeployer deployer;
*
- * ProjectBuildingRequest pbr =
- *new ProjectBuildingRequest()
- *.setProject (project)
- *.setUpdateReleaseInfo( true );
- *
- * deployer.deploy (session.getProjectBuildingRequest(), pbr,
artifactRepository);
+ * ProjectDeployerRequest pdr =
+ * new ProjectDeployerRequest()
+ *.setProject (project)
+ *.setUpdateReleaseInfo( true );
+ *
+ * deployer.deploy (session.getProjectBuildingRequest(), pdr,
artifactRepository);
*
*
* @param buildingRequest {@link ProjectBuildingRequest}
@@ -77,7 +78,7 @@ public interface ProjectDeployer
* @throws IOException In case of problems related to checksums.
* @throws NoFileAssignedException In case of missing file which has not
been assigned to project.
*/
-void deployProject( ProjectBuildingRequest buildingRequest,
ProjectDeployerRequest request,
+void deploy( ProjectBuildingRequest buildingRequest,
ProjectDeployerRequest request,
ArtifactRepository artifactRepository )
throws IOException, NoFileAssignedException;
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/deploy/internal/DefaultProjectDeployer.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/deploy/internal/DefaultProjectDeployer.java?rev=1761800&r1=1761799&r2=1761800&view=diff
==
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/deploy/internal/DefaultProjectDeployer.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/deploy/internal/DefaultProjectDeployer.java
Wed Sep 21 19:36:48 2016
@@ -42,8 +42,9 @@ import org.slf4j.LoggerFactory;
/**
* This will deploy a whole project into the appropriate remote repository.
*
- * @author Karl Heinz Marbaise mailto:khmarba...@apache.org";>khmarba...@apache.org Most of the code
is
- * taken from maven-dependency-plugin.
+ * @author Karl Heinz Marbaise mailto:khmarba...@apache.org";>khmarba...@apache.org
+ *
+ * Most of the code is taken from maven-deploy-plugin.
*/
@Component( role = ProjectDeployer.class )
public class DefaultProjectDeployer
@@ -61,13 +62,12 @@ public class DefaultProjectDeployer
* @param request {@link ProjectDeployerRequest}
* @param artifactRepository {@link ArtifactRepository}
* @throws IllegalArgumentException in case of artifact is not correctly
assigned.
- * @throws NoFileAssignedException
+ * @throws NoFileAssignedException
*/
-public void deployProject( ProjectBuildingRequest buildingRequest,
ProjectDeployerRequest request,
- ArtifactRepos
svn commit: r1761797 - /maven/plugins/trunk/maven-dependency-plugin/pom.xml
Author: khmarbaise Date: Wed Sep 21 19:13:46 2016 New Revision: 1761797 URL: http://svn.apache.org/viewvc?rev=1761797&view=rev Log: [MDEP-539] Upgrade maven-shared-components parent to version 30 Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=1761797&r1=1761796&r2=1761797&view=diff == --- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Wed Sep 21 19:13:46 2016 @@ -25,7 +25,7 @@ under the License. maven-plugins org.apache.maven.plugins -28 +30 ../../pom/maven/maven-plugins/pom.xml
