Updates the target-platform pom to use the CR1 of target-platform-utils

* build.sh * Use -U in normal building not just during debug * teiid-designer.target * Updates received from integration-stack target
Teiid-Designer · Mar 5, 2013 · 4479cd0 · 4479cd0
1 parent 0528de0
commit 4479cd0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/target-platform/build.sh b/target-platform/build.sh
@@ -74,15 +74,15 @@ MVN="mvn clean verify"
 # Turn on dedugging if required
 #
 if [ "${DEBUG}" == "1" ]; then
-  MVN_FLAGS="-e -X -U"
+  MVN_FLAGS="-e -X"
 fi
 
 #
 # Maven options
 # -P <profiles> : The profiles to be used for downloading jbosstools artifacts
 # -D maven.repo.local : Assign the $LOCAL_REPO as the target repository
 #
-MVN_FLAGS="${MVN_FLAGS} -P generate-target -Dmaven.repo.local=${LOCAL_REPO} -Dno.jbosstools.site -Dtycho.localArtifacts=ignore"
+MVN_FLAGS="${MVN_FLAGS} -U -P generate-target -Dmaven.repo.local=${LOCAL_REPO} -Dno.jbosstools.site -Dtycho.localArtifacts=ignore"
 
 echo "==============="
 

diff --git a/target-platform/pom.xml b/target-platform/pom.xml
@@ -57,7 +57,7 @@
 					<plugin>
 						<groupId>org.jboss.tools.tycho-plugins</groupId>
 						<artifactId>target-platform-utils</artifactId>
-						<version>0.16.0-SNAPSHOT</version>
+						<version>0.16.0.CR1</version>
 						<executions>
 							<execution>
 								<phase>generate-resources</phase>

diff --git a/target-platform/teiid-designer.target b/target-platform/teiid-designer.target
@@ -37,7 +37,7 @@
       <repository location="http://download.jboss.org/jbosstools/updates/requirements/juno/201209280900-R/"/>
     </location>
 
-    <!-- Eclipse Zest -->
+    <!-- Eclipse Zest : ESB -->
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="org.eclipse.zest.feature.group" version="1.5.0.201208201742"/>
       <repository location="http://download.jboss.org/jbosstools/updates/requirements/juno/201209280900-R/"/>
@@ -69,6 +69,12 @@
       <repository location="http://download.jboss.org/jbosstools/updates/requirements/juno/201209280900-R/"/>
     </location>
 
+    <!-- javax.ws.rs : Fuse -->
+    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+      <unit id="javax.ws.rs" version="1.1.1.v20101004-1200"/>
+      <repository location="http://download.jboss.org/jbosstools/updates/requirements/juno/201209280900-R/"/>
+    </location>
+
     <!-- JBoss Tools Core Base Dependencies -->
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="org.jboss.ide.eclipse.archives.feature.feature.group" version="0.0.0"/>
@@ -537,4 +543,4 @@
 
 	</locations>
 <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>
+</target>