diff options
Diffstat (limited to 'java')
-rw-r--r-- | java/sca/distribution/features/core/src/main/components/bin-filtered-dependencies.xml (renamed from java/sca/distribution/features/core/src/main/components/bin-down-dependencies.xml) | 2 | ||||
-rw-r--r-- | java/sca/distribution/features/ejava/src/main/assembly/bin.xml | 2 | ||||
-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 | ||||
-rw-r--r-- | java/sca/distribution/features/manager/src/main/assembly/bin.xml | 2 | ||||
-rw-r--r-- | java/sca/distribution/features/process/src/main/assembly/bin.xml | 2 | ||||
-rw-r--r-- | java/sca/distribution/features/web20/src/main/assembly/bin.xml | 2 | ||||
-rw-r--r-- | java/sca/distribution/features/webservice/src/main/assembly/bin.xml | 2 |
8 files changed, 6 insertions, 10 deletions
diff --git a/java/sca/distribution/features/core/src/main/components/bin-down-dependencies.xml b/java/sca/distribution/features/core/src/main/components/bin-filtered-dependencies.xml index 1bcab2a9e3..ecacf1d9f5 100644 --- a/java/sca/distribution/features/core/src/main/components/bin-down-dependencies.xml +++ b/java/sca/distribution/features/core/src/main/components/bin-filtered-dependencies.xml @@ -23,7 +23,6 @@ <dependencySet> <outputDirectory>modules</outputDirectory> <unpack>false</unpack> - <useTransitiveFiltering>true</useTransitiveFiltering> <includes> <include>org.apache.tuscany.sca:*</include> </includes> @@ -80,7 +79,6 @@ <dependencySet> <outputDirectory>lib</outputDirectory> <unpack>false</unpack> - <useTransitiveFiltering>true</useTransitiveFiltering> <excludes> <exclude>asm:asm-all</exclude> <exclude>cglib:cglib-nodep</exclude> diff --git a/java/sca/distribution/features/ejava/src/main/assembly/bin.xml b/java/sca/distribution/features/ejava/src/main/assembly/bin.xml index 85c8de5239..fd49912e91 100644 --- a/java/sca/distribution/features/ejava/src/main/assembly/bin.xml +++ b/java/sca/distribution/features/ejava/src/main/assembly/bin.xml @@ -32,7 +32,7 @@ <componentDescriptors> <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor> - <componentDescriptor>../core/src/main/components/bin-down-dependencies.xml</componentDescriptor> + <componentDescriptor>../core/src/main/components/bin-filtered-dependencies.xml</componentDescriptor> <componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor> </componentDescriptors> </assembly> 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 }' diff --git a/java/sca/distribution/features/manager/src/main/assembly/bin.xml b/java/sca/distribution/features/manager/src/main/assembly/bin.xml index 85c8de5239..fd49912e91 100644 --- a/java/sca/distribution/features/manager/src/main/assembly/bin.xml +++ b/java/sca/distribution/features/manager/src/main/assembly/bin.xml @@ -32,7 +32,7 @@ <componentDescriptors> <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor> - <componentDescriptor>../core/src/main/components/bin-down-dependencies.xml</componentDescriptor> + <componentDescriptor>../core/src/main/components/bin-filtered-dependencies.xml</componentDescriptor> <componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor> </componentDescriptors> </assembly> diff --git a/java/sca/distribution/features/process/src/main/assembly/bin.xml b/java/sca/distribution/features/process/src/main/assembly/bin.xml index 85c8de5239..fd49912e91 100644 --- a/java/sca/distribution/features/process/src/main/assembly/bin.xml +++ b/java/sca/distribution/features/process/src/main/assembly/bin.xml @@ -32,7 +32,7 @@ <componentDescriptors> <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor> - <componentDescriptor>../core/src/main/components/bin-down-dependencies.xml</componentDescriptor> + <componentDescriptor>../core/src/main/components/bin-filtered-dependencies.xml</componentDescriptor> <componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor> </componentDescriptors> </assembly> diff --git a/java/sca/distribution/features/web20/src/main/assembly/bin.xml b/java/sca/distribution/features/web20/src/main/assembly/bin.xml index 85c8de5239..fd49912e91 100644 --- a/java/sca/distribution/features/web20/src/main/assembly/bin.xml +++ b/java/sca/distribution/features/web20/src/main/assembly/bin.xml @@ -32,7 +32,7 @@ <componentDescriptors> <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor> - <componentDescriptor>../core/src/main/components/bin-down-dependencies.xml</componentDescriptor> + <componentDescriptor>../core/src/main/components/bin-filtered-dependencies.xml</componentDescriptor> <componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor> </componentDescriptors> </assembly> diff --git a/java/sca/distribution/features/webservice/src/main/assembly/bin.xml b/java/sca/distribution/features/webservice/src/main/assembly/bin.xml index 85c8de5239..fd49912e91 100644 --- a/java/sca/distribution/features/webservice/src/main/assembly/bin.xml +++ b/java/sca/distribution/features/webservice/src/main/assembly/bin.xml @@ -32,7 +32,7 @@ <componentDescriptors> <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor> - <componentDescriptor>../core/src/main/components/bin-down-dependencies.xml</componentDescriptor> + <componentDescriptor>../core/src/main/components/bin-filtered-dependencies.xml</componentDescriptor> <componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor> </componentDescriptors> </assembly> |