Infra-4340 Updated Jakarta EE WG Charter to 1.6

Signed-off-by: Zhou Fang <zhou.fang@eclipse-foundation.org>

Change-Id: Id9b8009ba77f8d64ce05de4cfae7567f6540e0d0
diff --git a/workinggroups/content/en_jakarta_ee_charter.php b/workinggroups/content/en_jakarta_ee_charter.php
index beff645..f9961fa 100644
--- a/workinggroups/content/en_jakarta_ee_charter.php
+++ b/workinggroups/content/en_jakarta_ee_charter.php
@@ -17,7 +17,7 @@
 <div id="maincontent">
   <div id="midcolumn">
     <h1><?php print $pageTitle; ?></h1>
-    <p>Version v1.5 Revision history is at end of document.</p>
+    <p>Version v1.6 Revision history is at end of document.</p>
     <h2>Vision and Scope</h2>
     <p>The Jakarta EE working group will drive the evolution and broad adoption of technologies
       derived from or related to the Eclipse Enterprise for Java (EE4J) project. Eclipse Enterprise
@@ -48,6 +48,8 @@
       <li>Eclipse Foundation Bylaws</li>
       <li>Eclipse Foundation Working Group Process</li>
       <li>Eclipse Foundation Working Group Operations Guide</li>
+      <li>Eclipse Foundation Code of Conduct</li>
+      <li>Eclipse Foundation Communication Channel Guidelines</li>
       <li>Eclipse Foundation Membership Agreement</li>      
       <li>Eclipse Foundation Intellectual Property Policy</li>
       <li>Eclipse Foundation Antitrust Policy</li>
@@ -67,7 +69,7 @@
     <h2>Membership</h2>
     <p>
       With the exception of Guest members as described below, an entity must be at least a <a
-        href="http://www.eclipse.org/membership/become_a_member/membershipTypes.php#contributing"
+        href="/membership/become_a_member/membershipTypes.php#contributing"
       >Contributing Member</a> of the Eclipse Foundation, have executed the Jakarta EE Working Group Participation
       Agreement, and adhere to the requirements set forth in this Charter to participate.
     </p>
@@ -91,8 +93,6 @@
       of this working group.</p>
     <p>Strategic Members of the Jakarta EE working group must be at least a Contributing Member of the
       Eclipse Foundation, and have a minimum of 4 developers participating on EE4J projects.</p>
-    <p>Strategic Members of the Jakarta EE working group are required to commit to strategic
-      membership for a three (3) year period.</p>
     <h3>Enterprise members</h3>
     <p>Enterprise Members are typically organizations that view enterprise Java technology as a
       critical part of their organization's business operations. These organizations want to support
@@ -116,8 +116,7 @@
       >Eclipse Foundation Committer Membership</a> page.
     </p>
     <h3>Guest members</h3>
-    <p>Guest Members are organizations which are Associate members of the Eclipse Foundation who
-      have been invited for one year, renewable, by the Steering Committee to participate in
+    <p>Guest Members are organizations which are Associate members of the Eclipse Foundation that wish to participate in
       particular aspects of the activities of the Working Group. Typical guests include JUGs, R&D
       partners, universities, academic research centers, etc. Guests may be invited to participate
       in committee meetings at the invitation of the respective committee, but under no
@@ -142,7 +141,7 @@
           <td>Elected</td>
           <td>Elected</td>
           <td>Elected</td>
-          <td>N/A</td>
+          <td>Invitation Only</td>
         </tr>
         <tr>
           <td>Member of the Specification Committee</td>
@@ -160,14 +159,6 @@
           <td>Elected</td>
           <td>Invitation Only</td>
         </tr>
-        <tr>
-          <td>Member of the Enterprise Requirements Committee</td>
-          <td>Appointed</td>
-          <td>Appointed</td>
-          <td>N/A</td>
-          <td>N/A</td>
-          <td>N/A</td>
-        </tr>
       </tbody>
     </table>
     <p>All matters related to Membership in the Eclipse Foundation and this Jakarta EE working group
@@ -178,6 +169,7 @@
     <p>This Jakarta EE working group is designed as:</p>
     <ul>
       <li>a member driven organization,</li>
+      <li>a welcoming and professional environment,</li>
       <li>a means to foster a vibrant and sustainable ecosystem of components and service providers,</li>
       <li>a means to organize the community of each project or component so that users and
         developers define the roadmap collaboratively.</li>
@@ -188,7 +180,6 @@
       <li>The Steering Committee</li>
       <li>The Specification Committee</li>
       <li>The Marketing and Brand Committee</li>
-      <li>The Enterprise Requirements Committee</li>
     </ul>
     <h2>Steering Committee</h2>
     <h3>Powers and Duties</h3>
