diff options
| -rw-r--r-- | buildhelpers/ivy.xml | 8 | ||||
| -rw-r--r-- | client-compiled/build.xml | 4 | ||||
| -rw-r--r-- | client-compiled/ivy.xml | 5 | ||||
| -rw-r--r-- | client-compiler/ivy.xml | 5 | ||||
| -rw-r--r-- | client/ivy.xml | 3 | ||||
| -rw-r--r-- | common.xml | 14 | ||||
| -rw-r--r-- | ivysettings.xml | 4 | ||||
| -rw-r--r-- | server/ivy.xml | 5 | ||||
| -rw-r--r-- | shared/ivy.xml | 5 | ||||
| -rw-r--r-- | theme-compiler/ivy.xml | 5 | ||||
| -rw-r--r-- | themes-compiled/build.xml | 3 | ||||
| -rw-r--r-- | themes-compiled/ivy.xml | 5 | ||||
| -rw-r--r-- | uitest/build.xml | 2 | ||||
| -rw-r--r-- | uitest/ivy.xml | 4 |
14 files changed, 47 insertions, 25 deletions
diff --git a/buildhelpers/ivy.xml b/buildhelpers/ivy.xml index a2a6ea35ae..9d74b56f59 100644 --- a/buildhelpers/ivy.xml +++ b/buildhelpers/ivy.xml @@ -17,13 +17,15 @@ <configurations> <conf name="build" /> <conf name="build-provided" /> - <conf name="ide" visibility="private"/> + <conf name="ide" visibility="private" /> <conf name="tests" /> </configurations> <publications> <artifact type="jar" /> -<!-- <artifact type="source" ext="jar" m:classifier="sources" /> --> -<!-- <artifact type="javadoc" ext="jar" m:classifier="javadoc" /> --> + <!-- <artifact type="source" ext="jar" m:classifier="sources" /> --> + <!-- <artifact type="javadoc" ext="jar" m:classifier="javadoc" /> --> + <artifact type="pom" ext="pom" /> + </publications> <dependencies /> diff --git a/client-compiled/build.xml b/client-compiled/build.xml index 2f0c2f6e9c..9327e6da5f 100644 --- a/client-compiled/build.xml +++ b/client-compiled/build.xml @@ -94,7 +94,6 @@ <jar file="${compiled-cache.jar}" compress="true"> <fileset dir="${gwtar.dir}"> <include name="**/*.gwtar" /> - <include name="pom.xml" /> </fileset> <union refid="client-compiled-cache.gwt.includes" /> <fileset refid="common.files.for.all.jars" /> @@ -115,7 +114,6 @@ </manifest> <fileset dir="${result.dir}"> <include name="VAADIN/widgetsets/com.vaadin*/**" /> - <include name="pom.xml" /> </fileset> <fileset refid="common.files.for.all.jars" /> </jar> @@ -123,7 +121,7 @@ </target> - <target name="publish-local" depends="client-compiled.jar, client-compiled-cache.jar"> + <target name="publish-local" depends="client-compiled.jar"> <antcall target="common.publish-local"> <param name="conf" value="build" /> </antcall> diff --git a/client-compiled/ivy.xml b/client-compiled/ivy.xml index eb5513171e..bddabc8bb8 100644 --- a/client-compiled/ivy.xml +++ b/client-compiled/ivy.xml @@ -11,8 +11,9 @@ <conf name="compile-module" visibility="private" /> </configurations> <publications> - <artifact type="jar" name="vaadin-client-compiled" /> - <!-- cache must be a separate artifact, not within vaadin-client-compiled --> + <artifact type="jar" ext="jar"/> + <artifact type="pom" ext="pom"/> + <!-- cache must be a separate artifact, not within vaadin-client-compiled --> <!-- <artifact type="jar" name="vaadin-client-compiled-cache"/> --> </publications> <dependencies> diff --git a/client-compiler/ivy.xml b/client-compiler/ivy.xml index 4eafb3cbae..8c991b2223 100644 --- a/client-compiler/ivy.xml +++ b/client-compiler/ivy.xml @@ -12,8 +12,9 @@ <conf name="ide" visibility="private"/> </configurations> <publications> - <artifact></artifact> - </publications> + <artifact type="jar" ext="jar"/> + <artifact type="pom" ext="pom"/> + </publications> <dependencies> <dependency org="com.vaadin" name="vaadin-shared" rev="${vaadin.version}"></dependency> diff --git a/client/ivy.xml b/client/ivy.xml index e81984949f..52706b4ed9 100644 --- a/client/ivy.xml +++ b/client/ivy.xml @@ -13,7 +13,8 @@ <conf name="tests" /> </configurations> <publications> - <artifact></artifact> + <artifact type="jar" ext="jar"/> + <artifact type="pom" ext="pom"/> </publications> <dependencies defaultconf="build" defaultconfmapping="build,ide->default"> <!-- API DEPENDENCIES --> diff --git a/common.xml b/common.xml index 191b522bc4..c457d827a9 100644 --- a/common.xml +++ b/common.xml @@ -20,7 +20,7 @@ <target name="pom.xml" description="Generates a pom.xml based on the Ivy configuration"> <fail unless="result.dir" message="No result.dir parameter given" /> <property name="ivy.xml" location="${result.dir}/../ivy.xml" /> - <property name="pom.xml" location="${result.dir}/pom.xml" /> + <property name="pom.xml" location="${result.dir}/lib/${module.name}-${vaadin.version}.pom" /> <property name="conf" value="build, build-provided" /> <ivy:makepom templatefile="${vaadin.basedir}/pom-template.xml" ivyfile="${ivy.xml}" pomfile="${pom.xml}" conf="${conf}"> @@ -86,7 +86,6 @@ <fileset dir="${classes}" excludes="${classes.exclude}" /> <fileset dir="${src}" excludes="${jar.exclude}" /> <fileset refid="common.files.for.all.jars" /> - <fileset file="${pom.xml}" /> <union refid="extra.jar.includes" /> </union> <jar destfile="${result.jar}" duplicate="fail" index="true"> @@ -211,5 +210,16 @@ <artifacts pattern="${result.dir}/lib/[artifact]-[revision](-[classifier]).[ext]" /> </ivy:publish> + <ivy:publish conf="${conf}" resolver="local-maven" overwrite="true"> + <artifacts pattern="${result.dir}/lib/[artifact]-[revision](-[classifier]).[ext]" /> + </ivy:publish> + </target> + + <target name="publish.to.local.maven"> + <property name="conf" value="*(public)" /> + + <ivy:resolve conf="${conf}" /> + <ivy:publish conf="${conf}" resolver="local-maven" overwrite="true"> + </ivy:publish> </target> </project>
\ No newline at end of file diff --git a/ivysettings.xml b/ivysettings.xml index f9b3450be3..5940218108 100644 --- a/ivysettings.xml +++ b/ivysettings.xml @@ -11,6 +11,10 @@ <settings defaultResolver="public" /> <resolvers> <ibiblio name="public" m2compatible="true" /> + <filesystem name="local-maven" m2compatible="true"> + <artifact + pattern="${user.home}/.m2/repository/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]" /> + </filesystem> <dual name="custom-smartsprites"> <filesystem name="smartsprites-ivy"> <ivy pattern="${basedir}/ivymodule/[module]-ivy-[revision].xml" /> diff --git a/server/ivy.xml b/server/ivy.xml index c0951e90a3..1e1b4460d7 100644 --- a/server/ivy.xml +++ b/server/ivy.xml @@ -13,8 +13,9 @@ <conf name="tests" visibility="private" /> </configurations> <publications> - <artifact></artifact> - </publications> + <artifact type="jar" ext="jar"/> + <artifact type="pom" ext="pom"/> + </publications> <dependencies> <!-- API DEPENDENCIES --> diff --git a/shared/ivy.xml b/shared/ivy.xml index f445514bcd..8c344a92e9 100644 --- a/shared/ivy.xml +++ b/shared/ivy.xml @@ -13,8 +13,9 @@ <conf name="tests" /> </configurations> <publications> - <artifact></artifact> - </publications> + <artifact type="jar" ext="jar"/> + <artifact type="pom" ext="pom"/> + </publications> <dependencies> </dependencies> diff --git a/theme-compiler/ivy.xml b/theme-compiler/ivy.xml index 00da62582c..06285afaf1 100644 --- a/theme-compiler/ivy.xml +++ b/theme-compiler/ivy.xml @@ -13,8 +13,9 @@ <conf name="tests" /> </configurations> <publications> - <artifact type="jar" /> - <artifact type="sources" ext="jar" /> + <artifact type="jar" ext="jar"/> + <artifact type="pom" ext="pom"/> + <artifact type="sources" ext="jar" /> <artifact type="javadoc" ext="jar" /> </publications> <dependencies defaultconf="*->default"> diff --git a/themes-compiled/build.xml b/themes-compiled/build.xml index c295c570cd..a3adbd654f 100644 --- a/themes-compiled/build.xml +++ b/themes-compiled/build.xml @@ -41,7 +41,8 @@ <property name="result.dir" location="result" /> <property name="result.jar" location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" /> <property name="classes" location="{$result.dir}/classes" /> - + <antcall target="common.pom.xml" /> + <jar jarfile="${result.jar}"> <fileset dir="${result.dir}"> <include name="VAADIN/themes/**" /> diff --git a/themes-compiled/ivy.xml b/themes-compiled/ivy.xml index 746acf38c1..6bf7d0d813 100644 --- a/themes-compiled/ivy.xml +++ b/themes-compiled/ivy.xml @@ -11,8 +11,9 @@ <conf name="compile-theme" visibility="private" /> </configurations> <publications> - <artifact type="jar"></artifact> - </publications> + <artifact type="jar" ext="jar"/> + <artifact type="pom" ext="pom"/> + </publications> <dependencies> <dependency org="com.vaadin" name="vaadin-theme-compiler" rev="${vaadin.version}" conf="compile-theme->build" /> diff --git a/uitest/build.xml b/uitest/build.xml index a97886dc8b..29f1540321 100644 --- a/uitest/build.xml +++ b/uitest/build.xml @@ -50,7 +50,7 @@ </target> <target name="testing-widgetset" depends="dependencies,compile"> - <property name="module" value="com.vaadin.tests.widgetset.TestingWidgetSet"/> + <property name="module" value="com.vaadin.tests.widgetset.TestingWidgetSet" /> <property name="style" value="OBF" /> <property name="localWorkers" value="2" /> <property name="extraParams" value="" /> diff --git a/uitest/ivy.xml b/uitest/ivy.xml index 6cb7fc9050..563be59b0b 100644 --- a/uitest/ivy.xml +++ b/uitest/ivy.xml @@ -13,8 +13,8 @@ <conf name="jetty-run" extends="build" visibility="private" /> </configurations> <publications> - <artifact type="war" /> - </publications> + <artifact type="war" ext="war"/> + </publications> <dependencies defaultconf="build" defaultconfmapping="build,ide->default"> <!-- API DEPENDENCIES --> <dependency org="javax.portlet" name="portlet-api" |