Repository: cayenne-website Updated Branches: refs/heads/asf-site 4cc4820f7 -> 209aeb391
test publish Project: http://git-wip-us.apache.org/repos/asf/cayenne-website/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne-website/commit/209aeb39 Tree: http://git-wip-us.apache.org/repos/asf/cayenne-website/tree/209aeb39 Diff: http://git-wip-us.apache.org/repos/asf/cayenne-website/diff/209aeb39 Branch: refs/heads/asf-site Commit: 209aeb391033d1bb4b7b40a47826a7460e88ed26 Parents: 4cc4820 Author: Nikita Timofeev <stari...@gmail.com> Authored: Fri Jan 12 17:35:05 2018 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Fri Jan 12 17:35:05 2018 +0300 ---------------------------------------------------------------------- docs/4.0/getting-started-guide/index.html | 10 ++++++---- .../images/idea-generated-classes.png | Bin 207620 -> 189767 bytes docs/4.1/getting-started-guide/index.html | 14 +++++--------- 3 files changed, 11 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/209aeb39/docs/4.0/getting-started-guide/index.html ---------------------------------------------------------------------- diff --git a/docs/4.0/getting-started-guide/index.html b/docs/4.0/getting-started-guide/index.html index 13d1e2d..3ea0455 100644 --- a/docs/4.0/getting-started-guide/index.html +++ b/docs/4.0/getting-started-guide/index.html @@ -425,20 +425,22 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.example.cayenne</groupId> <artifactId>tutorial</artifactId> - <version>0.0.1-SNAPSHOT</version><i class="conum" data-value="1"></i><b>(1)</b> + <version>0.0.1-SNAPSHOT</version> + <properties> + <cayenne.version>4.0.B3-SNAPSHOT</cayenne.version> <i class="conum" data-value="1"></i><b>(1)</b> + </properties> <dependencies> <dependency> <groupId>org.apache.cayenne</groupId> <artifactId>cayenne-server</artifactId> - <!-- Here specify the version of Cayenne you are actually using --> - <version>4.0.B3-SNAPSHOT</version> + <version>${cayenne.version}</version> </dependency> <!-- For java.time.* types you need to use this dependency--> <dependency> <groupId>org.apache.cayenne</groupId> <artifactId>cayenne-java8</artifactId> - <version>4.0.B3-SNAPSHOT</version> + <version>${cayenne.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/209aeb39/docs/4.1/getting-started-guide/images/idea-generated-classes.png ---------------------------------------------------------------------- diff --git a/docs/4.1/getting-started-guide/images/idea-generated-classes.png b/docs/4.1/getting-started-guide/images/idea-generated-classes.png index 504dce5..66ac6cb 100644 Binary files a/docs/4.1/getting-started-guide/images/idea-generated-classes.png and b/docs/4.1/getting-started-guide/images/idea-generated-classes.png differ http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/209aeb39/docs/4.1/getting-started-guide/index.html ---------------------------------------------------------------------- diff --git a/docs/4.1/getting-started-guide/index.html b/docs/4.1/getting-started-guide/index.html index d845200..68c17b2 100644 --- a/docs/4.1/getting-started-guide/index.html +++ b/docs/4.1/getting-started-guide/index.html @@ -188,7 +188,7 @@ <div class="sect2"> <h3 id="install-java"><a class="anchor" href="#install-java"></a>1.1. Install Java</h3> <div class="paragraph"> - <p>Obviously, JDK has to be installed. Cayenne 4.0 requires JDK 1.7 or newer.</p> + <p>Obviously, JDK has to be installed. Cayenne 4.1 requires JDK 1.8 or newer.</p> </div> </div> <div class="sect2"> @@ -422,7 +422,7 @@ </ul> </div> <div class="paragraph"> - <p>Now go back to IDEA - you should see pairs of classes generated for each mapped entity. You probably also see that thereâs a bunch of red squiggles next to the newly generated Java classes in IDEA. This is because our project does not include Cayenne as a Maven dependency yet. Letâs fix it now by adding "cayenne-server" and "cayenne-java8" artifacts in the bottom of the <code>pom.xml</code> file. Also we should tell Maven compile plugin that our project needs Java 8. The resulting POM should look like this:</p> + <p>Now go back to IDEA - you should see pairs of classes generated for each mapped entity. You probably also see that thereâs a bunch of red squiggles next to the newly generated Java classes in IDEA. This is because our project does not include Cayenne as a Maven dependency yet. Letâs fix it now by adding "cayenne-server" artifact in the bottom of the <code>pom.xml</code> file. Also we should tell Maven compile plugin that our project needs Java 8. The resulting POM should look like this:</p> </div> <div class="listingblock"> <div class="content"> @@ -432,7 +432,9 @@ <groupId>org.example.cayenne</groupId> <artifactId>tutorial</artifactId> <version>0.0.1-SNAPSHOT</version> - <cayenne.version>4.1.M2-SNAPSHOT</version> <i class="conum" data-value="1"></i><b>(1)</b> + <properties> + <cayenne.version>4.1.M2-SNAPSHOT</cayenne.version> <i class="conum" data-value="1"></i><b>(1)</b> + </properties> <dependencies> <dependency> @@ -440,12 +442,6 @@ <artifactId>cayenne-server</artifactId> <version>${cayenne.version}</version> </dependency> - <!-- For java.time.* types you need to use this dependency--> - <dependency> - <groupId>org.apache.cayenne</groupId> - <artifactId>cayenne-java8</artifactId> - <version>${cayenne.version}</version> - </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId>
