diff --git a/maven-plugin/src/main/java/hudson/maven/AbstractMavenBuild.java b/maven-plugin/src/main/java/hudson/maven/AbstractMavenBuild.java
index 6e70703d65..e4e4d02b99 100644
--- a/maven-plugin/src/main/java/hudson/maven/AbstractMavenBuild.java
+++ b/maven-plugin/src/main/java/hudson/maven/AbstractMavenBuild.java
@@ -125,12 +125,11 @@ public abstract class AbstractMavenBuild,B e
if(trigger) {
listener.getLogger().println(Messages.MavenBuild_Triggering(down.getName()));
- down.scheduleBuild(new UpstreamCause(this));
+ down.scheduleBuild(new UpstreamCause((Run,?>)this));
}
}
}
-
private boolean inDownstreamProjects(AbstractProject downstreamProject) {
DependencyGraph graph = Hudson.getInstance().getDependencyGraph();
Set tups = graph.getTransitiveUpstream(downstreamProject);
diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModule.java b/maven-plugin/src/main/java/hudson/maven/MavenModule.java
index 57b524c245..c0254265a7 100644
--- a/maven-plugin/src/main/java/hudson/maven/MavenModule.java
+++ b/maven-plugin/src/main/java/hudson/maven/MavenModule.java
@@ -348,6 +348,8 @@ public final class MavenModule extends AbstractMavenProject
* That is, {@Link MavenModuleSet} builds are incompatible with any {@link MavenModule}
* builds, whereas {@link MavenModule} builds are compatible with each other.
+ *
+ * @deprecated as of 1.319 in {@link AbstractProject}.
*/
@Override
public Resource getWorkspaceResource() {
diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
index 8c5436421a..3cb301684d 100644
--- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
+++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
@@ -687,12 +687,12 @@ public final class MavenModuleSet extends AbstractMavenProject)MavenModuleSetBuild.this));
} else {
// do builds here
try {
@@ -465,7 +466,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException {
MavenArtifactRecord mar = build.getAction(MavenArtifactRecord.class);
if(mar==null) {
@@ -67,14 +67,14 @@ public class MavenRedeployer extends Publisher {
return BuildStepMonitor.NONE;
}
- public BuildStepDescriptor getDescriptor() {
+ public BuildStepDescriptor getDescriptor() {
return DESCRIPTOR;
}
public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl();
- public static final class DescriptorImpl extends BuildStepDescriptor {
- public boolean isApplicable(Class extends AbstractProject> jobType) {
+ public static final class DescriptorImpl extends BuildStepDescriptor {
+ public boolean isApplicable(Class jobType) {
return AbstractMavenProject.class.isAssignableFrom(jobType);
}
@@ -82,4 +82,4 @@ public class MavenRedeployer extends Publisher {
return Messages.MavenRedeployer_DisplayName();
}
}
-}
+}
\ No newline at end of file