Fix gemstone330 package references in the baseline (seems like a mistake was done years ago in dev branch)

Johan Brichau · Johan Brichau · commit 3aa77630b60c · 2018-11-22T09:27:05.000+01:00
diff --git a/repository/BaselineOfGrease.package/.filetree b/repository/BaselineOfGrease.package/.filetree
@@ -1,4 +1,5 @@
 {
-	"noMethodMetaData" : true,
 	"separateMethodMetaAndSource" : false,
-	"useCypressPropertiesFile" : true }
+	"noMethodMetaData" : true,
+	"useCypressPropertiesFile" : true
+}
diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baseline..st b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baseline..st
@@ -7,8 +7,7 @@ baseline: spec
       spec blessing: #'baseline'.
       spec
         package: 'Grease-Core';
-        package: 'Grease-Tests-Core' with: [ spec requires: #('Grease-Core') ];
-        package: 'Grease-GemStone330-Core'.
+        package: 'Grease-Tests-Core' with: [ spec requires: #('Grease-Core') ].
       spec
         group: 'Core' with: #('Grease-Core');
         group: 'Core Tests' with: #('Grease-Tests-Core');
@@ -245,4 +244,4 @@ baseline: spec
     do: [ 
       spec
         package: 'Grease-Tests-GemStone-Core'
-        with: 'Grease-Tests-GemStone-Core.v32' ]
+        with: [ spec file: 'Grease-Tests-GemStone-Core.v32' ] ]
diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/methodProperties.json b/repository/BaselineOfGrease.package/BaselineOfGrease.class/methodProperties.json
@@ -1,7 +1,8 @@
 {
-	"class" : {
-		 },
 	"instance" : {
-		"baseline:" : "JohanBrichau 11/18/2017 16:17",
 		"initializeLatin1ToUtf8Encodings" : "JohanBrichau 10/19/2014 10:00",
-		"slimeForSqueakPharo1xPharo2x:" : "JohanBrichau 02/16/2014 03:49" } }
+		"slimeForSqueakPharo1xPharo2x:" : "JohanBrichau 02/16/2014 03:49",
+		"baseline:" : "JohanBrichau 11/22/2018 09:09"
+	},
+	"class" : { }
+}
diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/properties.json b/repository/BaselineOfGrease.package/BaselineOfGrease.class/properties.json
@@ -1,14 +1,11 @@
 {
-	"category" : "BaselineOfGrease",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
-	"instvars" : [
-		 ],
-	"name" : "BaselineOfGrease",
-	"pools" : [
-		 ],
 	"super" : "BaselineOf",
-	"type" : "normal" }
+	"category" : "BaselineOfGrease",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "BaselineOfGrease",
+	"type" : "normal"
+}
diff --git a/repository/BaselineOfGrease.package/monticello.meta/version b/repository/BaselineOfGrease.package/monticello.meta/version
@@ -1 +1 @@
-(name 'BaselineOfGrease-JohanBrichau.1496564078' message 'merged by GitFileTree-MergeDriver' id '0ef84283-a7d1-4369-9cea-c517a9ed41f9' date '26 July 2018' time '9:46:15.799097 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.1496564076' message 'merged by GitFileTree-MergeDriver' id '79fe5f45-5fef-4621-bd4d-eaa815083b90' date '19 November 2017' time '9:46:43.13389 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.1496564075' message 'merged by GitFileTree-MergeDriver' id '55aa5fb9-6dc7-4898-905f-8304ebca2df7' date '18 November 2017' time '4:00:26.173413 pm' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.1496564074' message 'Adapted baseline for a different package in GS3.3 and forward' id '4f023a3c-fdea-4577-a8c8-055680797042' date '7 October 2017' time '6:52:04 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.1496564073' message 'Fix issue #20: encoding to utf8 breaks in GemStone 3.3+' id 'e9410295-6b3c-4eb3-8a28-e1191b60cb82' date '7 October 2017' time '6:48:31 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-dkh.1496564072' message 'merged by GitFileTree-MergeDriver' id 'a721b096-25cd-455c-a419-2fac8a9331c7' date '23 July 2017' time '11:33:54 am' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.19' message 'merged by GitFileTree-MergeDriver' id 'b05179de-cbe6-4b80-824b-f6220d2c9252' date '25 May 2017' time '11:41:41 am' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.17' message 'eliminate some seaside.gemstone.com references' id '01c1cf6a-4d84-47d2-97f0-b9c4d7fffd58' date '28 February 2017' time '1:54:50 pm' author 'dkh' ancestors () stepChildren ())(name 'BaselineOfGrease-JohanBrichau.18' message 'Pharo 6 compatibility' id 'd2d614aa-b80c-0d00-b4b6-ae9900bfc9db' date '25 May 2017' time '12:46:04 pm' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.17' message 'Added pharo6' id '52335469-982c-483b-a975-4518820b9bcf' date '25 May 2017' time '11:20:35 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-dkh.16' message 'merged by GitFileTree-MergeDriver' id '644ab134-dd42-4b9f-948b-c277cd963d5d' date '26 August 2016' time '5:20:50 am' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.15' message 'merged by GitFileTree-MergeDriver' id '86b6f4f6-f95f-4bd7-9224-f31c5460e354' date '4 April 2016' time '9:40:53 am' author 'dkh' ancestors () stepChildren ())(name 'BaselineOfGrease-dkh.15' message 'merged by GitFileTree-MergeDriver' id '415af41c-2c3d-40a8-9f75-d9e8de921224' date '26 August 2016' time '2:19:29 am' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.10' message 'update for GemStone 3.4 ...' id 'ad7f9331-d83f-4976-bf57-1d1e81111fc6' date '21 December 2015' time '3:07:11 pm' author 'dkh' ancestors () stepChildren ())(name 'BaselineOfGrease-JohanBrichau.14' message 'Ensure Squeak5 tests package is loaded in Squeak5' id 'abde1bd6-a8d6-45fc-a922-bcf63ec38f03' date '27 February 2016' time '1:47:23 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.13' message 'Forked Grease-Tests-Pharo-Core into Grease-Tests-Squeak5-Core' id '3a01ebbc-8859-45db-ae5a-e5de8073d3a4' date '27 February 2016' time '1:40:18 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.12' message 'added Pharo-Tests to Squeak5 load' id 'ffe11ade-e4f1-496d-ae59-74543cfad134' date '27 February 2016' time '1:21:56 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.11' message 'added pharo5 platform to baseline' id '5c0332e9-ef4c-43cd-9066-7c9fe9ed6506' date '27 February 2016' time '12:12:12 pm' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.10' message 'added squeak 5 platform' id '18f9d568-869f-4550-804a-b0ba101f33f3' date '13 December 2015' time '8:36:25 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-dkh.9' message 'Update baseline for GemStone 3.3' id 'af9364dd-14bc-4e5e-9fc7-0abe08732ab2' date '26 May 2015' time '11:46:07 am' author 'dkh' ancestors ((name 'BaselineOfGrease-JohanBrichau.8' message 'separate package for Squeak' id '91c019c7-2b8b-40c3-97d9-2047a69512a7' date '22 March 2015' time '12:01:37 pm' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.7' message 'included Pharo 4 and did some baseline formatting' id '3722041d-d4b5-4496-a25a-0e891fe9a945' date '8 November 2014' time '9:28:01 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.6' message 'added initializeLatin1ToUtf8Encodings' id '4d976044-1aa9-44b6-bab0-b66ac758b3cd' date '19 October 2014' time '10:05:25 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.6' message 'added initializeLatin1ToUtf8Encodings' id 'b4ac5766-d472-4557-beff-59e5b733bce0' date '19 October 2014' time '10:04:55 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-dkh.5' message 'typoe' id '93eb3230-7956-4a6e-85dc-243f3dd895a1' date '4 June 2014' time '3:13:26 pm' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.4' message 'woops specified the package branch incorrectly ... I think I got it right this time...' id '3003ee31-9d17-4dd1-9b9a-f8a80e4f0ba1' date '4 June 2014' time '3:12:31 pm' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.3' message 'add Grease-Tests-GemStone-Core.v32 to baseline' id '26f128ca-b62e-4295-9a58-a9758b670c37' date '4 June 2014' time '2:57:48 pm' author 'dkh' ancestors ((name 'BaselineOfGrease-JohanBrichau.2' message 'forgotten methods' id '38758da9-c922-4530-a19e-f8783900e787' date '16 February 2014' time '3:50:22 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.1' message 'first baseline' id 'b89398df-14c6-4b6a-a2ba-91ad806bb07f' date '16 February 2014' time '1:49:46 am' author 'JohanBrichau' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())(name 'BaselineOfGrease-JohanBrichau.1496564071' message 'Fixed dependency of Grease-Tests-Core on the platform packages for GRDynamicVariableTest' id '6dd3612c-6111-0d00-8806-761908c307d1' date '23 July 2017' time '7:29:11 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.1496564070' message '- Removed pharo1.x and 2.x from the baseline since no longer supported.- Fixed dependency of Grease-Tests-Core on the platform packages for GRDynamicVariableTest' id 'd3220dff-6011-0d00-8805-b8f708c307d1' date '23 July 2017' time '7:16:30 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.1496564069' message 'Updated load snippets [ci skip]' id '26eaf907-cb05-504d-b251-ce1bcf3132ec' date '4 June 2017' time '10:14:29 am' author 'JohanBrichau' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())(name 'BaselineOfGrease-topa.1496564074' message 'Splice out Squeak6' id '1f990177-0195-46d7-b815-43ff320f8900' date '15 November 2017' time '5:36:47.836067 pm' author 'topa' ancestors ((name 'BaselineOfGrease-topa.1496564073' message 'Add Squeak6 (current trunk)' id 'c284dcef-9b71-4069-94b7-a2e8c42b6c0a' date '8 November 2017' time '11:59:28.059517 am' author 'topa' ancestors ((id 'a721b096-25cd-455c-a419-2fac8a9331c7')) stepChildren ())) stepChildren ())) stepChildren ())(name 'BaselineOfGrease-JohanBrichau.1496564075' message 'Pharo7 support' id 'a8370418-a51a-0d00-a9b9-68b104322501' date '18 November 2017' time '4:17:52.094479 pm' author 'JohanBrichau' ancestors ((id '1f990177-0195-46d7-b815-43ff320f8900')) stepChildren ())) stepChildren ())(name 'BaselineOfGrease-JohanBrichau.1496564077' message 'merged by GitFileTree-MergeDriver' id '78a5da19-96f2-4882-b983-e03dc820611b' date '19 November 2017' time '11:26:06.234613 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.1496564076' message 'merged by GitFileTree-MergeDriver' id 'e28f8c82-dd50-433c-9b9a-2347b11f5d0b' date '19 November 2017' time '11:14:30.449821 am' author 'JohanBrichau' ancestors ((id 'a8370418-a51a-0d00-a9b9-68b104322501')(id 'e9410295-6b3c-4eb3-8a28-e1191b60cb82')) stepChildren ())(id '4f023a3c-fdea-4577-a8c8-055680797042')) stepChildren ())) stepChildren ())
+(name 'BaselineOfGrease-JohanBrichau.1496564080' message 'Fix gemstone330 package references in the baseline (seems like a mistake was done years ago in dev branch)' id '0dc85b3c-9e37-0d00-a065-e21a0da0b32f' date '22 November 2018' time '9:17:34.247194 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.1496564079' message 'merged by GitFileTree-MergeDriver' id '76992aa1-9d37-0d00-b8c1-d67d0a027646' date '22 November 2018' time '8:34:10.555289 am' author 'JohanBrichau' ancestors () stepChildren ())) stepChildren ())
diff --git a/repository/BaselineOfGrease.package/properties.json b/repository/BaselineOfGrease.package/properties.json
@@ -1,2 +1 @@
-{
-	 }
+{ }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{`
`2`		`- "noMethodMetaData" : true,`
`3`	`2`	`"separateMethodMetaAndSource" : false,`
`4`		`- "useCypressPropertiesFile" : true }`
	`3`	`+ "noMethodMetaData" : true,`
	`4`	`+ "useCypressPropertiesFile" : true`
	`5`	`+}`