| author | Borislav Kapukaranov | 2011-12-04 13:28:01 (EST) |
|---|---|---|
| committer | Violeta Georgieva | 2011-12-04 15:48:05 (EST) |
| commit | d261f125b433f0f54e8fe2e2b69919769641dc1a (patch) (side-by-side diff) | |
| tree | 7d36286f8433de40f3dfe28cfea2bec4ca66e219 | |
| parent | 7a9cea3e253f2fcc20b7541637a3ce0573373910 (diff) | |
| download | org.eclipse.gemini.web.gemini-web-container-d261f125b433f0f54e8fe2e2b69919769641dc1a.zip org.eclipse.gemini.web.gemini-web-container-d261f125b433f0f54e8fe2e2b69919769641dc1a.tar.gz org.eclipse.gemini.web.gemini-web-container-d261f125b433f0f54e8fe2e2b69919769641dc1a.tar.bz2 | |
Upgrade Virgo Build in Gemini Web to 2.16 and migrate to the new p2tools.
| -rw-r--r-- | build-web-container/build.xml | 20 | ||||
| -rw-r--r-- | build.versions | 2 | ||||
| m--------- | virgo-build | 0 |
3 files changed, 9 insertions, 13 deletions
diff --git a/build-web-container/build.xml b/build-web-container/build.xml index 8ff5ada..dfc50f9 100644 --- a/build-web-container/build.xml +++ b/build-web-container/build.xml @@ -86,10 +86,8 @@ </target> <!--P2 publishing properties--> - <property name="publishing.dir" value="${basedir}/target/repository"/> - <property name="p2.repo.url" value="file:///${publishing.dir}"/> - <target name="p2.publish" depends="package, p2.extract-publisher" + <target name="p2.publish" depends="package, fetch-unzipped-virgo-build-tools" description="Publishes bundles, features and product"> <copy todir="${basedir}/target/features" failonerror="false"> <fileset dir="${basedir}/features"/> @@ -99,16 +97,12 @@ style="${basedir}/create-feature-xml.xsl"> <param name="GW.VERSION" expression="${bundle.version}"/> </xslt> - - <java jar="${p2.launcher.jar}" fork="true" taskname="p2bundles" failonerror="true" maxmemory="256m"> - <arg line="-application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher"/> - <arg line="-metadataRepository ${p2.repo.url}"/> - <arg line="-artifactRepository ${p2.repo.url}"/> - <arg line="-bundles ${package.output.dir},${package.output.dir}/dep"/> - <arg line="-features ${basedir}/target/features"/> - <arg line="-publishArtifacts"/> - <arg line="-configs all"/> - </java> + + <antcall target="p2.publish-bundles-features-alt"> + <param name="repository" value="${repository.dir}"/> + <param name="bundles" value="${package.output.dir},${package.output.dir}/dep"/> + <param name="features" value="${target.dir}/features"/> + </antcall> <!--sshexec host="build.eclipse.org" username="${eclipse.buildId}" diff --git a/build.versions b/build.versions index 4fb6bdc..b8fedb0 100644 --- a/build.versions +++ b/build.versions @@ -7,6 +7,8 @@ org.eclipse.virgo.test=3.0.0.RC2 # Compile org.eclipse.virgo.osgi=3.0.0.RC2 org.eclipse.virgo.util=3.1.0.D-20110927204747 +org.eclipse.virgo.build.tools=1.0.0.RELEASE +org.eclipse.equinox.launcher=1.3.0.v20111003-1644 javax.activation=1.1.1 javax.annotation=1.1.0.v201105051105 javax.ejb=3.0.0 diff --git a/virgo-build b/virgo-build -Subproject 0203fd0d3b41668b978d2b9391c37e2964020f1 +Subproject 9d6e503af847ac256fa97e111c9513c43b888cc |