Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Herrmann2010-10-18 12:08:59 -0400
committerStephan Herrmann2010-10-18 12:08:59 -0400
commit42cf4d3f279746a94db569500fc24bfc0abaa7e6 (patch)
tree99b3619062e43c805d78f4933a3e5ce7258baf4b /maven/infrastructure
parentcef99e91f85c3b0d00aaf0f2e8e22949ba0c5188 (diff)
downloadorg.eclipse.objectteams-42cf4d3f279746a94db569500fc24bfc0abaa7e6.tar.gz
org.eclipse.objectteams-42cf4d3f279746a94db569500fc24bfc0abaa7e6.tar.xz
org.eclipse.objectteams-42cf4d3f279746a94db569500fc24bfc0abaa7e6.zip
several path issues:
* corrected repository paths in artifact-deployer * avoid property prefix "project." (might interfere with built-in properties) * better document a workaround for unexplained maven behavior.
Diffstat (limited to 'maven/infrastructure')
-rw-r--r--maven/infrastructure/artifact-deployer/pom.xml16
1 files changed, 8 insertions, 8 deletions
diff --git a/maven/infrastructure/artifact-deployer/pom.xml b/maven/infrastructure/artifact-deployer/pom.xml
index 5f4b848d3..f99e4c9b7 100644
--- a/maven/infrastructure/artifact-deployer/pom.xml
+++ b/maven/infrastructure/artifact-deployer/pom.xml
@@ -59,14 +59,14 @@
<otre-agent.jar.file>${otdt.lib.dir}/otre_agent.jar</otre-agent.jar.file>
<!-- Repository path of this module within the Object Teams svn: -->
- <project.repository.path>trunk/maven/infrastructure/artifacts-deployer</project.repository.path>
+ <project-repository-path>trunk/maven/infrastructure/artifacts-deployer</project-repository-path>
</properties>
- <!-- Override inherited declaration (redefining relative.repository.path is not picked up by the inherited declaration): -->
+ <!-- Override inherited declaration, otherwise Maven appends the artifactId to the path -->
<scm>
- <connection>scm:svn:svn://dev.eclipse.org/svnroot/tools/org.eclipse.objectteams/${project.repository.path}</connection>
- <developerConnection>scm:svn:svn+ssh://dev.eclipse.org/svnroot/tools/org.eclipse.objectteams/${project.repository.path}</developerConnection>
- <url>http://dev.eclipse.org/viewcvs/index.cgi/${project.repository.path}?root=TOOLS_OBJECTTEAMS</url>
+ <connection>scm:svn:svn://dev.eclipse.org/svnroot/tools/org.eclipse.objectteams/${project-repository-path}</connection>
+ <developerConnection>scm:svn:svn+ssh://dev.eclipse.org/svnroot/tools/org.eclipse.objectteams/${project-repository-path}</developerConnection>
+ <url>http://dev.eclipse.org/viewcvs/index.cgi/${project-repository-path}?root=TOOLS_OBJECTTEAMS</url>
</scm>
<!-- simply repeat this declaration from the parent pom, otherwise Maven duplicates the artifactId in the path -->
@@ -94,7 +94,7 @@
<configuration>
<repositoryId>otEclipseRepo</repositoryId>
<packaging>jar</packaging>
- <url>scpexe://${ot.host}:${ot.maven.repository.path}</url>
+ <url>scpexe://${ot.host}:${ot.maven.repository.basepath}/repository</url>
<!-- The file to be deployed -->
<file>${otre.jar.file}</file>
<groupId>${project.groupId}</groupId>
@@ -112,7 +112,7 @@
<configuration>
<repositoryId>otEclipseRepo</repositoryId>
<packaging>jar</packaging>
- <url>scpexe://${ot.host}:${ot.maven.repository.path}</url>
+ <url>scpexe://${ot.host}:${ot.maven.repository.basepath}/repository</url>
<!-- The file to be deployed -->
<file>${otre-agent.jar.file}</file>
<groupId>${project.groupId}</groupId>
@@ -131,7 +131,7 @@
<configuration>
<repositoryId>otEclipseRepo</repositoryId>
<packaging>jar</packaging>
- <url>scpexe://${ot.host}:${ot.maven.repository.path}</url>
+ <url>scpexe://${ot.host}:${ot.maven.repository.basepath}/repository</url>
<!-- The file to be deployed -->
<file>${ecotj.jar.file}</file>
<groupId>${project.groupId}</groupId>

Back to the top