cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject cayenne git commit: doesn't look like cayenne-java8 is still required in 4.1
Date Sat, 14 Oct 2017 14:15:32 GMT
Repository: cayenne
Updated Branches:
  refs/heads/master 2e52a4294 -> 0691651e6


doesn't look like cayenne-java8 is still required in 4.1


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/0691651e
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/0691651e
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/0691651e

Branch: refs/heads/master
Commit: 0691651e65d11f17ec95b0acb6cda6411a3d2368
Parents: 2e52a42
Author: Andrus Adamchik <andrus@objectstyle.com>
Authored: Sat Oct 14 16:57:29 2017 +0300
Committer: Andrus Adamchik <andrus@objectstyle.com>
Committed: Sat Oct 14 17:10:26 2017 +0300

----------------------------------------------------------------------
 cayenne-java8/pom.xml                                         | 2 ++
 cayenne-protostuff/pom.xml                                    | 6 ------
 .../cayenne-guide/src/docbkx/customizing-cayenne-runtime.xml  | 1 -
 docs/docbook/cayenne-guide/src/docbkx/ext-java8.xml           | 7 +++++--
 docs/docbook/getting-started/src/docbkx/java-classes.xml      | 4 ++--
 tutorials/tutorial-rop-client-http2/pom.xml                   | 5 -----
 .../main/java/org/apache/cayenne/tutorial/Http2Client.java    | 4 +---
 tutorials/tutorial-rop-server-http2/pom.xml                   | 5 -----
 tutorials/tutorial/pom.xml                                    | 5 -----
 9 files changed, 10 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/0691651e/cayenne-java8/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-java8/pom.xml b/cayenne-java8/pom.xml
index 24be597..b2517b8 100644
--- a/cayenne-java8/pom.xml
+++ b/cayenne-java8/pom.xml
@@ -16,6 +16,8 @@
 		<groupId>org.apache.cayenne</groupId>
 		<version>4.1.M2-SNAPSHOT</version>
 	</parent>
+
+	<!-- DEPRECATED SINCE 4.1 -->
 	<artifactId>cayenne-java8</artifactId>
 	<name>cayenne-java8: Cayenne Java8 Extensions</name>
 	<packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0691651e/cayenne-protostuff/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-protostuff/pom.xml b/cayenne-protostuff/pom.xml
index 11f8eb6..c17a7dc 100644
--- a/cayenne-protostuff/pom.xml
+++ b/cayenne-protostuff/pom.xml
@@ -65,12 +65,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.cayenne</groupId>
-            <artifactId>cayenne-java8</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0691651e/docs/docbook/cayenne-guide/src/docbkx/customizing-cayenne-runtime.xml
----------------------------------------------------------------------
diff --git a/docs/docbook/cayenne-guide/src/docbkx/customizing-cayenne-runtime.xml b/docs/docbook/cayenne-guide/src/docbkx/customizing-cayenne-runtime.xml
index 1ffdb3b..89b6e38 100644
--- a/docs/docbook/cayenne-guide/src/docbkx/customizing-cayenne-runtime.xml
+++ b/docs/docbook/cayenne-guide/src/docbkx/customizing-cayenne-runtime.xml
@@ -317,7 +317,6 @@ binder.bindList(DefaultDbAdapterFactory.DETECTORS_LIST)
     .build();]]></programlisting>
             </para>
             <para>More examples of implementation you can find in
-                <!--<link xlink:href="https://github.com/apache/cayenne/tree/master/cayenne-java8">cayenne-java8
module</link> or-->
                 <link xlink:href="https://github.com/apache/cayenne/tree/master/cayenne-joda">cayenne-joda
module</link>.</para>
         </section>
         <section xml:id="extendedtypes">

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0691651e/docs/docbook/cayenne-guide/src/docbkx/ext-java8.xml
----------------------------------------------------------------------
diff --git a/docs/docbook/cayenne-guide/src/docbkx/ext-java8.xml b/docs/docbook/cayenne-guide/src/docbkx/ext-java8.xml
index 9ee1e70..aa58d8a 100644
--- a/docs/docbook/cayenne-guide/src/docbkx/ext-java8.xml
+++ b/docs/docbook/cayenne-guide/src/docbkx/ext-java8.xml
@@ -22,8 +22,11 @@
     <title>Java 8 extension</title>
     <section>
         <title>Description</title>
