Merge pull request #1743 from prb112/master

Updates to Support 1.1.11.20151208-1200 release
OpenNTF · Dec 8, 2015 · 96ad368 · 96ad368
2 parents 6576294 + e54ba90
commit 96ad368
Show file tree

Hide file tree

Showing 94 changed files with 269 additions and 200 deletions.
diff --git a/assembly/deploy-cdnjs.xml b/assembly/deploy-cdnjs.xml
@@ -0,0 +1,17 @@
+<project default="manage-cdnjs">
+	<target name="snapshotstatus">
+		<condition property="notSnapshot" value="false" else="true">
+			<matches string="${project.version}" pattern="SNAPSHOT$" />
+		</condition>
+		<echo message="This is version - ${project.version}"/>
+		<echo message="The not snapshot status is - ${notSnapshot}" />
+	</target>
+
+	<target name="manage-cdnjs" if="${notSnapshot}" depends="snapshotstatus">
+		<copy file="./sdk/com.ibm.sbt.web/src/main/webapp/js/sdk/_layers/sbt-core-dojo-amd.js.uncompressed.js" todir="./assembly/cdnjs" overwrite="true"/>
+		<copy file="./sdk/com.ibm.sbt.web/src/main/webapp/js/sdk/_layers/sbt-core-dojo-amd.js" todir="./assembly/cdnjs" overwrite="true"/>
+		<copy file="./sdk/com.ibm.sbt.web/src/main/webapp/js/sdk/_layers/sbt-extra-controls-dojo-amd.js.uncompressed.js" todir="./assembly/cdnjs" overwrite="true"/>
+		<copy file="./sdk/com.ibm.sbt.web/src/main/webapp/js/sdk/_layers/sbt-extra-controls-dojo-amd.js" todir="./assembly/cdnjs" overwrite="true"/>
+	</target>
+
+</project>
diff --git a/assembly/pom.xml b/assembly/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>com.ibm.sbt</groupId>
 		<artifactId>com.ibm.sbt</artifactId>
-		<version>1.1.11-SNAPSHOT</version>
+		<version>1.1.11.20151208-1200</version>
 	</parent>
 
 	<build>
@@ -96,7 +96,8 @@
 					-->
 					<execution>
 						<id>download-sources</id>
-						<phase>generate-resources</phase>
+						<!-- generate-resources was the original --> 
+						<phase>deploy</phase>
 						<goals>
 							<goal>wget</goal>
 						</goals>
@@ -110,7 +111,8 @@
 					</execution>
 					<execution>
 						<id>download-sources-ios</id>
-						<phase>generate-resources</phase>
+						<!-- generate-resources was the original --> 
+						<phase>deploy</phase>
 						<goals>
 							<goal>wget</goal>
 						</goals>
@@ -299,23 +301,53 @@
 			-->
 			<plugin>
 				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.7</version>
+				<version>1.8</version>
 				<executions>
+					<!-- Automates the movement of the js files to the approved assembly 
+						location -->
 					<execution>
+						<id>move-cdnjs</id>
+
+						<!-- phase selected is deploy - ONLY EXECUTED WHEN DEPLOY/INSTALL to Nexus.  to debug use clean -->
+						<phase>deploy</phase> 
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<target>
+								<ant antfile="deploy-cdnjs.xml" />
+								<echo message="Finished Calling Target" />
+							</target>
+
+						</configuration>
+					</execution>
+					<!-- Optimization for Deploy only downloads - generates dummy files and directories for the assembly portion -->
+					<!--execution>
+						<id>make-source-directory</id>
+						<phase>generate-sources</phase>
+						<configuration>
+							<target>
+								<mkdir dir="${project.build.directory}/sources/SocialSDK-iOS"/>
+								<touch file="${project.build.directory}/sources/SocialSDK-iOS/blank"/>
+								<mkdir dir="${project.build.directory}/sources/SocialSDK"/>
+								<touch file="${project.build.directory}/sources/SocialSDK/blank"/>
+							</target>
+						</configuration>
+					</execution-->
+					<!-- Set the Execution to Ignore -->
+					<!-- Remove Other Sources -->
+					<!--execution>
+					
 						<id>removedownloads</id>
 						<phase>generate-sources</phase>
 						<configuration>
 							<target>
-								<!-- Remove Tomcat -->
-								<!-- Not Used - 
-								<delete dir="${project.build.directory}/tomcat/unzip" />
-								-->
-								<!-- Remove Other Sources -->
 								<delete dir="${project.build.directory}/sources" />
 
 							</target>
 						</configuration>
 					</execution>
