diff options
author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2008-08-27 02:37:02 +0000 |
---|---|---|
committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2008-08-27 02:37:02 +0000 |
commit | b2651f2ac1fa7994db12a6a1d6af8e8869883588 (patch) | |
tree | 606e1fe4bad93c0e7ab8d938d42c0edb3f5bd98d /java/sca/distribution/features/etc | |
parent | 4c02e263e0b80b4d43340c137e4361e818cf1143 (diff) |
Minor fixes. Renamed down-dependencies to filtered-dependencies. Removed the useTransitiveDependencies element as it causes dependencies to be incorrectly excluded.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@689338 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca/distribution/features/etc')
-rwxr-xr-x | java/sca/distribution/features/etc/generate-all-maven-files.sh | 2 | ||||
-rwxr-xr-x | java/sca/distribution/features/etc/generate-filtered-dependencies.sh (renamed from java/sca/distribution/features/etc/generate-down-dependencies.sh) | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/java/sca/distribution/features/etc/generate-all-maven-files.sh b/java/sca/distribution/features/etc/generate-all-maven-files.sh index d80368b90c..4619c7f539 100755 --- a/java/sca/distribution/features/etc/generate-all-maven-files.sh +++ b/java/sca/distribution/features/etc/generate-all-maven-files.sh @@ -19,7 +19,7 @@ # for all the distributions echo "Generate Maven files: core" -cd core; ../etc/generate-down-dependencies.sh > src/main/components/bin-down-dependencies.xml; ../etc/generate-maven-files.sh +cd core; ../etc/generate-filtered-dependencies.sh > src/main/components/bin-filtered-dependencies.xml; ../etc/generate-maven-files.sh echo "Generate Maven files: ejava" cd ../ejava; ../etc/generate-maven-files.sh diff --git a/java/sca/distribution/features/etc/generate-down-dependencies.sh b/java/sca/distribution/features/etc/generate-filtered-dependencies.sh index d8ad5b75f3..7a04369b50 100755 --- a/java/sca/distribution/features/etc/generate-down-dependencies.sh +++ b/java/sca/distribution/features/etc/generate-filtered-dependencies.sh @@ -43,7 +43,6 @@ echo " <!-- Add all the Tuscany modules to the modules directory -->" echo " <dependencySet>" echo " <outputDirectory>modules</outputDirectory>" echo " <unpack>false</unpack>" -echo " <useTransitiveFiltering>true</useTransitiveFiltering>" echo " <includes>" echo " <include>org.apache.tuscany.sca:*</include>" echo " </includes>" @@ -58,7 +57,6 @@ echo " <!-- Add all the dependent jars to the lib directory -->" echo " <dependencySet>" echo " <outputDirectory>lib</outputDirectory>" echo " <unpack>false</unpack>" -echo " <useTransitiveFiltering>true</useTransitiveFiltering>" echo " <excludes>" mvn -o dependency:list | awk '/.INFO. (.*):(.*):(.*):(.*):(.*)/ && !/(.*)(.tuscany.sca):(.*)/ { print gensub("(.INFO. )(.*)(:)(.*)(:)(.*)(:)(.*)(:)(.*)", "\\2:\\4", "g") }' | sort | awk '{ printf " <exclude>%s</exclude>\n", $1 }' |