Skip to content
This repository was archived by the owner on Jan 21, 2024. It is now read-only.

Commit 96ad368

Browse files
prb112prb112
committed
Merge pull request #1743 from prb112/master
Updates to Support 1.1.11.20151208-1200 release
2 parents 6576294 + e54ba90 commit 96ad368

File tree

94 files changed

+269
-200
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+269
-200
lines changed

‎assembly/deploy-cdnjs.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<project default="manage-cdnjs">
2+
<target name="snapshotstatus">
3+
<condition property="notSnapshot" value="false" else="true">
4+
<matches string="${project.version}" pattern="SNAPSHOT$" />
5+
</condition>
6+
<echo message="This is version - ${project.version}"/>
7+
<echo message="The not snapshot status is - ${notSnapshot}" />
8+
</target>
9+
10+
<target name="manage-cdnjs" if="${notSnapshot}" depends="snapshotstatus">
11+
<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"/>
12+
<copy file="./sdk/com.ibm.sbt.web/src/main/webapp/js/sdk/_layers/sbt-core-dojo-amd.js" todir="./assembly/cdnjs" overwrite="true"/>
13+
<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"/>
14+
<copy file="./sdk/com.ibm.sbt.web/src/main/webapp/js/sdk/_layers/sbt-extra-controls-dojo-amd.js" todir="./assembly/cdnjs" overwrite="true"/>
15+
</target>
16+
17+
</project>

‎assembly/pom.xml‎

Lines changed: 73 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<parent>
1717
<groupId>com.ibm.sbt</groupId>
1818
<artifactId>com.ibm.sbt</artifactId>
19-
<version>1.1.11-SNAPSHOT</version>
19+
<version>1.1.11.20151208-1200</version>
2020
</parent>
2121

