[Git][java-team/tycho][master] Fixed the compatibility with equinox-p2 4.8

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / tycho


Commits:
12bf101c by Emmanuel Bourg at 2018-12-19T14:59:01Z
Fixed the compatibility with equinox-p2 4.8

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/equinox-p2-compatibility.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+tycho (1.0.0-2) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the compatibility with equinox-p2 4.8
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 19 Dec 2018 15:56:23 +0100
+
 tycho (1.0.0-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -18,7 +18,7 @@ Build-Depends:
  libeclipse-jdt-compiler-apt-java,
  libeclipse-jdt-core-java,
  libeclipse-osgi-compatibility-state-java,
- libeclipse-osgi-java,
+ libeclipse-osgi-java (>= 3.13.0+eclipse4.8),
  libeclipse-osgi-util-java,
  libequinox-app-java,
  libequinox-common-java,
@@ -27,12 +27,12 @@ Build-Depends:
  libequinox-p2-core-java,
  libequinox-p2-director-app-java,
  libequinox-p2-director-java,
- libequinox-p2-metadata-java,
+ libequinox-p2-metadata-java (>= 2.4.0+eclipse4.8),
  libequinox-p2-metadata-repository-java,
- libequinox-p2-publisher-eclipse-java,
+ libequinox-p2-publisher-eclipse-java (>= 1.3.0+eclipse4.8),
  libequinox-p2-publisher-java,
  libequinox-p2-repository-java,
- libequinox-p2-repository-tools-java,
+ libequinox-p2-repository-tools-java (>= 2.2.0+eclipse4.8),
  libequinox-p2-updatesite-java,
  libequinox-preferences-java,
  libequinox-registry-java,


=====================================
debian/patches/equinox-p2-compatibility.patch
=====================================
@@ -0,0 +1,47 @@
+Description: Fixes the compatibility with Equinox p2 4.8
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/util/resolution/DependencyCollector.java
++++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/util/resolution/DependencyCollector.java
+@@ -105,7 +105,7 @@
+             return true;
+         }
+ 
+-        return RequiredCapability.isVersionStrict(req.getMatches());
++        return RequiredCapability.isStrictVersionRequirement(req.getMatches());
+     }
+ 
+     private boolean isFeature(IInstallableUnit iu) {
+--- a/tycho-bundles/org.eclipse.tycho.p2.tools.impl/src/main/java/org/eclipse/tycho/p2/tools/mirroring/MirrorApplicationServiceImpl.java
++++ b/tycho-bundles/org.eclipse.tycho.p2.tools.impl/src/main/java/org/eclipse/tycho/p2/tools/mirroring/MirrorApplicationServiceImpl.java
+@@ -167,7 +167,7 @@
+                     descriptor.setLocation(destination.getLocation().toURI());
+ 
+                     RecreateRepositoryApplication application = new RecreateRepositoryApplication();
+-                    application.setArtifactRepository(descriptor);
++                    application.setArtifactRepository(descriptor.getRepoLocation());
+                     application.run(new NullProgressMonitor());
+                 } catch (ProvisionException e) {
+                     throw new FacadeException(MIRROR_FAILURE_MESSAGE + ": " + StatusTool.collectProblems(e.getStatus()),
+--- a/tycho-bundles/org.eclipse.tycho.p2.tools.impl/src/main/java/org/eclipse/tycho/p2/tools/publisher/ExpandedProduct.java
++++ b/tycho-bundles/org.eclipse.tycho.p2.tools.impl/src/main/java/org/eclipse/tycho/p2/tools/publisher/ExpandedProduct.java
+@@ -249,4 +249,8 @@
+         return defaults.getRepositoryEntries();
+     }
+ 
++    @Override
++    public String getVM(String os) {
++        return defaults.getVM(os);
++    }
+ }
+--- a/tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockServiceImpl.java
++++ b/tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockServiceImpl.java
+@@ -29,7 +29,7 @@
+     private Location anyLocation;
+ 
+     public FileLockServiceImpl() {
+-        anyLocation = new BasicLocation(null, null, false, null, new ConfigValues(new HashMap<String, String>()),
++        anyLocation = new BasicLocation(null, null, false, null, new ConfigValues(new HashMap<String, String>(), new HashMap()),
+                 new EquinoxContainer(null), new AtomicBoolean(false));
+     }
+ 


=====================================
debian/patches/series
=====================================
@@ -5,3 +5,4 @@ plexus-compatibility.patch
 mockito.patch
 explicit-exception-messages.patch
 aether.patch
+equinox-p2-compatibility.patch



View it on GitLab: https://salsa.debian.org/java-team/tycho/commit/12bf101cd20bd2d8b22ca9ebe41a742bb73e4654

-- 
View it on GitLab: https://salsa.debian.org/java-team/tycho/commit/12bf101cd20bd2d8b22ca9ebe41a742bb73e4654
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20181219/5fb40a81/attachment.html>