You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by si...@apache.org on 2019/06/18 10:56:50 UTC
[sling-org-apache-sling-feature-analyser] 01/01: Merge pull request
#16 from apache/SLING-8251_merged_after_releases
This is an automated email from the ASF dual-hosted git repository.
simonetripodi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-analyser.git
commit 8d0a5e7f3ae16fea9d00a8aa7daa250f5517d315
Merge: 57c53da 90a4588
Author: Simone Tripodi <st...@adobe.com>
AuthorDate: Tue Jun 18 12:56:44 2019 +0200
Merge pull request #16 from apache/SLING-8251_merged_after_releases
SLING-8251 - Support checking dependencies for content packages
pom.xml | 28 ++++-
.../impl/CheckContentPackagesDependencies.java | 133 +++++++++++++++++++++
.../scanner/impl/ContentPackageScanner.java | 16 +--
...apache.sling.feature.analyser.task.AnalyserTask | 1 +
.../impl/CheckContentPackagesDependenciesTest.java | 116 ++++++++++++++++++
src/test/resources/test_a-1.0.zip | Bin 0 -> 4470 bytes
src/test/resources/test_b-1.0.zip | Bin 0 -> 4442 bytes
src/test/resources/test_c-1.0.zip | Bin 0 -> 4402 bytes
src/test/resources/test_d-1.0.zip | Bin 0 -> 4450 bytes
src/test/resources/test_e-1.0.zip | Bin 0 -> 4439 bytes
10 files changed, 281 insertions(+), 13 deletions(-)
diff --cc src/main/java/org/apache/sling/feature/scanner/impl/ContentPackageScanner.java
index b2f0be1,cea38b5..09f7781
--- a/src/main/java/org/apache/sling/feature/scanner/impl/ContentPackageScanner.java
+++ b/src/main/java/org/apache/sling/feature/scanner/impl/ContentPackageScanner.java
@@@ -190,25 -187,25 +190,25 @@@ public class ContentPackageScanner
}
}
- zis.closeEntry();
+
}
- }
- }
+ }
- for(final File f : toProcess) {
- extractContentPackage(cp, infos, f.toURI().toURL());
- final ContentPackageDescriptor i = new ContentPackageDescriptor(f.getName());
- final int lastDot = f.getName().lastIndexOf(".");
- i.setName(f.getName().substring(0, lastDot));
- i.setArtifactFile(f.toURI().toURL());
- i.setContentPackageInfo(cp.getArtifact(), f.getName());
- infos.add(i);
+ for (final File f : toProcess) {
+ extractContentPackage(cp, infos, f.toURI().toURL());
+ final ContentPackageDescriptor i = new ContentPackageDescriptor(f.getName());
+ final int lastDot = f.getName().lastIndexOf(".");
+ i.setName(f.getName().substring(0, lastDot));
+ i.setArtifactFile(f.toURI().toURL());
+ i.setContentPackageInfo(cp.getArtifact(), f.getName());
+ infos.add(i);
- i.lock();
+ i.lock();
+ }
}
} finally {
- deleteRecursive(tempDir);
+ deleteOnExitRecursive(tempDir);
}
}