+					-->
 					<execution>
 						<id>tomcat</id>
 						<phase>package</phase>
@@ -350,13 +382,27 @@
 								<copy
 									file="./../assembly/platform/tomcat/server.xml"
 									todir="${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.61/conf" overwrite="true" />
+								
 								-->
+
+								<!-- Creates an Empty Directory -->
+								<!-- Package Only Execution
 								<path id="source_folder_name">
 									<dirset dir="${project.build.directory}/sources/SocialSDK">
 										<include name="SocialSDK*" />
 									</dirset>
 								</path>
 								<property name="psource_folder_name" refid="source_folder_name" />
+								
+								
+								<mkdir dir="/assembly/target/sources/SocialSDK"/>
+								<mkdir dir="/assembly/target/sources/SocialSDK-iOS"/>
+								<touch file="/assembly/target/sources/SocialSDK-iOS/dummy"/>
+								<touch file="/assembly/target/sources/SocialSDK/dummy"/>
+								<touch file="/assembly/target/sources/SocialSDK-iOS/SocialSDK-dummy"/>
+								<touch file="/assembly/target/sources/SocialSDK/SocialSDK-dummy"/>
+								
+								
 								<move todir="${project.build.directory}/sources/SocialSDK">
 									<fileset dir="${psource_folder_name}">
 										<include name="**/*" />
@@ -376,20 +422,24 @@
 									</fileset>
 								</move>
 								<delete dir="${psource_folder_name_ios}" />
-
+								-->
+
 								<!-- PBastide - Removed Tomcat -->
 								<!--
 								<zip basedir="${project.build.directory}/tomcat/unzip"
 									destfile="${project.build.directory}/tomcat/apache-tomcat-7.0.61-sbt.zip"
 									compress="true" />
 								-->
 								<!-- PBastide: Changed the Zip File to Kit -->
-								<zip basedir="${project.build.directory}/sources/SocialSDK"
+								<!--zip basedir="${project.build.directory}/sources/SocialSDK"
 									destfile="${workingDir}/kit/SocialSDK-${project.version}.zip"
 									compress="true" />
 								<zip basedir="${project.build.directory}/sources/SocialSDK-iOS"
 									destfile="${workingDir}/kit/SocialSDK-iOS-${project.version}.zip"
-									compress="true" />
+									compress="true" /-->
+
+								<move file="${project.build.directory}/sources/SocialSDK-iOS/SocialSDK-iOS.zip" tofile="${workingDir}/kit/SocialSDK-iOS-${project.version}.zip" quiet="true" failonerror="false"/>
+								<move file="${project.build.directory}/sources/SocialSDK/SocialSDK.zip" tofile="${workingDir}/kit/SocialSDK-${project.version}.zip" quiet="true" failonerror="false"/>
 							</target>
 						</configuration>
 						<goals>
@@ -430,28 +480,28 @@
 			<groupId>com.ibm.sbt</groupId>
 			<artifactId>sbt.dojo180</artifactId>
 
-			<version>1.1.11-SNAPSHOT</version>
+			<version>1.1.11.20151208-1200</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<groupId>com.ibm.sbt</groupId>
 			<artifactId>sbt.jquery182</artifactId>
 
-			<version>1.1.11-SNAPSHOT</version>
+			<version>1.1.11.20151208-1200</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<groupId>com.ibm.sbt</groupId>
 			<artifactId>sbt.bootstrap211</artifactId>
 
-			<version>1.1.11-SNAPSHOT</version>
+			<version>1.1.11.20151208-1200</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<groupId>com.ibm.sbt</groupId>
 			<artifactId>sbt.sample.web</artifactId>
 
-			<version>1.1.11-SNAPSHOT</version>
+			<version>1.1.11.20151208-1200</version>
 			<type>war</type>
 		</dependency>
 
@@ -520,24 +570,24 @@
 			<groupId>com.ibm.sbt</groupId>
 			<artifactId>com.ibm.sbt.web</artifactId>
 
-			<version>1.1.11-SNAPSHOT</version>
+			<version>1.1.11.20151208-1200</version>
 			<type>war</type>
 		</dependency>
 
 		<dependency>
 			<groupId>com.ibm.sbt</groupId>
 			<artifactId>com.ibm.commons</artifactId>
-			<version>1.1.11-SNAPSHOT</version>
+			<version>1.1.11.20151208-1200</version>
 		</dependency>
 		<dependency>
 			<groupId>com.ibm.sbt</groupId>
 			<artifactId>com.ibm.commons.runtime</artifactId>
