Minor improvements of some of the build scripts. Do not need to build the assembly with the -Pmodules profile. Excluded the distro modules from the -Pmodules profile. Fixed up some of the OSGi dependencies.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@689690 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 3 insertions, 12 deletions

diff --git a/java/sca/distribution/features/etc/generate-pom.sh b/java/sca/distribution/features/etc/generate-pom.sh
index 2a198eb3f2..538623afa7 100755
--- a/java/sca/distribution/features/etc/generate-pom.sh
+++ b/java/sca/distribution/features/etc/generate-pom.sh
@@ -18,18 +18,9 @@
 # This script can be used to generate a Maven build profile that includes all
 # the modules included directly or transitively in a distribution
 
-cat pom.xml | awk 'BEGIN { i=0 } /<profiles>/ { i=1; print } /.*/ { if (i==0) print } '
+cat pom.xml | awk 'BEGIN { i=0 } /<modules>/ { i=1; print } /.*/ { if (i==0) print } '
 
-echo ""
-echo "        <!-- Profile that can be used to build the modules included in the distro -->"
-echo "        <profile>"
-echo "            <id>modules</id>"
-echo "            <modules>"
+mvn -o dependency:list | awk '/.INFO.    (.*.tuscany.sca):(tuscany-)(.*):(.*):(.*):(.*)/ { print gensub("(.INFO.    )(.*)(:)(tuscany-)(.*)(:)(.*)(:)(.*)(:)(.*)", "\\5", "g") }' | grep -v "distribution-" | sort | awk '{ printf "                <module>../../../modules/%s</module>\n", $1 }'
 
-mvn -o dependency:list | awk '/.INFO.    (.*.tuscany.sca):(tuscany-)(.*):(.*):(.*):(.*)/ { print gensub("(.INFO.    )(.*)(:)(tuscany-)(.*)(:)(.*)(:)(.*)(:)(.*)", "\\5", "g") }' | sort | awk '{ printf "                <module>../../../modules/%s</module>\n", $1 }'
-
-echo "            </modules>"
-echo "        </profile>"
-
-cat pom.xml | awk 'BEGIN { i=0 } /<\/profiles>/ { i=1 } /.*/ { if (i==1) print } '
+cat pom.xml | awk 'BEGIN { i=0 } /<\/modules>/ { i=1 } /.*/ { if (i==1) print } '