-        <para>Java 8 module allows to use <code>java.time.LocalTime</code>,
<code>java.time.LocalDate</code>
-        and <code>java.time.LocalDateTime</code> types for entity attributes</para>
+        <para><emphasis>Since Cayenne 4.1 this extension is deprecated, and is
present for backwards
+                compatibility purposes only. cayenne-server module now incorporates all Cayenne
Java
+                8 functionality.</emphasis> Java 8 module allows to use
+                <code>java.time.LocalTime</code>, <code>java.time.LocalDate</code>
and
+                <code>java.time.LocalDateTime</code> types for entity attributes.
 </para>
     </section>
     <section>
         <title>Including in a project</title>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0691651e/docs/docbook/getting-started/src/docbkx/java-classes.xml
----------------------------------------------------------------------
diff --git a/docs/docbook/getting-started/src/docbkx/java-classes.xml b/docs/docbook/getting-started/src/docbkx/java-classes.xml
index 82ecb5e..d6b46d5 100644
--- a/docs/docbook/getting-started/src/docbkx/java-classes.xml
+++ b/docs/docbook/getting-started/src/docbkx/java-classes.xml
@@ -50,8 +50,8 @@
         <para>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
+            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:<programlisting language="xml">&lt;project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"&gt;

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0691651e/tutorials/tutorial-rop-client-http2/pom.xml
----------------------------------------------------------------------
diff --git a/tutorials/tutorial-rop-client-http2/pom.xml b/tutorials/tutorial-rop-client-http2/pom.xml
index aadad37..077a124 100644
--- a/tutorials/tutorial-rop-client-http2/pom.xml
+++ b/tutorials/tutorial-rop-client-http2/pom.xml
@@ -40,11 +40,6 @@
             <artifactId>cayenne-protostuff</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.cayenne</groupId>
-            <artifactId>cayenne-java8</artifactId>
-            <version>${project.version}</version>
-        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0691651e/tutorials/tutorial-rop-client-http2/src/main/java/org/apache/cayenne/tutorial/Http2Client.java
----------------------------------------------------------------------
diff --git a/tutorials/tutorial-rop-client-http2/src/main/java/org/apache/cayenne/tutorial/Http2Client.java
b/tutorials/tutorial-rop-client-http2/src/main/java/org/apache/cayenne/tutorial/Http2Client.java
index 33f7d93..bb97846 100644
--- a/tutorials/tutorial-rop-client-http2/src/main/java/org/apache/cayenne/tutorial/Http2Client.java
+++ b/tutorials/tutorial-rop-client-http2/src/main/java/org/apache/cayenne/tutorial/Http2Client.java
@@ -24,7 +24,6 @@ import org.apache.cayenne.configuration.rop.client.ClientConstants;
 import org.apache.cayenne.configuration.rop.client.ClientJettyHttp2Module;
 import org.apache.cayenne.configuration.rop.client.ClientRuntime;
 import org.apache.cayenne.configuration.rop.client.ProtostuffModule;
-import org.apache.cayenne.java8.Java8Module;
 import org.apache.cayenne.query.ObjectSelect;
 import org.apache.cayenne.rop.JettyHttp2ClientConnectionProvider;
 import org.apache.cayenne.rop.http.JettyHttpROPConnector;
@@ -68,8 +67,7 @@ public class Http2Client {
 
         ClientRuntime runtime = new ClientRuntime(properties,
                 new ClientJettyHttp2Module(),
-                new ProtostuffModule(),
-                new Java8Module());
+                new ProtostuffModule());
 
         ObjectContext context = runtime.newContext();
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0691651e/tutorials/tutorial-rop-server-http2/pom.xml
----------------------------------------------------------------------
diff --git a/tutorials/tutorial-rop-server-http2/pom.xml b/tutorials/tutorial-rop-server-http2/pom.xml
index 3d658ca..0da4fd6 100644
--- a/tutorials/tutorial-rop-server-http2/pom.xml
+++ b/tutorials/tutorial-rop-server-http2/pom.xml
@@ -41,11 +41,6 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.cayenne</groupId>
-            <artifactId>cayenne-java8</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
             <groupId>org.apache.derby</groupId>
             <artifactId>derby</artifactId>
             <scope>compile</scope>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0691651e/tutorials/tutorial/pom.xml
----------------------------------------------------------------------
diff --git a/tutorials/tutorial/pom.xml b/tutorials/tutorial/pom.xml
index 0ccf711..d9e2f28 100644
--- a/tutorials/tutorial/pom.xml
+++ b/tutorials/tutorial/pom.xml
@@ -31,11 +31,6 @@
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.cayenne</groupId>
-			<artifactId>cayenne-java8</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>
 		</dependency>


Mime
View raw message