Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew M Finkbeiner2012-05-30 19:29:32 -0400
committerRoberto E. Escobar2012-05-30 19:29:32 -0400
commit9d3544c1b33196efd979e94c16de8b0f86edcb61 (patch)
tree241ab095bd77e869705d6693ad304d008978dcd1
parent40810abde45538e9302ec5ada54e149d159c29a1 (diff)
downloadorg.eclipse.osee-9d3544c1b33196efd979e94c16de8b0f86edcb61.tar.gz
org.eclipse.osee-9d3544c1b33196efd979e94c16de8b0f86edcb61.tar.xz
org.eclipse.osee-9d3544c1b33196efd979e94c16de8b0f86edcb61.zip
feature[ats_19NDL]: Upgrade to use Tycho 0.14.1
-rw-r--r--plugins/org.eclipse.osee.client.all.parent/pom.xml55
-rw-r--r--plugins/org.eclipse.osee.client.parent/pom.xml4
-rw-r--r--plugins/org.eclipse.osee.orcs.parent/pom.xml4
-rw-r--r--plugins/org.eclipse.osee.ote.client/build.properties3
-rw-r--r--plugins/org.eclipse.osee.ote.jms/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.osee.ote.jms/pom.xml3
-rw-r--r--plugins/org.eclipse.osee.ote.parent/pom.xml4
-rw-r--r--plugins/org.eclipse.osee.ote.ui.message/build.properties3
-rw-r--r--plugins/org.eclipse.osee.runtime.parent/pom.xml4
-rw-r--r--plugins/org.eclipse.osee.x.core.parent/pom.xml2
-rw-r--r--plugins/org.eclipse.osee.x.server.parent/pom.xml2
11 files changed, 51 insertions, 35 deletions
diff --git a/plugins/org.eclipse.osee.client.all.parent/pom.xml b/plugins/org.eclipse.osee.client.all.parent/pom.xml
index 2038fdff7f..3e24d0a3a2 100644
--- a/plugins/org.eclipse.osee.client.all.parent/pom.xml
+++ b/plugins/org.eclipse.osee.client.all.parent/pom.xml
@@ -20,7 +20,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tycho-version>0.13.0</tycho-version>
+ <tycho-version>0.14.1</tycho-version>
<maven-antrun-version>1.6</maven-antrun-version>
<ant-contrib-version>1.0b3</ant-contrib-version>
<jacoco-version>0.5.3.201107060350</jacoco-version>
@@ -103,21 +103,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-ote</id>
- <layout>p2</layout>
- <url>${osee-ote-site}</url>
- </repository>
- <repository>
- <id>osee-client</id>
- <layout>p2</layout>
- <url>${osee-client-site}</url>
- </repository>
</repositories>
<build>
@@ -505,7 +490,7 @@
<profile>
<id>osee-local-sites</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <activeByDefault>false</activeByDefault>
</activation>
<properties>
<osee-runtime-site-path>file:../../../org.eclipse.osee/plugins</osee-runtime-site-path>
@@ -518,6 +503,23 @@
<osee-client-site>${osee-client-site-path}/org.eclipse.osee.client.p2/target/repository</osee-client-site>
</properties>
+ <repositories>
+ <repository>
+ <id>osee-runtime</id>
+ <layout>p2</layout>
+ <url>${osee-runtime-site}</url>
+ </repository>
+ <repository>
+ <id>osee-ote</id>
+ <layout>p2</layout>
+ <url>${osee-ote-site}</url>
+ </repository>
+ <repository>
+ <id>osee-client</id>
+ <layout>p2</layout>
+ <url>${osee-client-site}</url>
+ </repository>
+ </repositories>
</profile>
<profile>
@@ -537,7 +539,26 @@
<osee-client-site-path>file:../../../org.eclipse.osee/plugins</osee-client-site-path>
<osee-client-site-version>DEV</osee-client-site-version>
<osee-client-site>${osee-client-site-path}/${osee-client-site-version}/org.eclipse.osee/org.eclipse.osee.client.p2/target/repository</osee-client-site>
+
+
</properties>
+ <repositories>
+ <repository>
+ <id>osee-runtime</id>
+ <layout>p2</layout>
+ <url>${osee-runtime-site}</url>
+ </repository>
+ <repository>
+ <id>osee-ote</id>
+ <layout>p2</layout>
+ <url>${osee-ote-site}</url>
+ </repository>
+ <repository>
+ <id>osee-client</id>
+ <layout>p2</layout>
+ <url>${osee-client-site}</url>
+ </repository>
+ </repositories>
</profile>
</profiles>
diff --git a/plugins/org.eclipse.osee.client.parent/pom.xml b/plugins/org.eclipse.osee.client.parent/pom.xml
index d4a42ccad8..a3add132ac 100644
--- a/plugins/org.eclipse.osee.client.parent/pom.xml
+++ b/plugins/org.eclipse.osee.client.parent/pom.xml
@@ -76,7 +76,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tycho-version>0.13.0</tycho-version>
+ <tycho-version>0.14.1</tycho-version>
<maven-antrun-version>1.6</maven-antrun-version>
<ant-contrib-version>1.0b3</ant-contrib-version>
<jacoco-version>0.5.3.201107060350</jacoco-version>
@@ -551,7 +551,7 @@
<profile>
<id>osee-local-sites</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <activeByDefault>false</activeByDefault>
</activation>
<properties>
<osee-runtime-site-path>file:../../../org.eclipse.osee/plugins</osee-runtime-site-path>
diff --git a/plugins/org.eclipse.osee.orcs.parent/pom.xml b/plugins/org.eclipse.osee.orcs.parent/pom.xml
index 510d626b99..37732812e0 100644
--- a/plugins/org.eclipse.osee.orcs.parent/pom.xml
+++ b/plugins/org.eclipse.osee.orcs.parent/pom.xml
@@ -46,7 +46,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tycho-version>0.13.0</tycho-version>
+ <tycho-version>0.14.1</tycho-version>
<maven-antrun-version>1.6</maven-antrun-version>
<ant-contrib-version>1.0b3</ant-contrib-version>
<jacoco-version>0.5.3.201107060350</jacoco-version>
@@ -459,7 +459,7 @@
<profile>
<id>osee-local-sites</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <activeByDefault>false</activeByDefault>
</activation>
<properties>
<osee-xcore-site-path>file:../../../org.eclipse.osee/plugins</osee-xcore-site-path>
diff --git a/plugins/org.eclipse.osee.ote.client/build.properties b/plugins/org.eclipse.osee.ote.client/build.properties
index e9863e281e..34d2e4d2da 100644
--- a/plugins/org.eclipse.osee.ote.client/build.properties
+++ b/plugins/org.eclipse.osee.ote.client/build.properties
@@ -1,5 +1,4 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- .,\
- plugin.xml
+ .
diff --git a/plugins/org.eclipse.osee.ote.jms/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.jms/META-INF/MANIFEST.MF
index 07d77a09e4..a153e095b7 100644
--- a/plugins/org.eclipse.osee.ote.jms/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.ote.jms/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Node
Bundle-SymbolicName: org.eclipse.osee.ote.jms
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 0.10.0.qualifier
Bundle-Vendor: The Boeing Company
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.osee.connection.service,
diff --git a/plugins/org.eclipse.osee.ote.jms/pom.xml b/plugins/org.eclipse.osee.ote.jms/pom.xml
index ddee2912db..749fdf9399 100644
--- a/plugins/org.eclipse.osee.ote.jms/pom.xml
+++ b/plugins/org.eclipse.osee.ote.jms/pom.xml
@@ -14,7 +14,4 @@
<packaging>eclipse-plugin</packaging>
<name>OTE JMS</name>
-
-
-
</project> \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ote.parent/pom.xml b/plugins/org.eclipse.osee.ote.parent/pom.xml
index 48551f00b8..a082b9548e 100644
--- a/plugins/org.eclipse.osee.ote.parent/pom.xml
+++ b/plugins/org.eclipse.osee.ote.parent/pom.xml
@@ -45,7 +45,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tycho-version>0.13.0</tycho-version>
+ <tycho-version>0.14.1</tycho-version>
<maven-antrun-version>1.6</maven-antrun-version>
<ant-contrib-version>1.0b3</ant-contrib-version>
<jacoco-version>0.5.3.201107060350</jacoco-version>
@@ -512,7 +512,7 @@
<profile>
<id>osee-local-sites</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <activeByDefault>false</activeByDefault>
</activation>
<properties>
<osee-runtime-site-path>file:../../../org.eclipse.osee/plugins</osee-runtime-site-path>
diff --git a/plugins/org.eclipse.osee.ote.ui.message/build.properties b/plugins/org.eclipse.osee.ote.ui.message/build.properties
index 03a3e5f6ce..0594ab9073 100644
--- a/plugins/org.eclipse.osee.ote.ui.message/build.properties
+++ b/plugins/org.eclipse.osee.ote.ui.message/build.properties
@@ -3,6 +3,5 @@ bin.includes = META-INF/,\
images/,\
plugin.xml,\
schema/,\
- .,\
- OSGI-INF/MessageProviderComponent.xml
+ .
source.. = src/
diff --git a/plugins/org.eclipse.osee.runtime.parent/pom.xml b/plugins/org.eclipse.osee.runtime.parent/pom.xml
index 59f4463867..b2c217e4e5 100644
--- a/plugins/org.eclipse.osee.runtime.parent/pom.xml
+++ b/plugins/org.eclipse.osee.runtime.parent/pom.xml
@@ -47,7 +47,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tycho-version>0.13.0</tycho-version>
+ <tycho-version>0.14.1</tycho-version>
<maven-antrun-version>1.6</maven-antrun-version>
<ant-contrib-version>1.0b3</ant-contrib-version>
<jacoco-version>0.5.3.201107060350</jacoco-version>
@@ -497,7 +497,7 @@
<profile>
<id>osee-local-sites</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <activeByDefault>false</activeByDefault>
</activation>
<properties>
<osee-xserver-site-path>file:../../../org.eclipse.osee/plugins</osee-xserver-site-path>
diff --git a/plugins/org.eclipse.osee.x.core.parent/pom.xml b/plugins/org.eclipse.osee.x.core.parent/pom.xml
index ee5cf6d449..97c918d8ae 100644
--- a/plugins/org.eclipse.osee.x.core.parent/pom.xml
+++ b/plugins/org.eclipse.osee.x.core.parent/pom.xml
@@ -55,7 +55,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tycho-version>0.13.0</tycho-version>
+ <tycho-version>0.14.1</tycho-version>
<maven-antrun-version>1.6</maven-antrun-version>
<ant-contrib-version>1.0b3</ant-contrib-version>
<jacoco-version>0.5.3.201107060350</jacoco-version>
diff --git a/plugins/org.eclipse.osee.x.server.parent/pom.xml b/plugins/org.eclipse.osee.x.server.parent/pom.xml
index 934971bbfc..3be5f832f2 100644
--- a/plugins/org.eclipse.osee.x.server.parent/pom.xml
+++ b/plugins/org.eclipse.osee.x.server.parent/pom.xml
@@ -44,7 +44,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tycho-version>0.13.0</tycho-version>
+ <tycho-version>0.14.1</tycho-version>
<maven-antrun-version>1.6</maven-antrun-version>
<ant-contrib-version>1.0b3</ant-contrib-version>
<jacoco-version>0.5.3.201107060350</jacoco-version>

Back to the top