-			<version>1.1.11-SNAPSHOT</version>
+			<version>1.1.11.20151208-1200</version>
 		</dependency>
 		<dependency>
 			<groupId>com.ibm.sbt</groupId>
 			<artifactId>com.ibm.commons.xml</artifactId>
-			<version>1.1.11-SNAPSHOT</version>
+			<version>1.1.11.20151208-1200</version>
 		</dependency>
 
 		<!-- 
@@ -553,19 +603,19 @@
 		<dependency>
 			<groupId>com.ibm.sbt</groupId>
 			<artifactId>com.ibm.sbt.php.wordpress</artifactId>
-			<version>1.1.11-SNAPSHOT</version>
+			<version>1.1.11.20151208-1200</version>
 			<type>zip</type>
 		</dependency>
 		<dependency>
 			<groupId>com.ibm.sbt</groupId>
 			<artifactId>com.ibm.sbt.php.core</artifactId>
-			<version>1.1.11-SNAPSHOT</version>
+			<version>1.1.11.20151208-1200</version>
 			<type>zip</type>
 		</dependency>
 		<dependency>
 			<groupId>com.ibm.sbt</groupId>
 			<artifactId>com.ibm.sbt.php.moodle</artifactId>
-			<version>1.1.11-SNAPSHOT</version>
+			<version>1.1.11.20151208-1200</version>
 			<type>zip</type>
 		</dependency>
 	</dependencies>

diff --git a/commons/com.ibm.commons.runtime/META-INF/MANIFEST.MF b/commons/com.ibm.commons.runtime/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common Runtime Classes
 Bundle-SymbolicName: com.ibm.commons.runtime
-Bundle-Version: 1.1.11.qualifier
+Bundle-Version: 1.1.11.20151208-1200
 Bundle-Vendor: IBM
 Export-Package: com.ibm.commons.runtime,com.ibm.commons.runtime.beans,
  com.ibm.commons.runtime.impl,com.ibm.commons.runtime.impl.app,com.ibm

diff --git a/commons/com.ibm.commons.runtime/pom.xml b/commons/com.ibm.commons.runtime/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.ibm.sbt</groupId>
     <artifactId>com.ibm.sbt.commons</artifactId>
-    <version>1.1.11-SNAPSHOT</version>
+    <version>1.1.11.20151208-1200</version>
   </parent>
 
   </project>
diff --git a/commons/com.ibm.commons.xml/META-INF/MANIFEST.MF b/commons/com.ibm.commons.xml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: XML utilities Plug-in
 Bundle-SymbolicName: com.ibm.commons.xml;singleton:=true
-Bundle-Version: 1.1.11.qualifier
+Bundle-Version: 1.1.11.20151208-1200
 Bundle-Vendor: IBM
 Eclipse-LazyStart: true
 Require-Bundle: com.ibm.commons,

diff --git a/commons/com.ibm.commons.xml/pom.xml b/commons/com.ibm.commons.xml/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.ibm.sbt</groupId>
 		<artifactId>com.ibm.sbt.commons</artifactId>
-		<version>1.1.11-SNAPSHOT</version>
+		<version>1.1.11.20151208-1200</version>
 	</parent>
 
 	<build>

diff --git a/commons/com.ibm.commons/META-INF/MANIFEST.MF b/commons/com.ibm.commons/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Commons Utilities
 Bundle-SymbolicName: com.ibm.commons;singleton:=true
-Bundle-Version: 1.1.11.qualifier
+Bundle-Version: 1.1.11.20151208-1200
 Bundle-Localization: plugin
 Export-Package: com.ibm.commons,com.ibm.commons.extension,com.ibm.comm
  ons.log,com.ibm.commons.log.eclipse,com.ibm.commons.log.jdk,com.ibm.c

diff --git a/commons/com.ibm.commons/pom.xml b/commons/com.ibm.commons/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.ibm.sbt</groupId>
 		<artifactId>com.ibm.sbt.commons</artifactId>
-		<version>1.1.11-SNAPSHOT</version>
+		<version>1.1.11.20151208-1200</version>
 	</parent>
 
 	<build>

diff --git a/commons/pom.xml b/commons/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<artifactId>com.ibm.sbt</artifactId>
 		<groupId>com.ibm.sbt</groupId>
-		<version>1.1.11-SNAPSHOT</version>
+		<version>1.1.11.20151208-1200</version>
 	</parent>
 
 	<modules>

diff --git a/deps/com.ibm.sbt.bootstrap211/pom.xml b/deps/com.ibm.sbt.bootstrap211/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.ibm.sbt</groupId>
 		<artifactId>com.ibm.sbt.dependencies</artifactId>
