correct the settings for the p2 builds
dependencies, technologystack and softwarefactory
diff --git a/org.eclipse.osbp.releng.maven.parent.tycho/pom.xml b/org.eclipse.osbp.releng.maven.parent.tycho/pom.xml
index b5cca03..0bda88e 100644
--- a/org.eclipse.osbp.releng.maven.parent.tycho/pom.xml
+++ b/org.eclipse.osbp.releng.maven.parent.tycho/pom.xml
@@ -35,7 +35,7 @@
stage repository -->
<osbp.build.local.federated.p2.dir>${osbp.stage.p2.technologystack.target.dir.base}${file.separator}${osbp.build.branch}${file.separator}</osbp.build.local.federated.p2.dir>
<osbp.build.local.federated.p2.url>file://${osbp.build.local.federated.p2.dir}</osbp.build.local.federated.p2.url>
- <osbp.build.remote.federated.p2.url>${osbp.p2.base}${file.separator}${osbp.build.branch}${file.separator}${osbp.build.branch}${file.separator}</osbp.build.remote.federated.p2.url>
+ <osbp.build.remote.federated.p2.url>${osbp.p2.base}${osbp.build.eclipse.platform.name}${file.separator}${osbp.build.branch}${file.separator}</osbp.build.remote.federated.p2.url>
<!-- this property is calculated based on the aggregator pom's version -->
<!-- osbp.stage.artifact.version>none</osbp.stage.artifact.version> -->
@@ -460,7 +460,7 @@
<osbp.stage.p2.log.file.path>${project.basedir}${file.separator}build.${osbp.stage.p2.label}.${osbp.build.eclipse.platform.name}.${osbp.build.branch}.log.properties</osbp.stage.p2.log.file.path>
<osbp.stage.p2.origin.dir>${project.build.directory}${file.separator}repository</osbp.stage.p2.origin.dir>
- <osbp.stage.p2.target.dir>${osbp.stage.p2.dependencies.target.dir.base}${file.separator}${osbp.build.branch}${file.separator}${osbp.stage.p2.label}${file.separator}${osbp.stage.artifact.version}</osbp.stage.p2.target.dir>
+ <osbp.stage.p2.target.dir>${osbp.build.local.federated.p2.dir}${osbp.stage.p2.label}${file.separator}${osbp.stage.artifact.version}</osbp.stage.p2.target.dir>
</properties>
<pluginRepositories>
<pluginRepository>
@@ -846,7 +846,7 @@
<osbp.stage.p2.log.file.path>${project.basedir}${file.separator}build.${osbp.stage.p2.label}.${osbp.build.eclipse.platform.name}.${osbp.build.branch}.log.properties</osbp.stage.p2.log.file.path>
<osbp.stage.p2.origin.dir>${project.build.directory}${file.separator}repository</osbp.stage.p2.origin.dir>
- <osbp.stage.p2.target.dir>${osbp.stage.p2.technologystack.target.dir.base}${file.separator}${osbp.build.branch}${file.separator}${osbp.stage.p2.label}${file.separator}${osbp.stage.artifact.version}</osbp.stage.p2.target.dir>
+ <osbp.stage.p2.target.dir>${osbp.build.local.federated.p2.dir}${osbp.stage.p2.label}${file.separator}${osbp.stage.artifact.version}</osbp.stage.p2.target.dir>
</properties>
<pluginRepositories>
<pluginRepository>
@@ -1236,7 +1236,8 @@
<osbp.stage.p2.log.file.path>${project.basedir}${file.separator}build.${osbp.stage.p2.label}.${osbp.build.eclipse.platform.name}.${osbp.build.branch}.log.properties</osbp.stage.p2.log.file.path>
<osbp.stage.p2.origin.dir>${project.build.directory}${file.separator}repository</osbp.stage.p2.origin.dir>
- <osbp.stage.p2.target.dir>${osbp.stage.p2.target.dir.base}${file.separator}${osbp.build.branch}${file.separator}${osbp.stage.p2.label}${file.separator}${osbp.stage.artifact.version}</osbp.stage.p2.target.dir>
+
+ <osbp.stage.p2.target.dir>${osbp.build.local.federated.p2.dir}${osbp.stage.p2.label}${file.separator}${osbp.stage.artifact.version}</osbp.stage.p2.target.dir>
</properties>
<pluginRepositories>
<pluginRepository>
@@ -1253,6 +1254,13 @@
</releases>
</pluginRepository>
</pluginRepositories>
+ <repositories>
+ <repository>
+ <id>OSBP Technologystack Internal P2</id>
+ <url>${osbp.technologystack.p2}</url>
+ <layout>p2</layout>
+ </repository>
+ </repositories>
<build>
<plugins>
<plugin>
diff --git a/pom.xml b/pom.xml
index cf3bfe1..f95f9ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -506,8 +506,9 @@
<osbp.stage.p2.dependencies.target.dir.base>${osbp.developer.home.repositories}${osbp.dependencies.repository.label}${file.separator}${osbp.build.eclipse.platform.name}</osbp.stage.p2.dependencies.target.dir.base>
<osbp.stage.p2.technologystack.target.dir.base>${osbp.developer.home.repositories}${osbp.technologystack.repository.label}${file.separator}${osbp.build.eclipse.platform.name}</osbp.stage.p2.technologystack.target.dir.base>
<osbp.stage.p2.target.dir.base>${osbp.developer.home.repositories}${osbp.federated.repository.label}${file.separator}${osbp.build.eclipse.platform.name}</osbp.stage.p2.target.dir.base>
- <osbp.p2.base>file://${osbp.developer.home.repositories}${osbp.repository.label}${file.separator}</osbp.p2.base>
- <osbp.p2>${osbp.p2.base}technologystack${file.separator}${osbp.build.eclipse.platform.name}${file.separator}${osbp.build.branch}</osbp.p2>
+
+ <osbp.p2.base>file://${osbp.developer.home.repositories}${osbp.federated.repository.label}${file.separator}</osbp.p2.base>
+ <osbp.p2>${osbp.p2.base}${osbp.build.eclipse.platform.name}${file.separator}${osbp.build.branch}</osbp.p2>
<osbp.technologystack.p2>${osbp.p2.base}technologystack${file.separator}${osbp.build.eclipse.platform.name}${file.separator}${osbp.build.branch}</osbp.technologystack.p2>
</properties>
