diff options
author | Andrew M Finkbeiner | 2012-06-11 19:39:43 +0000 |
---|---|---|
committer | Andrew M Finkbeiner | 2012-06-11 21:25:02 +0000 |
commit | 41f900c7298c02eee592270084ea7c572cd2ec25 (patch) | |
tree | c61648d0d190afaed49cd5d172eca830723b6312 | |
parent | cade3dde771969cdf5090d92f3bd5c4e61516a80 (diff) | |
download | org.eclipse.osee-41f900c7298c02eee592270084ea7c572cd2ec25.tar.gz org.eclipse.osee-41f900c7298c02eee592270084ea7c572cd2ec25.tar.xz org.eclipse.osee-41f900c7298c02eee592270084ea7c572cd2ec25.zip |
bug: Move repo definition to profile for 0.14.1 compatibility
-rw-r--r-- | plugins/org.eclipse.osee.client.parent/pom.xml | 34 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.orcs.parent/pom.xml | 20 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.ote.parent/pom.xml | 20 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.runtime.parent/pom.xml | 19 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.x.server.parent/pom.xml | 36 |
5 files changed, 93 insertions, 36 deletions
diff --git a/plugins/org.eclipse.osee.client.parent/pom.xml b/plugins/org.eclipse.osee.client.parent/pom.xml index a3add132aca..53be85d763c 100644 --- a/plugins/org.eclipse.osee.client.parent/pom.xml +++ b/plugins/org.eclipse.osee.client.parent/pom.xml @@ -164,16 +164,6 @@ <layout>p2</layout> <url>${nebula-site}</url> </repository> - <repository> - <id>osee-runtime</id> - <layout>p2</layout> - <url>${osee-runtime-site}</url> - </repository> - <repository> - <id>osee-xserver</id> - <layout>p2</layout> - <url>${osee-xserver-site}</url> - </repository> </repositories> <build> @@ -561,6 +551,18 @@ <osee-xserver-site>${osee-xserver-site-path}/org.eclipse.osee.x.server.p2/target/repository</osee-xserver-site> </properties> + <repositories> + <repository> + <id>osee-runtime</id> + <layout>p2</layout> + <url>${osee-runtime-site}</url> + </repository> + <repository> + <id>osee-xserver</id> + <layout>p2</layout> + <url>${osee-xserver-site}</url> + </repository> + </repositories> </profile> <profile> @@ -577,6 +579,18 @@ <osee-xserver-site-version>DEV</osee-xserver-site-version> <osee-xserver-site>${osee-xserver-site-path}/${osee-xserver-site-version}/org.eclipse.osee/org.eclipse.osee.x.server.p2</osee-xserver-site> </properties> + <repositories> + <repository> + <id>osee-runtime</id> + <layout>p2</layout> + <url>${osee-runtime-site}</url> + </repository> + <repository> + <id>osee-xserver</id> + <layout>p2</layout> + <url>${osee-xserver-site}</url> + </repository> + </repositories> </profile> </profiles> diff --git a/plugins/org.eclipse.osee.orcs.parent/pom.xml b/plugins/org.eclipse.osee.orcs.parent/pom.xml index 37732812e0a..7eb8318eeb2 100644 --- a/plugins/org.eclipse.osee.orcs.parent/pom.xml +++ b/plugins/org.eclipse.osee.orcs.parent/pom.xml @@ -105,11 +105,7 @@ <layout>p2</layout> <url>${itemis-site}</url> </repository> - <repository> - <id>osee-xcore</id> - <layout>p2</layout> - <url>${osee-xcore-site}</url> - </repository> + </repositories> <build> @@ -465,6 +461,13 @@ <osee-xcore-site-path>file:../../../org.eclipse.osee/plugins</osee-xcore-site-path> <osee-xcore-site>${osee-xcore-site-path}/org.eclipse.osee.x.core.p2/target/repository</osee-xcore-site> </properties> + <repositories> + <repository> + <id>osee-xcore</id> + <layout>p2</layout> + <url>${osee-xcore-site}</url> + </repository> + </repositories> </profile> <profile> @@ -477,6 +480,13 @@ <osee-xcore-site-version>DEV/org.eclipse.osee</osee-xcore-site-version> <osee-xcore-site>${osee-xcore-site-path}/org.eclipse.osee.x.core.p2</osee-xcore-site> </properties> + <repositories> + <repository> + <id>osee-xcore</id> + <layout>p2</layout> + <url>${osee-xcore-site}</url> + </repository> + </repositories> </profile> </profiles> diff --git a/plugins/org.eclipse.osee.ote.parent/pom.xml b/plugins/org.eclipse.osee.ote.parent/pom.xml index a082b9548e3..910f084895d 100644 --- a/plugins/org.eclipse.osee.ote.parent/pom.xml +++ b/plugins/org.eclipse.osee.ote.parent/pom.xml @@ -130,11 +130,6 @@ <layout>p2</layout> <url>${nebula-site}</url> </repository> - <repository> - <id>osee-runtime</id> - <layout>p2</layout> - <url>${osee-runtime-site}</url> - </repository> </repositories> <build> @@ -518,6 +513,13 @@ <osee-runtime-site-path>file:../../../org.eclipse.osee/plugins</osee-runtime-site-path> <osee-runtime-site>${osee-runtime-site-path}/org.eclipse.osee.runtime.p2/target/repository</osee-runtime-site> </properties> + <repositories> + <repository> + <id>osee-runtime</id> + <layout>p2</layout> + <url>${osee-runtime-site}</url> + </repository> + </repositories> </profile> <profile> @@ -530,6 +532,14 @@ <osee-runtime-site-version>DEV</osee-runtime-site-version> <osee-runtime-site>${osee-runtime-site-path}/${osee-runtime-site-version}/org.eclipse.osee/org.eclipse.osee.runtime.p2</osee-runtime-site> </properties> + <repositories> + <repository> + <id>osee-runtime</id> + <layout>p2</layout> + <url>${osee-runtime-site}</url> + </repository> + </repositories> + </profile> </profiles> diff --git a/plugins/org.eclipse.osee.runtime.parent/pom.xml b/plugins/org.eclipse.osee.runtime.parent/pom.xml index b2c217e4e5a..07bc50344ed 100644 --- a/plugins/org.eclipse.osee.runtime.parent/pom.xml +++ b/plugins/org.eclipse.osee.runtime.parent/pom.xml @@ -125,11 +125,6 @@ <layout>p2</layout> <url>${nebula-site}</url> </repository> - <repository> - <id>osee-xserver</id> - <layout>p2</layout> - <url>${osee-xserver-site}</url> - </repository> </repositories> <build> @@ -503,6 +498,13 @@ <osee-xserver-site-path>file:../../../org.eclipse.osee/plugins</osee-xserver-site-path> <osee-xserver-site>${osee-xserver-site-path}/org.eclipse.osee.x.server.p2/target/repository</osee-xserver-site> </properties> + <repositories> + <repository> + <id>osee-xserver</id> + <layout>p2</layout> + <url>${osee-xserver-site}</url> + </repository> + </repositories> </profile> <profile> @@ -515,6 +517,13 @@ <osee-xserver-site-version>DEV</osee-xserver-site-version> <osee-xserver-site>${osee-xserver-site-path}/${osee-xserver-site-version}/org.eclipse.osee/org.eclipse.osee.x.server.p2</osee-xserver-site> </properties> + <repositories> + <repository> + <id>osee-xserver</id> + <layout>p2</layout> + <url>${osee-xserver-site}</url> + </repository> + </repositories> </profile> </profiles> diff --git a/plugins/org.eclipse.osee.x.server.parent/pom.xml b/plugins/org.eclipse.osee.x.server.parent/pom.xml index 3be5f832f2b..1306b01623a 100644 --- a/plugins/org.eclipse.osee.x.server.parent/pom.xml +++ b/plugins/org.eclipse.osee.x.server.parent/pom.xml @@ -114,16 +114,6 @@ <layout>p2</layout> <url>${eclipse-ip-site}</url> </repository> - <repository> - <id>osee-xcore</id> - <layout>p2</layout> - <url>${osee-xcore-site}</url> - </repository> - <repository> - <id>osee-orcs</id> - <layout>p2</layout> - <url>${osee-orcs-site}</url> - </repository> </repositories> <build> @@ -491,7 +481,7 @@ <profile> <id>osee-local-sites</id> <activation> - <activeByDefault>true</activeByDefault> + <activeByDefault>false</activeByDefault> </activation> <properties> <eclipse-ip-site-path>file:../../../org.eclipse.ip</eclipse-ip-site-path> @@ -503,6 +493,18 @@ <osee-orcs-site-path>file:../../../org.eclipse.osee/plugins</osee-orcs-site-path> <osee-orcs-site>${osee-orcs-site-path}/org.eclipse.osee.orcs.p2/target/repository</osee-orcs-site> </properties> + <repositories> + <repository> + <id>osee-xcore</id> + <layout>p2</layout> + <url>${osee-xcore-site}</url> + </repository> + <repository> + <id>osee-orcs</id> + <layout>p2</layout> + <url>${osee-orcs-site}</url> + </repository> + </repositories> </profile> <profile> @@ -523,6 +525,18 @@ <osee-orcs-site-version>DEV</osee-orcs-site-version> <osee-orcs-site>${osee-orcs-site-path}/${osee-orcs-site-version}/org.eclipse.osee/org.eclipse.osee.orcs.p2</osee-orcs-site> </properties> + <repositories> + <repository> + <id>osee-xcore</id> + <layout>p2</layout> + <url>${osee-xcore-site}</url> + </repository> + <repository> + <id>osee-orcs</id> + <layout>p2</layout> + <url>${osee-orcs-site}</url> + </repository> + </repositories> </profile> </profiles> |