-		<version>1.1.11-SNAPSHOT</version>
+		<version>1.1.11.20151208-1200</version>
 	</parent>
 
 </project>
diff --git a/deps/com.ibm.sbt.ckeditor422/pom.xml b/deps/com.ibm.sbt.ckeditor422/pom.xml
@@ -7,6 +7,6 @@
 	<parent>
 		<groupId>com.ibm.sbt</groupId>
 		<artifactId>com.ibm.sbt.dependencies</artifactId>
-		<version>1.1.11-SNAPSHOT</version>
+		<version>1.1.11.20151208-1200</version>
 	</parent>
 </project>
diff --git a/deps/com.ibm.sbt.dojo180/pom.xml b/deps/com.ibm.sbt.dojo180/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.ibm.sbt</groupId>
 		<artifactId>com.ibm.sbt.dependencies</artifactId>
-		<version>1.1.11-SNAPSHOT</version>
+		<version>1.1.11.20151208-1200</version>
 	</parent>
 
 

diff --git a/deps/com.ibm.sbt.jquery182/pom.xml b/deps/com.ibm.sbt.jquery182/pom.xml
@@ -7,6 +7,6 @@
 	<parent>
 		<groupId>com.ibm.sbt</groupId>
 		<artifactId>com.ibm.sbt.dependencies</artifactId>
-		<version>1.1.11-SNAPSHOT</version>
+		<version>1.1.11.20151208-1200</version>
 	</parent>
 </project>
diff --git a/deps/pom.xml b/deps/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<artifactId>com.ibm.sbt</artifactId>
 		<groupId>com.ibm.sbt</groupId>
-		<version>1.1.11-SNAPSHOT</version>
+		<version>1.1.11.20151208-1200</version>
 	</parent>
 	<modules>
 		<module>com.ibm.sbt.bootstrap211</module>

diff --git a/domino/com.ibm.sbt.domino.feature/feature.xml b/domino/com.ibm.sbt.domino.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.ibm.sbt.domino.feature"
       label="Domino SBT Feature"
-      version="1.1.11.qualifier"
+      version="1.1.11.20151208-1200"
       provider-name="IBM">
 
    <license url="http://www.apache.org/licenses/LICENSE-2.0">

diff --git a/domino/com.ibm.sbt.domino.feature/pom.xml b/domino/com.ibm.sbt.domino.feature/pom.xml
@@ -6,6 +6,6 @@
   <parent>
     <groupId>com.ibm.sbt</groupId>
     <artifactId>com.ibm.sbt.domino</artifactId>
-    <version>1.1.11-SNAPSHOT</version>
+    <version>1.1.11.20151208-1200</version>
   </parent>
 </project>
diff --git a/domino/com.ibm.sbt.domino.updatesite/pom.xml b/domino/com.ibm.sbt.domino.updatesite/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.ibm.sbt</groupId>
 		<artifactId>com.ibm.sbt.domino</artifactId>
-		<version>1.1.11-SNAPSHOT</version>
+		<version>1.1.11.20151208-1200</version>
 	</parent>
 
 	<build>

diff --git a/domino/com.ibm.sbt.domino.updatesite/site.xml b/domino/com.ibm.sbt.domino.updatesite/site.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/com.ibm.sbt.domino.feature_1.1.11.qualifier.jar" id="com.ibm.sbt.domino.feature" version="1.1.11.qualifier"/>
-   <feature url="features/com.ibm.sbt.opensocial.domino.feature_1.1.11.qualifier.jar" id="com.ibm.sbt.opensocial.domino.feature" version="1.1.11.qualifier"/>
-   <feature url="features/com.ibm.sbt.opensocial.domino.explorer.feature_1.1.11.qualifier.jar" id="com.ibm.sbt.opensocial.domino.explorer.feature" version="1.1.11.qualifier"/>
+   <feature url="features/com.ibm.sbt.domino.feature_1.1.11.20151208-1200.jar" id="com.ibm.sbt.domino.feature" version="1.1.11.20151208-1200"/>
+   <feature url="features/com.ibm.sbt.opensocial.domino.feature_1.1.11.20151208-1200.jar" id="com.ibm.sbt.opensocial.domino.feature" version="1.1.11.20151208-1200"/>
+   <feature url="features/com.ibm.sbt.opensocial.domino.explorer.feature_1.1.11.20151208-1200.jar" id="com.ibm.sbt.opensocial.domino.explorer.feature" version="1.1.11.20151208-1200"/>
 </site>