Author: bramk
Date: Thu Jul 11 09:08:40 2013
New Revision: 1502160
URL: http://svn.apache.org/r1502160
Log:
[sandbox] Added false positive bnd diff bug workaround
Modified:
ace/sandbox/bramk/org.apache.ace.cli/src/org/apache/ace/cli/deployment/ContinuousDeployer.java
Modified:
ace/sandbox/bramk/org.apache.ace.cli/src/org/apache/ace/cli/deployment/ContinuousDeployer.java
URL:
http://svn.apache.org/viewvc/ace/sandbox/bramk/org.apache.ace.cli/src/org/apache/ace/cli/deployment/ContinuousDeployer.java?rev=1502160&r1=1502159&r2=1502160&view=diff
==============================================================================
---
ace/sandbox/bramk/org.apache.ace.cli/src/org/apache/ace/cli/deployment/ContinuousDeployer.java
(original)
+++
ace/sandbox/bramk/org.apache.ace.cli/src/org/apache/ace/cli/deployment/ContinuousDeployer.java
Thu Jul 11 09:08:40 2013
@@ -113,10 +113,18 @@ public class ContinuousDeployer {
}
else {
System.out.println("Found existing snapshot: " +
getString(snapshotResource));
+
+ // FIXME workaround for BND#374
+ if (getIdentity(resource).equals("com.google.guava")) {
+ System.out.println("Skipping snapshot diff on Google Guava to
work around https://github.com/bndtools/bnd/issues/374";);
+ return;
+ }
+
File developmentResource =
m_developmentRepo.get(getIdentity(resource), getVersion(resource).toString(),
Strategy.EXACT, null);
File deployedResource =
m_deploymentRepo.get(getIdentity(snapshotResource),
getVersion(snapshotResource).toString(), Strategy.EXACT, null);
boolean snapshotModified = false;
+
if (getType(resource).equals("osgi.bundle")) {
// Get a copy of the dep resource with the same version as the
dev resource so we can diff diff.
