Jesse Glick <jglick@netbeans.org> [Fri, 21 Jan 2011 09:59:37 -0500] rev 4554
Closing merged branch.
Vladimir Yaroslavskiy <yaroslavskiy@netbeans.org> [Tue, 23 Nov 2010 18:32:28 +0300] rev 4553
Fix Sierra autobuild fails
Jesse Glick <jglick@netbeans.org> [Tue, 21 Sep 2010 11:27:30 -0400] rev 4552
Starting over with a fresh patch.
Jesse Glick <jglick@netbeans.org> [Thu, 16 Sep 2010 16:57:10 -0400] rev 4551
Closing in preparation for merge to default.
Jesse Glick <jglick@netbeans.org> [Tue, 24 Aug 2010 10:03:37 -0400] rev 4550
Closing in preparation for merge to default.
Jesse Glick <jglick@netbeans.org> [Thu, 22 Jul 2010 17:50:15 -0400] rev 4549
synch w/ default
AlexanderPermyakov <alex02@netbeans.org> [Tue, 20 Jul 2010 18:30:10 +0400] rev 4548
remove sql-plugin form gf-esb build
Jesse Glick <jglick@netbeans.org> [Fri, 16 Jul 2010 14:21:50 -0400] rev 4547
Merged default into maven-dev.
Made no attempt to fix compilability or other semantic errors.
Conflict markers left for now in:
maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenNbModuleImpl.java
maven.embedder/src/org/netbeans/modules/maven/embedder/EmbedderFactory.java
maven.grammar/src/org/netbeans/modules/maven/grammar/MavenProjectGrammar.java
maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java
maven.model/test/unit/src/org/netbeans/modules/maven/pom/ModelTest.java
maven/src/org/netbeans/modules/maven/ActionProviderImpl.java
maven/src/org/netbeans/modules/maven/execute/MavenJavaExecutor.java
Jesse Glick <jglick@netbeans.org> [Fri, 16 Jul 2010 11:47:36 -0400] rev 4546
No longer want to treat this anonymous branch as part of the default branch.
AlexanderPermyakov <alex02@netbeans.org> [Thu, 15 Jul 2010 13:56:10 +0400] rev 4545
delete following BC: IMS , SAP, SNMP, SMTP, SWIFT , MQ as these were not part of the GF-ESB v2.2