[maven-bundle-plugin] 01/02: Backported the fix for FELIX-4882 (Correctly use plugin annotations)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Dec 14 10:31:22 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository maven-bundle-plugin.
commit 8d7dcbe58c9824c3bd1766f7f439045e94ec64e1
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Dec 14 11:19:30 2015 +0100
Backported the fix for FELIX-4882 (Correctly use plugin annotations)
---
debian/changelog | 7 ++
debian/patches/FELIX-4882.patch | 147 ++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 155 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 0940383..80b7daf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+maven-bundle-plugin (2.5.4-3) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Backported the fix for FELIX-4882 (Correctly use plugin annotations)
+
+ -- Emmanuel Bourg <ebourg at apache.org> Mon, 14 Dec 2015 11:02:04 +0100
+
maven-bundle-plugin (2.5.4-2) unstable; urgency=medium
* Team upload.
diff --git a/debian/patches/FELIX-4882.patch b/debian/patches/FELIX-4882.patch
new file mode 100644
index 0000000..417b911
--- /dev/null
+++ b/debian/patches/FELIX-4882.patch
@@ -0,0 +1,147 @@
+Description: Backport of FELIX-4882: Correctly use Maven Plugin Tools Java 5 annotations instead of javadoc tags
+Origin: backport, https://svn.apache.org/r1678868
+Bug: https://issues.apache.org/jira/browse/FELIX-4882
+--- a/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java
++++ b/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java
+@@ -69,8 +69,7 @@
+ * @deprecated The bundleall goal is no longer supported and may be removed in a future release
+ */
+ @Deprecated
+- at Mojo( name = "bundleall", requiresDependencyResolution = ResolutionScope.TEST )
+- at Execute( phase = LifecyclePhase.PACKAGE )
++ at Mojo( name = "bundleall", requiresDependencyResolution = ResolutionScope.TEST, defaultPhase = LifecyclePhase.PACKAGE )
+ public class BundleAllPlugin extends ManifestPlugin
+ {
+ private static final String LS = System.getProperty( "line.separator" );
+--- a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
++++ b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
+@@ -90,8 +90,7 @@
+ * Create an OSGi bundle from Maven project
+ *
+ */
+- at Mojo( name = "bundle", requiresDependencyResolution = ResolutionScope.TEST, threadSafe = true )
+- at Execute( phase = LifecyclePhase.PACKAGE )
++ at Mojo( name = "bundle", requiresDependencyResolution = ResolutionScope.TEST, threadSafe = true, defaultPhase = LifecyclePhase.PACKAGE )
+ public class BundlePlugin extends AbstractMojo
+ {
+ /**
+--- a/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
++++ b/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
+@@ -49,8 +49,7 @@
+ /**
+ * Generate an OSGi manifest for this project
+ */
+- at Mojo( name = "manifest", requiresDependencyResolution = ResolutionScope.TEST, threadSafe = true )
+- at Execute( phase = LifecyclePhase.PROCESS_CLASSES )
++ at Mojo( name = "manifest", requiresDependencyResolution = ResolutionScope.TEST, threadSafe = true, defaultPhase = LifecyclePhase.PROCESS_CLASSES)
+ public class ManifestPlugin extends BundlePlugin
+ {
+ /**
+--- a/src/main/java/org/apache/felix/bundleplugin/WrapPlugin.java
++++ b/src/main/java/org/apache/felix/bundleplugin/WrapPlugin.java
+@@ -31,8 +31,7 @@
+ * @deprecated The wrap goal is no longer supported and may be removed in a future release
+ */
+ @Deprecated
+- at Mojo( name = "wrap", requiresDependencyResolution = ResolutionScope.TEST )
+- at Execute( phase = LifecyclePhase.PACKAGE )
++ at Mojo( name = "wrap", requiresDependencyResolution = ResolutionScope.TEST, defaultPhase = LifecyclePhase.PACKAGE)
+ public final class WrapPlugin extends BundleAllPlugin
+ {
+ public void execute() throws MojoExecutionException
+--- a/src/main/java/org/apache/felix/bundleplugin/baseline/BaselinePlugin.java
++++ b/src/main/java/org/apache/felix/bundleplugin/baseline/BaselinePlugin.java
+@@ -38,8 +38,7 @@
+ * BND Baseline check between two bundles.
+ * @since 2.4.1
+ */
+- at Mojo( name = "baseline", threadSafe = true, requiresDependencyResolution = ResolutionScope.TEST )
+- at Execute( phase = LifecyclePhase.VERIFY )
++ at Mojo( name = "baseline", threadSafe = true, requiresDependencyResolution = ResolutionScope.TEST, defaultPhase = LifecyclePhase.VERIFY)
+ public final class BaselinePlugin
+ extends AbstractBaselinePlugin
+ {
+--- a/src/main/java/org/apache/felix/bundleplugin/baseline/BaselineReport.java
++++ b/src/main/java/org/apache/felix/bundleplugin/baseline/BaselineReport.java
+@@ -43,8 +43,7 @@
+ *
+ * @since 2.4.1
+ */
+- at Mojo( name = "baseline-report", threadSafe = true )
+- at Execute( phase = LifecyclePhase.SITE )
++ at Mojo( name = "baseline-report", threadSafe = true, defaultPhase = LifecyclePhase.SITE)
+ public final class BaselineReport
+ extends AbstractBaselinePlugin
+ implements MavenReport
+--- a/src/main/java/org/apache/felix/obrplugin/ObrCleanRepo.java
++++ b/src/main/java/org/apache/felix/obrplugin/ObrCleanRepo.java
+@@ -60,8 +60,7 @@
+ *
+ * @author <a href="mailto:dev at felix.apache.org">Felix Project Team</a>
+ */
+- at Mojo( name = "clean", requiresProject = false )
+- at Execute( phase = LifecyclePhase.CLEAN )
++ at Mojo( name = "clean", requiresProject = false, defaultPhase = LifecyclePhase.CLEAN )
+ public class ObrCleanRepo extends AbstractMojo
+ {
+ /**
+--- a/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java
++++ b/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java
+@@ -48,8 +48,7 @@
+ *
+ * @author <a href="mailto:dev at felix.apache.org">Felix Project Team</a>
+ */
+- at Mojo( name = "deploy", threadSafe = true )
+- at Execute( phase = LifecyclePhase.DEPLOY )
++ at Mojo( name = "deploy", threadSafe = true, defaultPhase = LifecyclePhase.DEPLOY )
+ public final class ObrDeploy extends AbstractMojo
+ {
+ /**
+--- a/src/main/java/org/apache/felix/obrplugin/ObrDeployFile.java
++++ b/src/main/java/org/apache/felix/obrplugin/ObrDeployFile.java
+@@ -42,8 +42,7 @@
+ *
+ * @author <a href="mailto:dev at felix.apache.org">Felix Project Team</a>
+ */
+- at Mojo( name = "deploy-file", requiresProject = false )
+- at Execute( phase = LifecyclePhase.DEPLOY )
++ at Mojo( name = "deploy-file", requiresProject = false, defaultPhase = LifecyclePhase.DEPLOY )
+ public final class ObrDeployFile extends AbstractFileMojo
+ {
+ /**
+--- a/src/main/java/org/apache/felix/obrplugin/ObrInstall.java
++++ b/src/main/java/org/apache/felix/obrplugin/ObrInstall.java
+@@ -41,8 +41,7 @@
+ *
+ * @author <a href="mailto:dev at felix.apache.org">Felix Project Team</a>
+ */
+- at Mojo( name = "install", threadSafe = true )
+- at Execute( phase = LifecyclePhase.INSTALL )
++ at Mojo( name = "install", threadSafe = true, defaultPhase = LifecyclePhase.INSTALL )
+ public final class ObrInstall extends AbstractMojo
+ {
+ /**
+--- a/src/main/java/org/apache/felix/obrplugin/ObrInstallFile.java
++++ b/src/main/java/org/apache/felix/obrplugin/ObrInstallFile.java
+@@ -38,8 +38,7 @@
+ *
+ * @author <a href="mailto:dev at felix.apache.org">Felix Project Team</a>
+ */
+- at Mojo( name = "install-file", requiresProject = false )
+- at Execute( phase = LifecyclePhase.INSTALL )
++ at Mojo( name = "install-file", requiresProject = false, defaultPhase = LifecyclePhase.INSTALL )
+ public final class ObrInstallFile extends AbstractFileMojo
+ {
+ /**
+--- a/src/main/java/org/apache/felix/obrplugin/ObrRemoteClean.java
++++ b/src/main/java/org/apache/felix/obrplugin/ObrRemoteClean.java
+@@ -73,8 +73,7 @@
+ *
+ * @author <a href="mailto:dev at felix.apache.org">Felix Project Team</a>
+ */
+- at Mojo( name = "remote-clean", requiresProject = false )
+- at Execute( phase = LifecyclePhase.CLEAN )
++ at Mojo( name = "remote-clean", requiresProject = false, defaultPhase = LifecyclePhase.CLEAN )
+ public final class ObrRemoteClean extends AbstractMojo
+ {
+ /**
diff --git a/debian/patches/series b/debian/patches/series
index d56fe56..4924a42 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ remove_bndlib_spring_support.diff
support_plexus_utils_1_5.diff
backward-compatibility.patch
use-changelog-date-as-pom.properties-timestamp.patch
+FELIX-4882.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-bundle-plugin.git
More information about the pkg-java-commits
mailing list