Repository: cayenne Updated Branches: refs/heads/master df1324e40 -> 5adac63ad
Remove copyright section from docs version for site Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/5adac63a Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/5adac63a Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/5adac63a Branch: refs/heads/master Commit: 5adac63ad325fd25df6a8f6b3d8f17ac511a9939 Parents: df1324e Author: Nikita Timofeev <[email protected]> Authored: Fri Jan 5 11:42:54 2018 +0300 Committer: Nikita Timofeev <[email protected]> Committed: Fri Jan 5 11:42:54 2018 +0300 ---------------------------------------------------------------------- .../org/apache/cayenne/asciidoc/CayennePostProcessor.java | 7 ++++--- .../src/docs/asciidoc/_upgrade-guide/new-features.adoc | 8 +++++++- 2 files changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/5adac63a/docs/asciidoc/cayenne-asciidoc-extension/src/main/java/org/apache/cayenne/asciidoc/CayennePostProcessor.java ---------------------------------------------------------------------- diff --git a/docs/asciidoc/cayenne-asciidoc-extension/src/main/java/org/apache/cayenne/asciidoc/CayennePostProcessor.java b/docs/asciidoc/cayenne-asciidoc-extension/src/main/java/org/apache/cayenne/asciidoc/CayennePostProcessor.java index 10fc106..36f9e1f 100644 --- a/docs/asciidoc/cayenne-asciidoc-extension/src/main/java/org/apache/cayenne/asciidoc/CayennePostProcessor.java +++ b/docs/asciidoc/cayenne-asciidoc-extension/src/main/java/org/apache/cayenne/asciidoc/CayennePostProcessor.java @@ -33,7 +33,6 @@ import org.asciidoctor.ast.Document; import org.asciidoctor.ast.DocumentRuby; import org.asciidoctor.extension.Postprocessor; import org.jsoup.Jsoup; -import org.jsoup.nodes.Element; /** * <p> @@ -66,13 +65,13 @@ public class CayennePostProcessor extends Postprocessor { public String process(Document document, String output) { output = extractTableOfContents(document, output); - output = fixupTableClasses(document, output); + output = fixupDom(document, output); output = processHeader(document, output); output = processFooter(document, output); return output; } - private String fixupTableClasses(Document document, String output) { + private String fixupDom(Document document, String output) { org.jsoup.nodes.Document jsoupDoc = Jsoup.parseBodyFragment(output); jsoupDoc.select(".icon-note") @@ -92,6 +91,8 @@ public class CayennePostProcessor extends Postprocessor { } }); + jsoupDoc.select("div#preamble").remove(); + return jsoupDoc.body().html(); } http://git-wip-us.apache.org/repos/asf/cayenne/blob/5adac63a/docs/asciidoc/upgrade-guide/src/docs/asciidoc/_upgrade-guide/new-features.adoc ---------------------------------------------------------------------- diff --git a/docs/asciidoc/upgrade-guide/src/docs/asciidoc/_upgrade-guide/new-features.adoc b/docs/asciidoc/upgrade-guide/src/docs/asciidoc/_upgrade-guide/new-features.adoc index 49d1cdf..bcc3372 100644 --- a/docs/asciidoc/upgrade-guide/src/docs/asciidoc/_upgrade-guide/new-features.adoc +++ b/docs/asciidoc/upgrade-guide/src/docs/asciidoc/_upgrade-guide/new-features.adoc @@ -11,4 +11,10 @@ // CONDITIONS OF ANY KIND, either express or implied. See the License for // the specific language governing permissions and limitations under the // License. -NOTE: TODO \ No newline at end of file +== Java Version + +Minimum required JDK version is 1.8 or newer. Cayenne 4.1 is fully tested with Java 1.8 and 9. + +== New Features + +// TODO: new features \ No newline at end of file
