Commit graph

7 commits

Author SHA1 Message Date
Nate Jensen
d91a0470ad Issue #716 remove dead plugin from features
Change-Id: I8fdce7496e3fc9123a48300f1c72c182eb811a0f

Former-commit-id: 7e34a3e6ab [formerly e58404bcb5] [formerly bcedcc51fa] [formerly 7046ba996a [formerly bcedcc51fa [formerly f5784196a7d39d642357a3fb11ad34dc3fcd4b70]]]
Former-commit-id: 7046ba996a
Former-commit-id: 0568bcdd3aeb09c62970a0d7fde73f55fd4d84b8 [formerly 63c5c4dc33]
Former-commit-id: 95bbc6a2d4
2012-06-29 13:19:47 -05:00
Nate Jensen
b98cc05c01 Issue #716 fix feature location of smack and remove dead dir
Change-Id: I93ae13842f8e484f0d6243573f30d70b37a99702

Former-commit-id: 314910c88f [formerly eb2c21c15d] [formerly 315594cab4] [formerly 24b40c3392 [formerly 315594cab4 [formerly eabc44141aa681503d6076ebf779536ff27e62f2]]]
Former-commit-id: 24b40c3392
Former-commit-id: d2911501fc67a32eb2a016f4d84e1503e130e670 [formerly d125185d28]
Former-commit-id: 11f01325e5
2012-06-28 17:57:17 -05:00
Bryan Kowal
f064abd37a Issue #708 - fix cave dependency issue when building due to ecf. The baseline p2-build.xml script will no longer attempt to build the collaboration feature.
Former-commit-id: a6814ec7fb [formerly fa84e5df3e] [formerly 207bbd3087] [formerly 25addabe64 [formerly 207bbd3087 [formerly 048ea55e064e0581cf32ca286c67f611ee4e0c3b]]]
Former-commit-id: 25addabe64
Former-commit-id: 17ed68aef27593eee306fe2fb3bb631e5e2624fc [formerly 94e4af6d47]
Former-commit-id: 21a02e1510
2012-06-19 15:03:57 -05:00
Steve Harris
43f936900c Merge branch 'ss_sync' (OB12.4.1-10) into 11-Collaboration
Conflicts:
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/IncludeMenuItem.java

Former-commit-id: bcc12e03ed [formerly 572e1bb476] [formerly 27bc369818] [formerly 58037cb5d1 [formerly 27bc369818 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]]
Former-commit-id: 58037cb5d1
Former-commit-id: ec875d4e25b0d41a71abbea662364ddefd6fe144 [formerly 63ea8599d7]
Former-commit-id: 9c9e01dbda
2012-05-09 13:14:00 -05:00
Steve Harris
98d8b3f188 12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]
Former-commit-id: a2a6a18fae
2012-04-18 15:18:16 -05:00
Bryan Kowal
8b08c8308e Issue #450 - the pde build will now build a p2 repository for collaboration. Removed org.jivesoftware.smack from the collaboration feature because it is already in the cots feature which is included in the collaboration feature. Had to remove and re-add log4j to the alertviz and cots features.
Former-commit-id: db3f60b23a [formerly b1a5abc6b3] [formerly 6ddeef48fa] [formerly ce99417a2a [formerly 6ddeef48fa [formerly b6c8b811ad911f13503859f7af09b916eb16a1d4]]]
Former-commit-id: ce99417a2a
Former-commit-id: 2de12493f2b8810fd8a4d81ec071b4416735a9af [formerly 10a291afa1]
Former-commit-id: 541fe8fbbb
2012-04-10 16:42:36 -05:00
root
9bb8decbcf Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 377dcd10b9 [formerly 3360eb6c5f]
Former-commit-id: 8e80217e59
2012-01-06 08:55:05 -06:00