This is an automated email from the git hooks/post-receive script.
seamlik-guest pushed a commit to branch master
in repository maven-bundle-plugin.
commit b9ef1e63372e851539d506f9dbe265fcfbfd52ae
Author: 殷啟聰 | Kai-Chung Yan <seamli...@gmail.com>
Date: Tue Mar 20 16:15:28 2018 +0800
Refresh patchs and remove obsolete ones (FELIX-4882.patch,
backwards-compatibility.patch)
---
debian/patches/FELIX-4882.patch | 147 ---------------------
debian/patches/backward-compatibility.patch | 42 ------
debian/patches/maven-archiver3-869361.patch | 2 +-
debian/patches/maven3-compatibility.patch | 4 +-
debian/patches/remove_bndlib_spring_support.diff | 17 ++-
debian/patches/series | 2 -
debian/patches/support_plexus_utils_1_5.diff | 4 +-
...hangelog-date-as-pom.properties-timestamp.patch | 6 +-
8 files changed, 16 insertions(+), 208 deletions(-)
diff --git a/debian/patches/FELIX-4882.patch b/debian/patches/FELIX-4882.patch
deleted file mode 100644
index 417b911..0000000
--- a/debian/patches/FELIX-4882.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-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
--@Mojo( name = "bundleall", requiresDependencyResolution =
ResolutionScope.TEST )
--@Execute( phase = LifecyclePhase.PACKAGE )
-+@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
- *
- */
--@Mojo( name = "bundle", requiresDependencyResolution = ResolutionScope.TEST,
threadSafe = true )
--@Execute( phase = LifecyclePhase.PACKAGE )
-+@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
- */
--@Mojo( name = "manifest", requiresDependencyResolution =
ResolutionScope.TEST, threadSafe = true )
--@Execute( phase = LifecyclePhase.PROCESS_CLASSES )
-+@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
--@Mojo( name = "wrap", requiresDependencyResolution = ResolutionScope.TEST )
--@Execute( phase = LifecyclePhase.PACKAGE )
-+@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
- */
--@Mojo( name = "baseline", threadSafe = true, requiresDependencyResolution =
ResolutionScope.TEST )
--@Execute( phase = LifecyclePhase.VERIFY )
-+@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
- */
--@Mojo( name = "baseline-report", threadSafe = true )
--@Execute( phase = LifecyclePhase.SITE )
-+@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:d...@felix.apache.org";>Felix Project Team</a>
- */
--@Mojo( name = "clean", requiresProject = false )
--@Execute( phase = LifecyclePhase.CLEAN )
-+@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:d...@felix.apache.org";>Felix Project Team</a>
- */
--@Mojo( name = "deploy", threadSafe = true )
--@Execute( phase = LifecyclePhase.DEPLOY )
-+@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:d...@felix.apache.org";>Felix Project Team</a>
- */
--@Mojo( name = "deploy-file", requiresProject = false )
--@Execute( phase = LifecyclePhase.DEPLOY )
-+@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:d...@felix.apache.org";>Felix Project Team</a>
- */
--@Mojo( name = "install", threadSafe = true )
--@Execute( phase = LifecyclePhase.INSTALL )
-+@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:d...@felix.apache.org";>Felix Project Team</a>
- */
--@Mojo( name = "install-file", requiresProject = false )
--@Execute( phase = LifecyclePhase.INSTALL )
-+@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:d...@felix.apache.org";>Felix Project Team</a>
- */
--@Mojo( name = "remote-clean", requiresProject = false )
--@Execute( phase = LifecyclePhase.CLEAN )
-+@Mojo( name = "remote-clean", requiresProject = false, defaultPhase =
LifecyclePhase.CLEAN )
- public final class ObrRemoteClean extends AbstractMojo
- {
- /**
diff --git a/debian/patches/backward-compatibility.patch
b/debian/patches/backward-compatibility.patch
deleted file mode 100644
index 21f297f..0000000
--- a/debian/patches/backward-compatibility.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Description: Fixes a regression in the version 2.3.7 causing two build
- failures on javamail (#761548) and sisu-guice (#761522).
- .
- For javamail, checking out a clean copy of the upstream source,
- upgrading maven-bundle-plugin to 2.3.7 in the pom and building directly
- with Maven works fine. So the upgrade to 2.3.7 alone isn't enough to
- explain the regression, something else specific to the Debian packaging
- is involved.
- .
- The regression was caused by the fix for FELIX-3165:
- https://issues.apache.org/jira/browse/FELIX-3165
- https://svn.apache.org/r1184887
- .
- This patch reverts to the old behaviour only when the
- debian.maven-bundle-plugin.compatibility property is set to true.
-
-Author: Emmanuel Bourg <ebo...@apache.org>
-Forwarded: not-needed
-Bug-Debian: http://bugs.debian.org/761548
- http://bugs.debian.org/761522
---- a/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
-+++ b/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
-@@ -67,7 +67,18 @@
- Manifest manifest;
- try
- {
-- manifest = getManifest( project, instructions, properties,
classpath );
-+ if ( "true".equals(
System.getProperty("debian.maven-bundle-plugin.compatibility") )
-+ && supportedProjectTypes.contains(
getProject().getArtifact().getType() ) )
-+ {
-+ getLog().info("maven-bundle-plugin 2.3.5 compatibility
enabled");
-+ Builder builder = buildOSGiBundle( project, instructions,
properties, classpath );
-+ manifest = builder.getJar().getManifest();
-+ builder.close();
-+ }
-+ else
-+ {
-+ manifest = getManifest( project, instructions, properties,
classpath );
-+ }
- }
- catch ( FileNotFoundException e )
- {
diff --git a/debian/patches/maven-archiver3-869361.patch
b/debian/patches/maven-archiver3-869361.patch
index 385db44..2465bcd 100644
--- a/debian/patches/maven-archiver3-869361.patch
+++ b/debian/patches/maven-archiver3-869361.patch
@@ -4,7 +4,7 @@ Forwarded: not-needed
--- a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
+++ b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
-@@ -757,7 +757,7 @@
+@@ -1098,7 +1098,7 @@
* Grab customized manifest entries from the maven-jar-plugin
configuration
*/
MavenArchiveConfiguration archiveConfig =
JarPluginConfiguration.getArchiveConfiguration( currentProject );
diff --git a/debian/patches/maven3-compatibility.patch
b/debian/patches/maven3-compatibility.patch
index eebd3ee..647493d 100644
--- a/debian/patches/maven3-compatibility.patch
+++ b/debian/patches/maven3-compatibility.patch
@@ -3,8 +3,8 @@ Author: Emmanuel Bourg <ebo...@apache.org>
Forwarded: no
--- a/pom.xml
+++ b/pom.xml
-@@ -113,6 +113,11 @@
- <version>2.0.7</version>
+@@ -182,6 +182,11 @@
+ <version>2.2.0</version>
</dependency>
<dependency>
+ <groupId>org.apache.maven.reporting</groupId>
diff --git a/debian/patches/remove_bndlib_spring_support.diff
b/debian/patches/remove_bndlib_spring_support.diff
index 58d01f8..1e7257c 100644
--- a/debian/patches/remove_bndlib_spring_support.diff
+++ b/debian/patches/remove_bndlib_spring_support.diff
@@ -6,23 +6,22 @@ Last-Update: 2011-10-13
--- a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
+++ b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
-@@ -84,7 +84,6 @@
- import aQute.bnd.osgi.Jar;
+@@ -107,7 +107,6 @@
import aQute.bnd.osgi.Packages;
import aQute.bnd.osgi.Processor;
+ import aQute.lib.collections.ExtList;
-import aQute.lib.spring.SpringXMLType;
+ import aQute.libg.generics.Create;
- /**
-@@ -1304,11 +1303,6 @@
+@@ -1839,10 +1838,6 @@
properties.put( "classifier", classifier == null ? "" : classifier );
- // Add default plugins
-- header( properties, Analyzer.PLUGIN, ScrPlugin.class.getName() + ","
-- + BlueprintPlugin.class.getName()
+ ","
-- + SpringXMLType.class.getName() );
--
+- header( properties, Analyzer.PLUGIN, BlueprintPlugin.class.getName()
+ ","
+- + SpringXMLType.class.getName() +
","
+- + JpaPlugin.class.getName() );
+
return properties;
}
-
diff --git a/debian/patches/series b/debian/patches/series
index 12d84a8..ba3cbc8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,5 @@
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
maven-archiver3-869361.patch
maven3-compatibility.patch
diff --git a/debian/patches/support_plexus_utils_1_5.diff
b/debian/patches/support_plexus_utils_1_5.diff
index 35248a2..f541d8b 100644
--- a/debian/patches/support_plexus_utils_1_5.diff
+++ b/debian/patches/support_plexus_utils_1_5.diff
@@ -5,7 +5,7 @@ Last-Update: 2011-10-23
--- a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
+++ b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
-@@ -603,7 +603,7 @@
+@@ -734,7 +734,7 @@
{
getLog().info( "Writing BND instructions to " +
dumpInstructions );
dumpInstructions.getParentFile().mkdirs();
@@ -14,7 +14,7 @@ Last-Update: 2011-10-23
}
}
-@@ -615,7 +615,7 @@
+@@ -748,7 +748,7 @@
{
getLog().info( "Writing BND classpath to " + dumpClasspath );
dumpClasspath.getParentFile().mkdirs();
diff --git
a/debian/patches/use-changelog-date-as-pom.properties-timestamp.patch
b/debian/patches/use-changelog-date-as-pom.properties-timestamp.patch
index 618ebc7..aeab697 100644
--- a/debian/patches/use-changelog-date-as-pom.properties-timestamp.patch
+++ b/debian/patches/use-changelog-date-as-pom.properties-timestamp.patch
@@ -82,9 +82,9 @@ Forwarded: not-needed
+}
--- a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
+++ b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
-@@ -1072,7 +1072,8 @@
- File pomFile = new File( currentProject.getBasedir(), "pom.xml" );
- jar.putResource( path + "/pom.xml", new FileResource( pomFile ) );
+@@ -1610,7 +1610,8 @@
+ jar.putResource( path + "/pom.xml", new FileResource( pomFile ) );
+ }
- Properties p = new Properties();
+ java.util.Date buildDate = DebianUtils.getDebianBuildDate();
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/maven-bundle-plugin.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