2222
<build>
@@ -96,7 +96,8 @@
9696
-->
9797
<execution>
9898
<id>download-sources</id>
99-
<phase>generate-resources</phase>
99+
<!-- generate-resources was the original -->
100+
<phase>deploy</phase>
100101
<goals>
101102
<goal>wget</goal>
102103
</goals>
@@ -110,7 +111,8 @@
110111
</execution>
111112
<execution>
112113
<id>download-sources-ios</id>
113-
<phase>generate-resources</phase>
114+
<!-- generate-resources was the original -->
115+
<phase>deploy</phase>
114116
<goals>
115117
<goal>wget</goal>
116118
</goals>
@@ -299,23 +301,53 @@
299301
-->
300302
<plugin>
301303
<artifactId>maven-antrun-plugin</artifactId>
302-
<version>1.7</version>
304+
<version>1.8</version>
303305
<executions>
306+
<!-- Automates the movement of the js files to the approved assembly
307+
location -->
304308
<execution>
309+
<id>move-cdnjs</id>
310+
311+
<!-- phase selected is deploy - ONLY EXECUTED WHEN DEPLOY/INSTALL to Nexus. to debug use clean -->
312+
<phase>deploy</phase>
313+
<goals>
314+
<goal>run</goal>
315+
</goals>
316+
<configuration>
317+
<target>
318+
<ant antfile="deploy-cdnjs.xml" />
319+
<echo message="Finished Calling Target" />
320+
</target>
321+
322+
</configuration>
323+
</execution>
324+
<!-- Optimization for Deploy only downloads - generates dummy files and directories for the assembly portion -->
325+
<!--execution>
326+
<id>make-source-directory</id>
327+
<phase>generate-sources</phase>
328+
<configuration>
329+
<target>
330+
<mkdir dir="${project.build.directory}/sources/SocialSDK-iOS"/>
331+
<touch file="${project.build.directory}/sources/SocialSDK-iOS/blank"/>
332+
<mkdir dir="${project.build.directory}/sources/SocialSDK"/>
333+
<touch file="${project.build.directory}/sources/SocialSDK/blank"/>
334+
</target>
335+
</configuration>
336+
</execution-->
337+
<!-- Set the Execution to Ignore -->
338+
<!-- Remove Other Sources -->
339+
<!--execution>
340+
305341
<id>removedownloads</id>
306342
<phase>generate-sources</phase>
307343
<configuration>
308344
<target>
309-
<!-- Remove Tomcat -->
310-
<!-- Not Used -
311-
<delete dir="${project.build.directory}/tomcat/unzip" />
312-
-->
313-
<!-- Remove Other Sources -->
314345
<delete dir="${project.build.directory}/sources" />
315346
316347
</target>
317348
</configuration>
318349
</execution>
350+
-->
319351
<execution>
320352
<id>tomcat</id>
321353
<phase>package</phase>
@@ -350,13 +382,27 @@
350382
<copy
351383
file="./../assembly/platform/tomcat/server.xml"
352384
todir="${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.61/conf" overwrite="true" />
385+
353386
-->
387+
388+
<!-- Creates an Empty Directory -->
389+
<!-- Package Only Execution
354390
<path id="source_folder_name">
355391
<dirset dir="${project.build.directory}/sources/SocialSDK">
356392
<include name="SocialSDK*" />
357393
</dirset>
358394
</path>
359395
<property name="psource_folder_name" refid="source_folder_name" />
396+
397+
398+
<mkdir dir="/assembly/target/sources/SocialSDK"/>
399+
<mkdir dir="/assembly/target/sources/SocialSDK-iOS"/>
400+
<touch file="/assembly/target/sources/SocialSDK-iOS/dummy"/>
401+
<touch file="/assembly/target/sources/SocialSDK/dummy"/>
402+
<touch file="/assembly/target/sources/SocialSDK-iOS/SocialSDK-dummy"/>
403+
<touch file="/assembly/target/sources/SocialSDK/SocialSDK-dummy"/>
404+
405+
360406
<move todir="${project.build.directory}/sources/SocialSDK">
361407
<fileset dir="${psource_folder_name}">
362408
<include name="**/*" />
@@ -376,20 +422,24 @@
376422
</fileset>
377423
</move>
378424
<delete dir="${psource_folder_name_ios}" />
379-
425+
-->
426+
380427
<!-- PBastide - Removed Tomcat -->
381428
<!--
382429
<zip basedir="${project.build.directory}/tomcat/unzip"
383430
destfile="${project.build.directory}/tomcat/apache-tomcat-7.0.61-sbt.zip"
384431
compress="true" />
385432
-->
386433
<!-- PBastide: Changed the Zip File to Kit -->
387-
<zip basedir="${project.build.directory}/sources/SocialSDK"
434+
<!--zip basedir="${project.build.directory}/sources/SocialSDK"
388435
destfile="${workingDir}/kit/SocialSDK-${project.version}.zip"
389436
compress="true" />
390437
<zip basedir="${project.build.directory}/sources/SocialSDK-iOS"
391438
destfile="${workingDir}/kit/SocialSDK-iOS-${project.version}.zip"
392-
compress="true" />
439+
compress="true" /-->
440+
441+
<move file="${project.build.directory}/sources/SocialSDK-iOS/SocialSDK-iOS.zip" tofile="${workingDir}/kit/SocialSDK-iOS-${project.version}.zip" quiet="true" failonerror="false"/>
442+
<move file="${project.build.directory}/sources/SocialSDK/SocialSDK.zip" tofile="${workingDir}/kit/SocialSDK-${project.version}.zip" quiet="true" failonerror="false"/>
393443
</target>
394444
</configuration>
395445
<goals>
@@ -430,28 +480,28 @@
430480
<groupId>com.ibm.sbt</groupId>
431481
<artifactId>sbt.dojo180</artifactId>
432482

433-
<version>1.1.11-SNAPSHOT</version>
483+
<version>1.1.11.20151208-1200</version>
434484
<type>war</type>
435485
</dependency>
436486
<dependency>
437487
<groupId>com.ibm.sbt</groupId>
438488
<artifactId>sbt.jquery182</artifactId>
439489

440-
<version>1.1.11-SNAPSHOT</version>
490+
<version>1.1.11.20151208-1200</version>
441491
<type>war</type>
442492
</dependency>
443493
<dependency>
444494
<groupId>com.ibm.sbt</groupId>
445495
<artifactId>sbt.bootstrap211</artifactId>
446496

447-
<version>1.1.11-SNAPSHOT</version>
497+
<version>1.1.11.20151208-1200</version>
448498
<type>war</type>
449499
</dependency>
450500
<dependency>
451501
<groupId>com.ibm.sbt</groupId>
452502
<artifactId>sbt.sample.web</artifactId>
453503

454-
<version>1.1.11-SNAPSHOT</version>
504+
<version>1.1.11.20151208-1200</version>
455505
<type>war</type>
456506
</dependency>
457507

@@ -520,24 +570,24 @@
520570
<groupId>com.ibm.sbt</groupId>
521571
<artifactId>com.ibm.sbt.web</artifactId>
522572

523-
<version>1.1.11-SNAPSHOT</version>
573+
<version>1.1.11.20151208-1200</version>
524574
<type>war</type>
525575
</dependency>
526576

