site and dist fixes
diff --git a/dist/src/assembly/src.xml b/dist/src/assembly/src.xml
index 9a48eac..58f15db 100644
--- a/dist/src/assembly/src.xml
+++ b/dist/src/assembly/src.xml
@@ -59,7 +59,7 @@
<outputDirectory></outputDirectory>
<includes>
<include>README*</include>
- <include>pom.xml</include>
+ <include>*.xml</include>
<include>src/**</include>
<include>xdocs/**</include>
</includes>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 6fe9b2b..c56386f 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -23,15 +23,36 @@
<author email="epugh@upstate.com">Eric Pugh</author>
</properties>
<body>
- <release version="2.1.0" description="In VC">
+ <release version="2.1.1" description="In VC">
+ <action type="update" dev="gk">
+ Update to Turbine parent v10
+ </action>
+ </release>
+ <release version="2.1.0" description="2021-11-04">
<action type="update" dev="gk">
- - Update to Turbine parent v9
- - Torque: use by default Turbinegroup not TurbineRole from generated doSelectJoinTurbine* method, as this will be used as key in lookup in acl roleSets.
- - add groupSet to interface to TurbineAccessControlList
- - add transient avalon logger to TurbineAccessControlList constructor
- - use model manager to fetch global group (model manager should be set always)
- - Add Torque 5.0 schemata
- - Java Dependency updates: Update to commons-dbcp2 2.9.0 (Torque)
+ Update to Turbine parent v9
+ </action>
+ <action type="fix" dev="gk">
+ Torque: use by default Turbinegroup not TurbineRole from generated doSelectJoinTurbine* method, as this will be used as key in lookup in acl roleSets.
+ </action>
+ <action type="update" dev="gk">
+ Add groupSet to interface to TurbineAccessControlList
+ </action>
+ <action type="update" dev="gk">
+ Add transient avalon logger to TurbineAccessControlList constructor
+ </action>
+ <action type="update" dev="gk">
+ Use model manager to fetch global group (model manager should be set always)
+ </action>
+ <action type="update" dev="gk">
+ Add Torque 5.0 schemata
+ </action>
+ <action type="update" dev="painter">
+ Java Dependency updates: Update to commons-dbcp2 2.9.0 (Torque)
+ </action>
+ <action type="update" dev="gk">
+ Suspended Hibernate support due to security reasons. hibernate needs update to 5.x version to resolve it in issue:
+ https://issues.apache.org/jira/browse/TRB-103
</action>
</release>
<release version="2.0.0" description="2020-01-04">
diff --git a/xdocs/index.xml b/xdocs/index.xml
index c2d19c7..e1a6903 100644
--- a/xdocs/index.xml
+++ b/xdocs/index.xml
@@ -49,10 +49,11 @@
<th/><th>User</th><th>Group</th><th>User</th><th>Group</th><th>Role</th><th>Permission</th><th>Delegates</th><th>User</th><th>Group</th><th>Role</th><th>Permission</th><th>UserGroupRole</th>
</tr>
<tr><th>Memory</th><td>X</td><td>X</td><td>X</td><td>X</td><td>X</td><td>X</td><td>X</td><td>X</td><td>X</td><td>X</td><td>X</td><td>X</td></tr>
- <tr><th>Hibernate</th><td>X</td><td>X</td><td>X</td><td>X</td><td>X</td><td>X</td><td>X</td><td>X</td><td>X</td><td>X</td><td>X</td><td>X</td></tr>
+ <tr><th>Hibernate*</th><td>X</td><td>X</td><td>X</td><td>X</td><td>X</td><td>X</td><td>X</td><td>X</td><td>X</td><td>X</td><td>X</td><td>X</td></tr>
<tr><th>Torque</th><td>X</td><td>X</td><td>X</td><td>X</td><td>X</td><td>X</td><td>X</td><td>X</td><td>X</td><td>X</td><td>X</td><td>X</td></tr>
<tr><th>NT</th><td>X</td><td>X</td><td>X</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
</table>
+ <p>Hiberate support suspended since v.2.1.0 due to security reasons.</p>
</subsection>
</section>