removed use of properties for deploymentManagement, now deployment management is just in profiles (backport cherrypicked from master)
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/f4759a88 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/f4759a88 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/f4759a88 Branch: refs/heads/0.4.0 Commit: f4759a88bdec773195532e9fde31343ec334b9c2 Parents: 27b8a41 Author: Alex Heneveld <[email protected]> Authored: Mon Jan 14 18:34:22 2013 +0000 Committer: Alex Heneveld <[email protected]> Committed: Mon Jan 14 18:46:09 2013 +0000 ---------------------------------------------------------------------- pom.xml | 75 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 37 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f4759a88/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a290a8c..9f1b310 100644 --- a/pom.xml +++ b/pom.xml @@ -57,6 +57,7 @@ </scm> <repositories> + <!-- enable sonatype snapshots repo (only for snapshots) --> <repository> <id>sonatype-nexus-snapshots</id> <name>Sonatype Nexus Snapshots</name> @@ -66,20 +67,6 @@ </repository> </repositories> - <distributionManagement> - <!-- defined below in profiles so we can easily target multiple repos --> - <repository> - <id>${repo_id}</id> - <name>${repo_name}</name> - <url>${repo_url}</url> - </repository> - <snapshotRepository> - <id>${snapshot_repo_id}</id> - <name>${snapshot_repo_name}</name> - <url>${snapshot_repo_url}</url> - </snapshotRepository> - </distributionManagement> - <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> @@ -1098,38 +1085,50 @@ <profile> <id>cloudsoft-filesystem-repo</id> <activation> <property><name>brooklyn.deployTo</name><value>cloudsoftFilesystem</value></property> </activation> - <properties> - <repo_id>cloudsoft-deploy-cloudfront-origin-releases</repo_id> - <repo_name>Cloudsoft Release Filesystem repo (used as origin for cloudfront)</repo_name> - <repo_url>scpexe://[email protected]/var/www/developers/maven/releases/</repo_url> - <snapshot_repo_id>cloudsoft-deploy-cloudfront-origin-snapshots</snapshot_repo_id> - <snapshot_repo_name>Cloudsoft Snapshot Filesystem repo (used as origin for cloudfront)</snapshot_repo_name> - <snapshot_repo_url>scpexe://[email protected]/var/www/developers/maven/snapshots/</snapshot_repo_url> - </properties> + <distributionManagement> + <repository> + <id>cloudsoft-deploy-cloudfront-origin-releases</id> + <name>Cloudsoft Release Filesystem repo (used as origin for cloudfront)</name> + <url>scpexe://[email protected]/var/www/developers/maven/releases/</url> + </repository> + <snapshotRepository> + <id>cloudsoft-deploy-cloudfront-origin-snapshots</id> + <name>Cloudsoft Snapshot Filesystem repo (used as origin for cloudfront)</name> + <url>scpexe://[email protected]/var/www/developers/maven/snapshots/</url> + </snapshotRepository> + </distributionManagement> </profile> <profile> <id>cloudsoft-artifactory-repo</id> <activation> <property><name>brooklyn.deployTo</name><value>cloudsoftArtifactory</value></property> </activation> - <properties> - <repo_id>cloudsoft-deploy-artifactory-release</repo_id> - <repo_name>Cloudsoft Artifactory libs-release-local repo</repo_name> - <repo_url>http://ccweb.cloudsoftcorp.com/maven/libs-release-local/</repo_url> - <snapshot_repo_id>cloudsoft-deploy-artifactory-snapshot</snapshot_repo_id> - <snapshot_repo_name>Cloudsoft Artifactory libs-snapshot-local repo</snapshot_repo_name> - <snapshot_repo_url>http://ccweb.cloudsoftcorp.com/maven/libs-snapshot-local/</snapshot_repo_url> - </properties> + <distributionManagement> + <repository> + <id>cloudsoft-deploy-artifactory-release</id> + <name>Cloudsoft Artifactory libs-release-local repo</name> + <url>http://ccweb.cloudsoftcorp.com/maven/libs-release-local/</url> + </repository> + <snapshotRepository> + <id>cloudsoft-deploy-artifactory-snapshot</id> + <name>Cloudsoft Artifactory libs-snapshot-local repo</name> + <url>http://ccweb.cloudsoftcorp.com/maven/libs-snapshot-local/</url> + </snapshotRepository> + </distributionManagement> </profile> <profile> <id>sonatype-nexus-repo</id> <activation> <property><name>brooklyn.deployTo</name><value>sonatype</value></property> </activation> - <properties> - <repo_id>sonatype-nexus-staging</repo_id> - <repo_name>Nexus Release Repository</repo_name> - <repo_url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</repo_url> - <snapshot_repo_id>sonatype-nexus-snapshots</snapshot_repo_id> - <snapshot_repo_name>Sonatype Nexus Snapshots</snapshot_repo_name> - <snapshot_repo_url>https://oss.sonatype.org/content/repositories/snapshots/</snapshot_repo_url> - </properties> + <distributionManagement> + <repository> + <id>sonatype-nexus-staging</id> + <name>Nexus Release Repository</name> + <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url> + </repository> + <snapshotRepository> + <id>sonatype-nexus-snapshots</id> + <name>Sonatype Nexus Snapshots</name> + <url>https://oss.sonatype.org/content/repositories/snapshots/</url> + </snapshotRepository> + </distributionManagement> </profile> </profiles>