@@ -206,7 +197,6 @@
         implementations of specifications.</li>
       <li>Define the annual fees for all classes of working group membership.</li>
       <li>Approve the annual budget based upon funds received through fees.</li>
-      <li>Invite Guest members to participate in the working group.</li>
     </ul>
     <h3>Composition</h3>
     <ul>
@@ -251,8 +241,7 @@
         Guest members have no voting rights.</li>
       <li>Any additional individuals as designated from time to time by the Executive Director.</li>
       <li>The Committee elects a chair who reports to the Steering Committee. This chair is elected
-        among the members of the Committee. They will serve from April 1 to March 31 of each
-        calendar year, or until their successor is elected and qualified, or as otherwise provided
+        among the members of the Committee. They will serve for a 12 month period, or until their successor is elected and qualified, or as otherwise provided
         for in this Charter.</li>
     </ul>
     <h3>Meeting Management</h3>
@@ -282,66 +271,22 @@
         Guest members have no voting rights.</li>
       <li>Any additional individuals as designated from time to time by the Executive Director.</li>
       <li>The Committee elects a chair who reports to the Steering Committee. This chair is elected
-        among the members of the Committee. They will serve from April 1 to March 31 of each
-        calendar year, or until their successor is elected and qualified, or as otherwise provided
-        for in this Charter.</li>
+        among the members of the Committee. They will serve for a 12 month period, or until their successor is elected 
+        and qualified, or as otherwise provided for in this Charter.</li>
     </ul>
     <h3>Meeting Management</h3>
     <p>Marketing Committee meets at least once per quarter.</p>
-    <h2>Enterprise Requirements Committee</h2>
-    <p>The purpose of the Enterprise Requirements Committee is to provide Enterprise members with
-      insight and input into the current state and future roadmap of the working group, and to
-      articulate their defined requirements as a means of formalizing recommendations and other
-      input to the working group. Having Enterprise Members fully participating in the working group
-      leads to more direct, open, and transparent conversations between Enterprise and Strategic
-      members, and allows each of these stakeholders to create a common vision and roadmap.</p>
-    <p>It is expected that on an annual basis, Enterprise Members shall have the opportunity to
-      participate in the Jakarta EE Enterprise Member Summit, where they will meet to study, review,
-      and comment on the state of enterprise Java, and to gain insights important to their specific
-      business operations. Strategic members are also expected to attend the Enterprise Member
-      Summit to provide their input and perspective.</p>
-    <p>By creating this committee and formalizing the Summit process, Enterprise members shall gain
-      early insight and be able to influence the state of the industry.</p>
-    <h3>Powers and Duties</h3>
-    <p>Enterprise Requirements Committee members are expected to:</p>
-    <ul>
-      <li>Participate in an annual Enterprise Committee Summit</li>
-      <li>Provide input to the Steering, Specification, and Marketing Committees on their current
-        and future activities</li>
-      <li>Review the policies and activities of each of the Steering, Specification, and Marketing
-        Committees, and provide formal feedback on same</li>
-    </ul>
-    <h3>Composition</h3>
-    <ul>
-      <li>Each Strategic Member of the working group has a seat on the Enterprise Requirements
-        Committee.</li>
-      <li>Each Enterprise Member of the working group has a seat on the Enterprise Requirements
-        Committee.</li>
-      <li>Any additional individuals as designated from time to time by the Executive Director.</li>
-      <li>The Committee elects a chair who reports to the Steering Committee. This chair is elected
-        among the members of the Committee. They will serve from April 1 to March 31 of each
-        calendar year, or until their successor is elected and qualified, or as otherwise provided
-        for in this Charter.</li>
-    </ul>
-    <h3>Meeting Management</h3>
-    <p>The Enterprise Requirements Committee meets at least once per quarter.</p>
-    <p>The Enterprise Requirements Committee meets face to face on an annual basis at the Jakarta EE
-      Enterprise Member Summit.</p>
     <h2>Common Dispositions</h2>
     <p>The dispositions below apply to all governance bodies for this working group, unless
       otherwise specified. For all matters related to membership action, including without
       limitation: meetings, quorum, voting, electronic voting action without meeting, vacancy,
       resignation or removal, the respective terms set forth in the Eclipse Foundation Bylaws
       apply.</p>
-    <h3>Good Standing</h3>
-    <p>A representative shall be deemed to be in Good Standing, and thus eligible to vote on issues
-      coming before the Body they participate in, if the representative has attended (in person or
-      telephonically) a minimum of three (3) of the last four (4) Body meetings (if there have been
-      at least four meetings). Appointed representatives on the Body may be replaced by the Member
+    <p>Appointed representatives on the Body may be replaced by the Member
       organization they are representing at any time by providing written notice to the Steering
       Committee. In the event a Body member is unavailable to attend or participate in a meeting of