527577
<dependency>
528578
<groupId>com.ibm.sbt</groupId>
529579
<artifactId>com.ibm.commons</artifactId>
530-
<version>1.1.11-SNAPSHOT</version>
580+
<version>1.1.11.20151208-1200</version>
531581
</dependency>
532582
<dependency>
533583
<groupId>com.ibm.sbt</groupId>
534584
<artifactId>com.ibm.commons.runtime</artifactId>
535-
<version>1.1.11-SNAPSHOT</version>
585+
<version>1.1.11.20151208-1200</version>
536586
</dependency>
537587
<dependency>
538588
<groupId>com.ibm.sbt</groupId>
539589
<artifactId>com.ibm.commons.xml</artifactId>
540-
<version>1.1.11-SNAPSHOT</version>
590+
<version>1.1.11.20151208-1200</version>
541591
</dependency>
542592

543593
<!--
@@ -553,19 +603,19 @@
553603
<dependency>
554604
<groupId>com.ibm.sbt</groupId>
555605
<artifactId>com.ibm.sbt.php.wordpress</artifactId>
556-
<version>1.1.11-SNAPSHOT</version>
606+
<version>1.1.11.20151208-1200</version>
557607
<type>zip</type>
558608
</dependency>
559609
<dependency>
560610
<groupId>com.ibm.sbt</groupId>
561611
<artifactId>com.ibm.sbt.php.core</artifactId>
562-
<version>1.1.11-SNAPSHOT</version>
612+
<version>1.1.11.20151208-1200</version>
563613
<type>zip</type>
564614
</dependency>
565615
<dependency>
566616
<groupId>com.ibm.sbt</groupId>
567617
<artifactId>com.ibm.sbt.php.moodle</artifactId>
568-
<version>1.1.11-SNAPSHOT</version>
618+
<version>1.1.11.20151208-1200</version>
569619
<type>zip</type>
570620
</dependency>
571621
</dependencies>

‎commons/com.ibm.commons.runtime/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: Common Runtime Classes
44
Bundle-SymbolicName: com.ibm.commons.runtime
5-
Bundle-Version: 1.1.11.qualifier
5+
Bundle-Version: 1.1.11.20151208-1200
66
Bundle-Vendor: IBM
77
Export-Package: com.ibm.commons.runtime,com.ibm.commons.runtime.beans,
88
com.ibm.commons.runtime.impl,com.ibm.commons.runtime.impl.app,com.ibm

‎commons/com.ibm.commons.runtime/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.ibm.sbt</groupId>
99
<artifactId>com.ibm.sbt.commons</artifactId>
10-
<version>1.1.11-SNAPSHOT</version>
10+
<version>1.1.11.20151208-1200</version>
1111
</parent>
1212

1313
</project>

‎commons/com.ibm.commons.xml/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: XML utilities Plug-in
44
Bundle-SymbolicName: com.ibm.commons.xml;singleton:=true
5-
Bundle-Version: 1.1.11.qualifier
5+
Bundle-Version: 1.1.11.20151208-1200
66
Bundle-Vendor: IBM
77
Eclipse-LazyStart: true
88
Require-Bundle: com.ibm.commons,

‎commons/com.ibm.commons.xml/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.ibm.sbt</groupId>
99
<artifactId>com.ibm.sbt.commons</artifactId>
10-
<version>1.1.11-SNAPSHOT</version>
10+
<version>1.1.11.20151208-1200</version>
1111
</parent>
1212

1313
<build>

‎commons/com.ibm.commons/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: Commons Utilities
44
Bundle-SymbolicName: com.ibm.commons;singleton:=true
5-
Bundle-Version: 1.1.11.qualifier
5+
Bundle-Version: 1.1.11.20151208-1200
66
Bundle-Localization: plugin
77
Export-Package: com.ibm.commons,com.ibm.commons.extension,com.ibm.comm
88
ons.log,com.ibm.commons.log.eclipse,com.ibm.commons.log.jdk,com.ibm.c

‎commons/com.ibm.commons/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.ibm.sbt</groupId>
99
<artifactId>com.ibm.sbt.commons</artifactId>
10-
<version>1.1.11-SNAPSHOT</version>
10+
<version>1.1.11.20151208-1200</version>
1111
</parent>
1212

1313
<build>

‎commons/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<artifactId>com.ibm.sbt</artifactId>
99
<groupId>com.ibm.sbt</groupId>
10-
<version>1.1.11-SNAPSHOT</version>
10+
<version>1.1.11.20151208-1200</version>
1111
</parent>
1212

1313
<modules>

‎deps/com.ibm.sbt.bootstrap211/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.ibm.sbt</groupId>
99
<artifactId>com.ibm.sbt.dependencies</artifactId>
10-
<version>1.1.11-SNAPSHOT</version>
10+
<version>1.1.11.20151208-1200</version>
1111
</parent>
1212

1313
</project>

0 commit comments

Comments
 (0)