Repository: cayenne
Updated Branches:
  refs/heads/master 1525bc740 -> 7a2fb98f9


Upgrade tutorials


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

Branch: refs/heads/master
Commit: 42bcdb67b363cf74ce20cb01491aa9bdefba62cc
Parents: 1525bc7
Author: Arseni Bulatski <ancars...@gmail.com>
Authored: Tue Feb 13 14:36:48 2018 +0300
Committer: Arseni Bulatski <ancars...@gmail.com>
Committed: Tue Feb 13 14:36:48 2018 +0300

----------------------------------------------------------------------
 .../src/docs/asciidoc/_getting-started-guide/webapp.adoc       | 2 +-
 tutorials/tutorial-rop-client-http2/pom.xml                    | 5 +++++
 .../src/main/java/org/apache/cayenne/tutorial/Http2Client.java | 1 -
 tutorials/tutorial-rop-client/pom.xml                          | 5 +++++
 .../org/apache/cayenne/tutorial/persistent/client/Main.java    | 1 -
 tutorials/tutorial-rop-server-http2/pom.xml                    | 6 ++++++
 tutorials/tutorial-rop-server/pom.xml                          | 5 +++++
 tutorials/tutorial/pom.xml                                     | 1 +
 8 files changed, 23 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/42bcdb67/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/webapp.adoc
----------------------------------------------------------------------
diff --git 
a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/webapp.adoc
 
b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/webapp.adoc
index cc4eb86..32434a5 100644
--- 
a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/webapp.adoc
+++ 
b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/webapp.adoc
@@ -213,7 +213,7 @@ section and save the POM:
         <plugin>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-maven-plugin</artifactId>
-            <version>9.3.14.v20161028</version>
+            <version>9.4.8.v20171121</version>
         </plugin>
     </plugins>
 </build>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/42bcdb67/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 077a124..e1f3d95 100644
--- a/tutorials/tutorial-rop-client-http2/pom.xml
+++ b/tutorials/tutorial-rop-client-http2/pom.xml
@@ -40,6 +40,11 @@
             <artifactId>cayenne-protostuff</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/42bcdb67/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 fdf9e03..5cf74a2 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
@@ -69,7 +69,6 @@ public class Http2Client {
         ClientRuntime runtime = ClientRuntime.builder()
                             .properties(properties)
                             .addModule(new ClientJettyHttp2Module())
-                            .addModule(new ProtostuffModule())
                             .build();
 
         ObjectContext context = runtime.newContext();

http://git-wip-us.apache.org/repos/asf/cayenne/blob/42bcdb67/tutorials/tutorial-rop-client/pom.xml
----------------------------------------------------------------------
diff --git a/tutorials/tutorial-rop-client/pom.xml 
b/tutorials/tutorial-rop-client/pom.xml
index 9554c56..d3e8ab9 100644
--- a/tutorials/tutorial-rop-client/pom.xml
+++ b/tutorials/tutorial-rop-client/pom.xml
@@ -35,6 +35,11 @@
             <artifactId>hessian</artifactId>
                        <scope>compile</scope>
                </dependency>
+               <dependency>
+                       <groupId>org.slf4j</groupId>
+                       <artifactId>slf4j-simple</artifactId>
+                       <scope>compile</scope>
+               </dependency>
        </dependencies>
 
        <build>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/42bcdb67/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/Main.java
----------------------------------------------------------------------
diff --git 
a/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/Main.java
 
b/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/Main.java
index bc8fc0d..1838a86 100644
--- 
a/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/Main.java
+++ 
b/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/Main.java
@@ -41,7 +41,6 @@ public class Main {
 
         ClientRuntime runtime = ClientRuntime.builder()
                                 .properties(properties)
-                                .addModule(new ClientJettyHttpModule())
                                 .build();
 
         ObjectContext context = runtime.newContext();

http://git-wip-us.apache.org/repos/asf/cayenne/blob/42bcdb67/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 0da4fd6..091c312 100644
--- a/tutorials/tutorial-rop-server-http2/pom.xml
+++ b/tutorials/tutorial-rop-server-http2/pom.xml
@@ -45,6 +45,11 @@
             <artifactId>derby</artifactId>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <scope>compile</scope>
+        </dependency>
 
         <!-- Jetty's dependencies-->
         <dependency>
@@ -62,6 +67,7 @@
             <artifactId>jetty-servlets</artifactId>
             <version>${jetty.version}</version>
         </dependency>
+
     </dependencies>
 
 </project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/42bcdb67/tutorials/tutorial-rop-server/pom.xml
----------------------------------------------------------------------
diff --git a/tutorials/tutorial-rop-server/pom.xml 
b/tutorials/tutorial-rop-server/pom.xml
index ae48e8f..45a9389 100644
--- a/tutorials/tutorial-rop-server/pom.xml
+++ b/tutorials/tutorial-rop-server/pom.xml
@@ -41,6 +41,11 @@
             <artifactId>hessian</artifactId>
                        <scope>compile</scope>
                </dependency>
+               <dependency>
+                       <groupId>org.slf4j</groupId>
+                       <artifactId>slf4j-simple</artifactId>
+                       <scope>compile</scope>
+               </dependency>
        </dependencies>
 
        <build>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/42bcdb67/tutorials/tutorial/pom.xml
----------------------------------------------------------------------
diff --git a/tutorials/tutorial/pom.xml b/tutorials/tutorial/pom.xml
index ee39e05..32a0b84 100644
--- a/tutorials/tutorial/pom.xml
+++ b/tutorials/tutorial/pom.xml
@@ -23,6 +23,7 @@
 
        <artifactId>tutorial</artifactId>
        <name>tutorial: Cayenne Tutorial</name>
+       <packaging>war</packaging>
 
        <dependencies>
                <dependency>

Reply via email to