-      the Body, they may send a representative and may vote by proxy, or they may be represented by another Body member by providing written proxy to the Body’s mailing list in advance, which shall be included in
-      determining whether the representative is in Good Standing. As per the Eclipse Foundation
+      the Body, they may send a representative and may vote by proxy, or they may be represented by 
+      another Body member by providing written proxy to the Body’s mailing list in advance. As per the Eclipse Foundation
       Bylaws, a representative shall be immediately removed from the Body upon the termination of
       the membership of such representative’s Member organization.</p>
     <h3 id="voting">Voting</h3>
@@ -349,11 +294,9 @@
     <p>For actions (i) requesting that the Eclipse Foundation Board of Directors approve a
       specification license; (ii) approving specifications for adoption; (iii) approving or changing the name of the
       working group; and (iv) approving changes to annual Member contribution requirements; any such
-      actions must be approved by no less than two-thirds (2/3) of the representatives in Good
-      Standing represented at a committee meeting at which a quorum is present.</p>
+      actions must be approved by no less than two-thirds (2/3) of the representatives represented 
+      at a committee meeting at which a quorum is present.</p>
     <h3>Term and Dates of elections</h3>
-    <p>This section only applies to the Steering Committee, Specification Committee, and the
-      Marketing Committee.</p>
     <p>All representatives shall hold office until their respective successors are appointed or
       elected, as applicable. There shall be no prohibition on re-election or re-designation of any
       representative following the completion of that representative’s term of office.</p>
@@ -362,8 +305,8 @@
       earlier of their removal by their respective appointing Member organization or as otherwise
       provided for in this Charter.</p>
     <h4>Elected representatives</h4>
-    <p>Elected representatives shall each serve one-year terms and shall be elected to serve from
-      April 1 to March 31 of each calendar year, or until their respective successors are elected
+    <p>Elected representatives shall each serve one-year terms and shall be elected to serve for a 12 month period, 
+      or until their respective successors are elected
       and qualified, or as otherwise provided for in this Charter. Procedures governing elections of
       Representatives may be established pursuant to resolutions of the Steering Committee provided
       that such resolutions are not inconsistent with any provision of this Charter.</p>
@@ -376,7 +319,7 @@
     <h4>Regular meetings</h4>
     <p>
       No Body meeting will be deemed to have been validly held unless a notice of same has been
-      provided to each of the representatives in Good Standing at least fifteen (15) calendar days
+      provided to each of the representatives at least fifteen (15) calendar days
       prior to such meeting, which notice will identify all potential actions to be undertaken by
       the Body at the Body meeting. No representative will be intentionally excluded from Body
       meetings and all representatives shall receive notice of the meeting as specified above;
@@ -393,21 +336,25 @@
     <h3>Invitations</h3>
     <p>The Body may invite any member to any of its meetings. These invited attendees have no right
       of vote.</p>
+    <br> 
     <p>
       <strong>Charter Version History</strong>
     </p>
     <p>
-      v1.0 created February 5, 2018<br> Revised v1.1 February 27, 2018 - Added Guest membership<br>
-      Revised v1.2 March 6, 2018 - Changed name from EE.next to Jakarta EE<br> Revised v1.3 May 8,
-      2018 - Changed name of Influencer Member to Enterprise Member<br> Revised v1.4 September 11,
-      2018 - Defined the annual membership fees; altered the Eclipse Foundation membership level
-      requirements to allow Solutions members of the Foundation to become Strategic, Enterprise or
-      Solutions members of the working group.<br>Revised v1.5 November 24, 2020 - Updates in support of the Eclipse Foundation corporate restructuring
+      v1.0 created February 5, 2018<br> 
+      Revised v1.1 February 27, 2018 - Added Guest membership<br>
+      Revised v1.2 March 6, 2018 - Changed name from EE.next to Jakarta EE<br> 
+      Revised v1.3 May 8, 2018 - Changed name of Influencer Member to Enterprise Member<br> 
+      Revised v1.4 September 11, 2018 - Defined the annual membership fees; altered the Eclipse Foundation 
+      membership level requirements to allow Solutions members of the Foundation to become Strategic, 
+      Enterprise or Solutions members of the working group<br>
+      Revised v1.5 November 24, 2020 - Updates in support of the Eclipse Foundation corporate restructuring<br>
+      Revised v1.6 September 14, 2021 - Updates to support removal of strategic member 3 year commitment, 
+      Enterprise Requirements Committee and other administrative adjustments
     </p>
     <h2>Jakarta EE Working Group Annual Participation Fees Schedule A</h2>
     <p>The following fees have been established by the Jakarta EE Steering Committee.</p>
     <h3>Jakarta EE Strategic Member Annual Participation Fees</h3>
-    <p>Strategic members are required to commit to three (3) years of membership.</p>
     <table class="table">
       <tr>
         <th>Corporate Revenue</th>