Removing all amazon publishing
diff --git a/common/common.properties b/common/common.properties
index 8b0289d..cf51494 100644
--- a/common/common.properties
+++ b/common/common.properties
@@ -6,7 +6,6 @@
natural.name=${ant.project.name}
build.stamp=BUILD-${timestamp}
bundle.version=${version}.${build.stamp}
-publish.bucket=zodiac.springsource.com
local.repo.dir=${java.io.tmpdir}/local-repository
# Artifact Properties
@@ -138,8 +137,6 @@
edu.umd.cs.findbugs.version=1.3.7
# Ivy Properties
-#bucket.basename=zodiac.springsource.com
-zodiac.basename=zodiac.springsource.com
release.type=integration
ivy.checksums=sha1
ivy.deliver.revision=${bundle.version}
diff --git a/common/ivysettings.xml b/common/ivysettings.xml
index f46f011..7fcd7ea 100644
--- a/common/ivysettings.xml
+++ b/common/ivysettings.xml
@@ -22,16 +22,6 @@
artifactPattern="[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"
useOrigin="true" checkUpToDate="false"/>
- <macrodef name="s3repo">
- <attribute name="bucket"/>
- <attribute name="artifact.type"/>
- <attribute name="release.type"/>
- <s3 descriptor="required" accessKey="${accessKey}" secretKey="${secretKey}">
- <ivy pattern="s3://@{bucket}/ivy/@{artifact.type}/@{release.type}/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"/>
- <artifact pattern="s3://@{bucket}/ivy/@{artifact.type}/@{release.type}/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"/>
- </s3>
- </macrodef>
-
<macrodef name="s3repo-read">
<attribute name="bucket"/>
<attribute name="artifact.type"/>
@@ -86,47 +76,37 @@
<chain name="spring-portfolio-lookup" returnFirst="true">
<resolver ref="integration"/>
<localrepo name="local"/>
- <s3repo-read name="bundle-release-repository" bucket="repository.springsource.com" artifact.type="bundles" release.type="release"/>
- <s3repo-read name="bundle-milestone-repository" bucket="repository.springsource.com" artifact.type="bundles" release.type="milestone"/>
- <s3repo-read name="bundle-snapshot-repository" bucket="repository.springsource.com" artifact.type="bundles" release.type="snapshot"/>
- <s3repo-read name="library-release-repository" bucket="repository.springsource.com" artifact.type="libraries" release.type="release"/>
+ <s3repo-read name="bundle-release-repository" bucket="repository.springsource.com" artifact.type="bundles" release.type="release"/>
+ <s3repo-read name="bundle-milestone-repository" bucket="repository.springsource.com" artifact.type="bundles" release.type="milestone"/>
+ <s3repo-read name="bundle-snapshot-repository" bucket="repository.springsource.com" artifact.type="bundles" release.type="snapshot"/>
+ <s3repo-read name="library-release-repository" bucket="repository.springsource.com" artifact.type="libraries" release.type="release"/>
<s3repo-read name="library-milestone-repository" bucket="repository.springsource.com" artifact.type="libraries" release.type="milestone"/>
- <s3repo-read name="library-snapshot-repository" bucket="repository.springsource.com" artifact.type="libraries" release.type="snapshot"/>
+ <s3repo-read name="library-snapshot-repository" bucket="repository.springsource.com" artifact.type="libraries" release.type="snapshot"/>
</chain>
- <chain name="zodiac-and-eclipse-lookup" returnFirst="true">
+ <chain name="eclipse-lookup" returnFirst="true">
<resolver ref="integration"/>
<localrepo name="local"/>
- <eclipse-build-repo-read name="eclipse-bundle-release-repository" artifact.type="bundles" release.type="release"/>
- <eclipse-build-repo-read name="eclipse-bundle-milestone-repository" artifact.type="bundles" release.type="milestone"/>
- <eclipse-build-repo-read name="eclipse-bundle-snapshot-repository" artifact.type="bundles" release.type="snapshot"/>
- <eclipse-build-repo-read name="eclipse-library-release-repository" artifact.type="libraries" release.type="release"/>
+ <eclipse-build-repo-read name="eclipse-bundle-release-repository" artifact.type="bundles" release.type="release"/>
+ <eclipse-build-repo-read name="eclipse-bundle-milestone-repository" artifact.type="bundles" release.type="milestone"/>
+ <eclipse-build-repo-read name="eclipse-bundle-snapshot-repository" artifact.type="bundles" release.type="snapshot"/>
+ <eclipse-build-repo-read name="eclipse-library-release-repository" artifact.type="libraries" release.type="release"/>
<eclipse-build-repo-read name="eclipse-library-milestone-repository" artifact.type="libraries" release.type="milestone"/>
- <eclipse-build-repo-read name="eclipse-library-snapshot-repository" artifact.type="libraries" release.type="snapshot"/>
- <s3repo-read name="zodiac-bundle-release-repository" bucket="zodiac.springsource.com" artifact.type="bundles" release.type="release"/>
- <s3repo-read name="zodiac-bundle-milestone-repository" bucket="zodiac.springsource.com" artifact.type="bundles" release.type="milestone"/>
- <s3repo-read name="zodiac-bundle-snapshot-repository" bucket="zodiac.springsource.com" artifact.type="bundles" release.type="snapshot"/>
- <s3repo-read name="zodiac-library-release-repository" bucket="zodiac.springsource.com" artifact.type="libraries" release.type="release"/>
- <s3repo-read name="zodiac-library-milestone-repository" bucket="zodiac.springsource.com" artifact.type="libraries" release.type="milestone"/>
- <s3repo-read name="zodiac-library-snapshot-repository" bucket="zodiac.springsource.com" artifact.type="libraries" release.type="snapshot"/>
+ <eclipse-build-repo-read name="eclipse-library-snapshot-repository" artifact.type="libraries" release.type="snapshot"/>
</chain>
<!-- Publishing repositories -->
<eclipse-build-repo name="eclipse-remote-bundle-publish" artifact.type="bundles" release.type="${adjusted.release.type}"/>
<eclipse-build-repo name="eclipse-remote-library-publish" artifact.type="libraries" release.type="${adjusted.release.type}"/>
- <s3repo name="zodiac-remote-bundle-publish" bucket="${publish.bucket}" artifact.type="bundles" release.type="${adjusted.release.type}"/>
- <s3repo name="zodiac-remote-library-publish" bucket="${publish.bucket}" artifact.type="libraries" release.type="${adjusted.release.type}"/>
<localrepo name="eclipse-local-bundle-publish"/>
<localrepo name="eclipse-local-library-publish"/>
- <localrepo name="zodiac-local-bundle-publish"/>
- <localrepo name="zodiac-local-library-publish"/>
</resolvers>
<modules>
<module organisation="org.springframework.*" name="*" resolver="spring-portfolio-lookup"/>
<module organisation="com.springsource.*" name="*" resolver="spring-portfolio-lookup"/>
- <module organisation="org.eclipse.virgo.*" name="*" resolver="zodiac-and-eclipse-lookup"/>
- <module organisation="org.eclipse.gemini.*" name="*" resolver="zodiac-and-eclipse-lookup"/>
+ <module organisation="org.eclipse.virgo.*" name="*" resolver="eclipse-lookup"/>
+ <module organisation="org.eclipse.gemini.*" name="*" resolver="eclipse-lookup"/>
</modules>
</ivysettings>
diff --git a/common/publish.xml b/common/publish.xml
index f90fc05..bf7e9ef 100644
--- a/common/publish.xml
+++ b/common/publish.xml
@@ -15,11 +15,10 @@
<import file="common.xml"/>
-<!-- Main targets , publish-maven -->
- <target name="publish" depends="publish-ivy-zodiac, publish-maven" description="Publishes all artifacts to remote S3 zodiac repositories"/>
- <target name="publish-eclipse" depends="publish-ivy-eclipse" description="Publishes all artifacts to remote buidl.eclipse repositories"/>
+<!-- Main targets -->
+ <target name="publish" depends="publish-ivy, publish-maven" description="Publishes all artifacts to remote eclipse ivy and maven repositories"/>
- <target name="publish-ivy-eclipse" depends="ivy.init, resolve">
+ <target name="publish-ivy" depends="ivy.init, resolve">
<delete quiet="true" file="${ivy.output.file}"/>
<mkdir dir="${ivy.output.dir}"/>
<ivy:publish resolver="eclipse-${publication.resolver.prefix}-bundle-publish" overwrite="true" pubdate="${timestamp}" status="${release.type}">
@@ -29,16 +28,6 @@
</ivy:publish>
</target>
- <target name="publish-ivy-zodiac" depends="ivy.init, resolve">
- <delete quiet="true" file="${ivy.output.file}"/>
- <mkdir dir="${ivy.output.dir}"/>
- <ivy:publish resolver="zodiac-${publication.resolver.prefix}-bundle-publish" overwrite="true" pubdate="${timestamp}" status="${release.type}">
- <artifacts pattern="${ivy.output.dir}/[artifact].[ext]"/>
- <artifacts pattern="${jar.output.dir}/[artifact].[ext]"/>
- <artifacts pattern="${source-jar.output.dir}/[artifact].[ext]"/>
- </ivy:publish>
- </target>
-
<target name="publish-maven" depends="create.pom, snapshot.pom, maven.init" unless="local.build">
<maven:deploy file="${jar.output.file}">
<remoteRepository url="scp://build.eclipse.org/opt/public/rt/virgo/maven/bundles/${adjusted.release.type}">
diff --git a/docbook/publish.xml b/docbook/publish.xml
index acd8511..0804ae1 100644
--- a/docbook/publish.xml
+++ b/docbook/publish.xml
@@ -15,19 +15,8 @@
<import file="common.xml"/>
<import file="../common/publish.xml"/>
-
- <target name="publish-ivy-zodiac" depends="ivy.init, resolve">
- <delete quiet="true" file="${ivy.output.file}"/>
- <mkdir dir="${ivy.output.dir}" />
- <ivy:publish resolver="zodiac-${publication.resolver.prefix}-bundle-publish" overwrite="true" pubdate="${timestamp}" status="${release.type}">
- <artifacts pattern="${docbook.output.dir}/html/[artifact].[ext]"/>
- <artifacts pattern="${docbook.output.dir}/htmlsingle/[artifact].[ext]"/>
- <!-- <artifacts pattern="${docbook.output.dir}/pdf/[artifact].[ext]"/> -->
- <artifacts pattern="${ivy.output.dir}/[artifact].[ext]"/>
- </ivy:publish>
- </target>
- <target name="publish-ivy-eclipse" depends="ivy.init, resolve">
+ <target name="publish-ivy" depends="ivy.init, resolve">
<delete quiet="true" file="${ivy.output.file}"/>
<mkdir dir="${ivy.output.dir}" />
<ivy:publish resolver="eclipse-${publication.resolver.prefix}-bundle-publish" overwrite="true" pubdate="${timestamp}" status="${release.type}">
@@ -38,12 +27,20 @@
</ivy:publish>
</target>
- <target name="publish-maven"/>
+ <target name="publish-maven" depends="create.pom, snapshot.pom, maven.init" unless="local.build">
+ <maven:deploy >
+ <remoteRepository url="scp://build.eclipse.org/opt/public/rt/virgo/maven/bundles/${adjusted.release.type}">
+ <authentication username="${eclipse.buildId}" privateKey="${key.file}"/>
+ </remoteRepository>
+ <pom file="${pom.output.file}"/>
+ <attach file="${source-jar.output.file}" classifier="sources"/>
+ </maven:deploy>
+ </target>
- <!--target name="publish-maven-central"/-->
-
- <target name="install-maven"/>
-
- <!--target name="install-maven-central"/-->
+ <target name="install-maven" depends="create.pom, snapshot.pom, maven.init">
+ <maven:install >
+ <pom file="${pom.output.file}"/>
+ </maven:install>
+ </target>
</project>
diff --git a/library/publish.xml b/library/publish.xml
index 6c2efa6..63126be 100644
--- a/library/publish.xml
+++ b/library/publish.xml
@@ -16,16 +16,7 @@
<import file="common.xml"/>
<import file="../common/publish.xml"/>
- <target name="publish-ivy-zodiac" depends="ivy.init, resolve">
- <delete quiet="true" file="${ivy.output.file}"/>
- <mkdir dir="${ivy.output.dir}" />
- <ivy:publish resolver="zodiac-${publication.resolver.prefix}-library-publish" overwrite="true" pubdate="${timestamp}" status="${release.type}">
- <artifacts pattern="${libd.output.dir}/[artifact].[ext]"/>
- <artifacts pattern="${ivy.output.dir}/[artifact].[ext]"/>
- </ivy:publish>
- </target>
-
- <target name="publish-ivy-eclipse" depends="ivy.init, resolve">
+ <target name="publish-ivy" depends="ivy.init, resolve">
<delete quiet="true" file="${ivy.output.file}"/>
<mkdir dir="${ivy.output.dir}" />
<ivy:publish resolver="eclipse-${publication.resolver.prefix}-library-publish" overwrite="true" pubdate="${timestamp}" status="${release.type}">
@@ -33,38 +24,22 @@
<artifacts pattern="${ivy.output.dir}/[artifact].[ext]"/>
</ivy:publish>
</target>
-
- <target name="publish-maven" depends="create.pom, ivy.init, maven.init, resolve" unless="local.build">
+
+ <target name="publish-maven" depends="create.pom, snapshot.pom, maven.init" unless="local.build">
<maven:deploy file="${libd.output.file}">
- <remoteRepository url="s3://${publish.bucket}/maven/libraries/${adjusted.release.type}">
- <authentication username="${accessKey}" passphrase="${secretKey}"/>
+ <remoteRepository url="scp://build.eclipse.org/opt/public/rt/virgo/maven/bundles/${adjusted.release.type}">
+ <authentication username="${eclipse.buildId}" privateKey="${key.file}"/>
</remoteRepository>
<pom file="${pom.output.file}"/>
</maven:deploy>
</target>
- <!--target name="publish-maven-central" depends="maven.init">
- <property name="maven.central.repository" value="s3://maven.springframework.org/${adjusted.release.type}"/>
- <maven:deploy file="${libd.output.file}">
- <remoteRepository url="${maven.central.repository}">
- <authentication username="${accessKey}" passphrase="${secretKey}"/>
- </remoteRepository>
- <pom file="${local.pom.output.file}"/>
- </maven:deploy>
- </target-->
-
<target name="install-maven" depends="create.pom, snapshot.pom, maven.init">
<maven:install file="${libd.output.file}">
<pom file="${pom.output.file}"/>
</maven:install>
</target>
- <!--target name="install-maven-central" depends="maven.init">
- <maven:install file="${libd.output.file}">
- <pom file="${local.pom.output.file}"/>
- </maven:install>
- </target-->
-
<target name="create.pom" depends="ivy.init, resolve">
<delete quiet="true" file="${pom.output.file}"/>
<mkdir dir="${pom.output.dir}"/>
diff --git a/multi-bundle/publish.xml b/multi-bundle/publish.xml
index f0edc11..b30f60f 100644
--- a/multi-bundle/publish.xml
+++ b/multi-bundle/publish.xml
@@ -11,34 +11,20 @@
* VMware Inc. - initial contribution
******************************************************************************
-->
-<project name="publish-multi-bundle" xmlns:ivy="antlib:org.apache.ivy.ant"
- xmlns:aws="antlib:org.springframework.build.aws">
+<project name="publish-multi-bundle" xmlns:ivy="antlib:org.apache.ivy.ant">
<import file="common.xml"/>
<!-- Main targets -->
- <target name="publish"
- description="Publishes all artifacts to remote repositories">
+ <target name="publish" description="Publishes all artifacts to remote repositories">
<all-bundles target="publish"/>
</target>
- <target name="publish-eclipse"
- description="Publishes all artifacts to remote repositories">
- <all-bundles target="publish-eclipse"/>
- </target>
-
- <target name="publish-ivy-zodiac"
- description="Publishes all ivy artifacts to remote repositories">
- <all-bundles target="publish-ivy-zodiac"/>
+ <target name="publish-ivy" description="Publishes all ivy artifacts to remote repositories">
+ <all-bundles target="publish-ivy"/>
</target>
- <target name="publish-ivy-eclipse"
- description="Publishes all ivy artifacts to remote repositories">
- <all-bundles target="publish-ivy-eclipse"/>
- </target>
-
- <target name="publish-maven"
- description="Publishes all maven artifacts to remote repositories">
+ <target name="publish-maven" description="Publishes all maven artifacts to remote repositories">
<all-bundles target="publish-maven"/>
</target>
@@ -63,29 +49,7 @@
</move>
</target>
- <target name="publish-package-amazon" depends="aws.init">
- <fail message="The 'project.name' property must be set on this project.">
- <condition>
- <not>
- <isset property="project.name"/>
- </not>
- </condition>
- </fail>
- <checksum file="${package.output.file}" algorithm="sha1"/>
- <aws:s3 accessKey="${accessKey}" secretKey="${secretKey}">
- <upload bucketName="${zodiac.basename}" file="${package.output.file}" toFile="zips/${adjusted.release.type}/${project.key}/${bundle.version}/${package.file.name}" publicRead="true">
- <metadata name="project.name" value="${project.name}"/>
- <metadata name="release.type" value="${release.type}"/>
- <metadata name="bundle.version" value="${bundle.version}"/>
- <metadata name="package.file.name" value="${package.file.name}"/>
- </upload>
- <upload bucketName="${zodiac.basename}" file="${package.output.file}.sha1"
- toFile="zips/${adjusted.release.type}/${project.key}/${bundle.version}/${package.file.name}.sha1" publicRead="true">
- </upload>
- </aws:s3>
- </target>
-
- <target name="publish-package-eclipse-build">
+ <target name="publish-package-build">
<fail message="The 'project.name' property must be set on this project.">
<condition>
<not>
@@ -109,7 +73,7 @@
passphrase="${passphrase}" />
</target>
- <target name="publish-package-eclipse-download">
+ <target name="publish-package-download">
<fail message="The 'project.name' property must be set on this project.">
<condition>
<not>
@@ -133,14 +97,4 @@
passphrase="${passphrase}" />
</target>
-<!-- Other targets -->
- <target name="aws.init" depends="ivy.init">
- <ivy:cachepath resolveId="spring.aws.ant.classpath" pathid="spring.aws.ant.classpath"
- organisation="org.springframework.build" module="org.springframework.build.aws.ant"
- revision="${org.springframework.build.aws.ant.version}" conf="runtime" type="jar" inline="true"
- log="download-only"/>
- <taskdef resource="org/springframework/build/aws/ant/antlib.xml" uri="antlib:org.springframework.build.aws"
- classpathref="spring.aws.ant.classpath" />
- </target>
-
</project>
diff --git a/par/publish.xml b/par/publish.xml
index 95f5f7e..b0a1375 100644
--- a/par/publish.xml
+++ b/par/publish.xml
@@ -16,17 +16,7 @@
<import file="common.xml"/>
<import file="../common/publish.xml"/>
- <target name="publish-ivy-zodiac" depends="ivy.init, resolve">
- <delete quiet="true" file="${ivy.output.file}"/>
- <mkdir dir="${ivy.output.dir}" />
- <ivy:publish resolver="zodiac-${publication.resolver.prefix}-bundle-publish" overwrite="true" pubdate="${timestamp}" status="${release.type}">
- <artifacts pattern="${par.output.dir}/[artifact].[ext]"/>
- <artifacts pattern="${source-jar.output.dir}/[artifact].[ext]"/>
- <artifacts pattern="${ivy.output.dir}/[artifact].[ext]"/>
- </ivy:publish>
- </target>
-
- <target name="publish-ivy-eclipse" depends="ivy.init, resolve">
+ <target name="publish-ivy" depends="ivy.init, resolve">
<delete quiet="true" file="${ivy.output.file}"/>
<mkdir dir="${ivy.output.dir}" />
<ivy:publish resolver="eclipse-${publication.resolver.prefix}-bundle-publish" overwrite="true" pubdate="${timestamp}" status="${release.type}">
@@ -36,35 +26,19 @@
</ivy:publish>
</target>
- <target name="publish-maven" depends="create.pom, ivy.init, maven.init, resolve" unless="local.build">
+ <target name="publish-maven" depends="create.pom, snapshot.pom, maven.init" unless="local.build">
<maven:deploy file="${par.output.file}">
- <remoteRepository url="s3://${publish.bucket}/maven/bundles/${adjusted.release.type}">
- <authentication username="${accessKey}" passphrase="${secretKey}"/>
+ <remoteRepository url="scp://build.eclipse.org/opt/public/rt/virgo/maven/bundles/${adjusted.release.type}">
+ <authentication username="${eclipse.buildId}" privateKey="${key.file}"/>
</remoteRepository>
<pom file="${pom.output.file}"/>
</maven:deploy>
</target>
- <!--target name="publish-maven-central" depends="maven.init">
- <property name="maven.central.repository" value="s3://maven.springframework.org/${adjusted.release.type}"/>
- <maven:deploy file="${par.output.file}">
- <remoteRepository url="${maven.central.repository}">
- <authentication username="${accessKey}" passphrase="${secretKey}"/>
- </remoteRepository>
- <pom file="${local.pom.output.file}"/>
- </maven:deploy>
- </target-->
-
<target name="install-maven" depends="create.pom, snapshot.pom, maven.init">
<maven:install file="${par.output.file}">
<pom file="${pom.output.file}"/>
</maven:install>
</target>
- <!--target name="install-maven-central" depends="maven.init">
- <maven:install file="${par.output.file}">
- <pom file="${local.pom.output.file}"/>
- </maven:install>
- </target-->
-
</project>
diff --git a/resource/publish.xml b/resource/publish.xml
index 7a37633..b612422 100644
--- a/resource/publish.xml
+++ b/resource/publish.xml
@@ -16,56 +16,31 @@
<import file="common.xml"/>
<import file="../common/publish.xml"/>
- <target name="publish-ivy-zodiac" depends="ivy.init, resolve">
+ <target name="publish-ivy" depends="ivy.init, resolve">
<delete quiet="true" file="${ivy.output.file}"/>
<mkdir dir="${ivy.output.dir}" />
- <ivy:publish resolver="zodiac-${publication.resolver.prefix}-library-publish" overwrite="true" pubdate="${timestamp}" status="${release.type}">
- <artifacts pattern="${artifacts.dir}/[artifact].[ext]"/>
- <artifacts pattern="${ivy.output.dir}/[artifact].[ext]"/>
- </ivy:publish>
- </target>
-
- <target name="publish-ivy-eclipse" depends="ivy.init, resolve">
- <delete quiet="true" file="${ivy.output.file}"/>
- <mkdir dir="${ivy.output.dir}" />
-
<ivy:publish resolver="eclipse-${publication.resolver.prefix}-library-publish" overwrite="true" pubdate="${timestamp}" status="${release.type}">
<artifacts pattern="${artifacts.dir}/[artifact].[ext]"/>
<artifacts pattern="${ivy.output.dir}/[artifact].[ext]"/>
</ivy:publish>
</target>
- <target name="publish-maven" depends="create.pom, ivy.init, maven.init, resolve" unless="local.build">
+ <target name="publish-maven" depends="create.pom, snapshot.pom, maven.init" unless="local.build">
<maven:deploy>
- <remoteRepository url="s3://${publish.bucket}/maven/libraries/${adjusted.release.type}">
- <authentication username="${accessKey}" passphrase="${secretKey}"/>
+ <remoteRepository url="scp://build.eclipse.org/opt/public/rt/virgo/maven/bundles/${adjusted.release.type}">
+ <authentication username="${eclipse.buildId}" privateKey="${key.file}"/>
</remoteRepository>
<pom file="${pom.output.file}"/>
+ <attach file="${source-jar.output.file}" classifier="sources"/>
</maven:deploy>
</target>
- <!--target name="publish-maven-central" depends="maven.init">
- <property name="maven.central.repository" value="s3://maven.springframework.org/${adjusted.release.type}"/>
- <maven:deploy>
- <remoteRepository url="${maven.central.repository}">
- <authentication username="${accessKey}" passphrase="${secretKey}"/>
- </remoteRepository>
- <pom file="${local.pom.output.file}"/>
- </maven:deploy>
- </target-->
-
<target name="install-maven" depends="create.pom, snapshot.pom, maven.init">
<maven:install>
<pom file="${pom.output.file}"/>
</maven:install>
</target>
- <!--target name="install-maven-central" depends="maven.init">
- <maven:install>
- <pom file="${local.pom.output.file}"/>
- </maven:install>
- </target-->
-
<target name="create.pom" depends="ivy.init, resolve">
<delete quiet="true" file="${pom.output.file}"/>
<mkdir dir="${pom.output.dir}"/>
diff --git a/war/publish.xml b/war/publish.xml
index e014b5d..739fb7d 100644
--- a/war/publish.xml
+++ b/war/publish.xml
@@ -16,17 +16,7 @@
<import file="common.xml"/>
<import file="../common/publish.xml"/>
- <target name="publish-ivy-zodiac" depends="ivy.init, resolve">
- <delete quiet="true" file="${ivy.output.file}"/>
- <mkdir dir="${ivy.output.dir}" />
- <ivy:publish resolver="zodiac-${publication.resolver.prefix}-bundle-publish" overwrite="true" pubdate="${timestamp}" status="${release.type}">
- <artifacts pattern="${war.output.dir}/[artifact].[ext]"/>
- <artifacts pattern="${source-jar.output.dir}/[artifact].[ext]"/>
- <artifacts pattern="${ivy.output.dir}/[artifact].[ext]"/>
- </ivy:publish>
- </target>
-
- <target name="publish-ivy-eclipse" depends="ivy.init, resolve">
+ <target name="publish-ivy" depends="ivy.init, resolve">
<delete quiet="true" file="${ivy.output.file}"/>
<mkdir dir="${ivy.output.dir}" />
<ivy:publish resolver="eclipse-${publication.resolver.prefix}-bundle-publish" overwrite="true" pubdate="${timestamp}" status="${release.type}">
@@ -38,8 +28,8 @@
<target name="publish-maven" depends="create.pom, snapshot.pom, maven.init" unless="local.build">
<maven:deploy file="${war.output.file}">
- <remoteRepository url="s3://${publish.bucket}/maven/bundles/${adjusted.release.type}">
- <authentication username="${accessKey}" passphrase="${secretKey}"/>
+ <remoteRepository url="scp://build.eclipse.org/opt/public/rt/virgo/maven/bundles/${adjusted.release.type}">
+ <authentication username="${eclipse.buildId}" privateKey="${key.file}"/>
</remoteRepository>
<pom file="${pom.output.file}"/>
<attach file="${source-jar.output.file}" classifier="sources"/>
