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:49 UTC
[sling-org-apache-sling-feature-analyser] branch master updated
(57c53da -> 8d0a5e7)
This is an automated email from the ASF dual-hosted git repository.
simonetripodi pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-analyser.git.
from 57c53da SLING-8430: Use java.util.zip.ZipFile in Feature Model Analyser
add 3847fea SLING-8251 - Support checking dependencies for content packages
add 5ece35f GRANITE-24646 - Analyzer dependencies for content packages
add dbec3dc SLING-8251 - Support checking dependencies for content packages
add ca583ed SLING-8251 - Support checking dependencies for content packages
add b44046c SLING-8251 - Support checking dependencies for content packages
add 90a4588 SLING-8251 - Support checking dependencies for content packages
new 8d0a5e7 Merge pull request #16 from apache/SLING-8251_merged_after_releases
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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(-)
create mode 100644 src/main/java/org/apache/sling/feature/analyser/task/impl/CheckContentPackagesDependencies.java
create mode 100644 src/test/java/org/apache/sling/feature/analyser/task/impl/CheckContentPackagesDependenciesTest.java
create mode 100644 src/test/resources/test_a-1.0.zip
create mode 100644 src/test/resources/test_b-1.0.zip
create mode 100644 src/test/resources/test_c-1.0.zip
create mode 100644 src/test/resources/test_d-1.0.zip
create mode 100644 src/test/resources/test_e-1.0.zip
[sling-org-apache-sling-feature-analyser] 01/01: Merge pull request
#16 from apache/SLING-8251_merged_after_releases
Posted by si...@apache.org.
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);
}
}