cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntimof...@apache.org
Subject [3/3] cayenne git commit: Merge remote-tracking branch 'remotes/parent/pr/227' into asf-master
Date Thu, 08 Jun 2017 08:23:50 GMT
Merge remote-tracking branch 'remotes/parent/pr/227' into asf-master

# Conflicts:
#	tutorials/tutorial/pom.xml


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

Branch: refs/heads/master
Commit: 1b91a9053cb3e74096aabeb86e2979a0c233c674
Parents: 079df57 347e504
Author: Nikita Timofeev <stariy95@gmail.com>
Authored: Thu Jun 8 11:22:25 2017 +0300
Committer: Nikita Timofeev <stariy95@gmail.com>
Committed: Thu Jun 8 11:22:25 2017 +0300

----------------------------------------------------------------------
 .../getting-started/src/docbkx/delete.xml       |  3 +-
 .../getting-started/src/docbkx/select-query.xml |  7 ++---
 tutorials/tutorial-rop-client/pom.xml           |  7 +++++
 .../persistent/client/auto/_Artist.java         | 14 ++++-----
 tutorials/tutorial-rop-server/pom.xml           |  7 +++++
 .../cayenne/tutorial/persistent/Artist.java     | 20 ++++++-------
 .../tutorial/persistent/auto/_Artist.java       | 10 +++----
 .../persistent/client/auto/_Artist.java         | 10 +++----
 .../src/main/resources/datamap.map.xml          |  2 +-
 tutorials/tutorial/pom.xml                      | 29 +++++++++++++-----
 .../java/org/apache/cayenne/tutorial/Main.java  | 31 +++++++-------------
 .../cayenne/tutorial/persistent/Artist.java     | 20 ++++++-------
 .../tutorial/persistent/auto/_Artist.java       | 10 +++----
 .../tutorial/src/main/resources/datamap.map.xml |  2 +-
 tutorials/tutorial/src/main/webapp/detail.jsp   |  4 ++-
 tutorials/tutorial/src/main/webapp/index.jsp    | 10 +++----
 16 files changed, 99 insertions(+), 87 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/1b91a905/tutorials/tutorial-rop-client/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cayenne/blob/1b91a905/tutorials/tutorial-rop-server/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cayenne/blob/1b91a905/tutorials/tutorial/pom.xml
----------------------------------------------------------------------
diff --cc tutorials/tutorial/pom.xml
index 42ba519,5ac1ff0..5969299
--- a/tutorials/tutorial/pom.xml
+++ b/tutorials/tutorial/pom.xml
@@@ -43,18 -48,26 +48,26 @@@
  
  	<build>
  		<plugins>
- 			<plugin>
- 				<groupId>org.eclipse.jetty</groupId>
- 				<artifactId>jetty-maven-plugin</artifactId>
- 				<version>${jetty.version}</version>
- 			</plugin>
- 			<plugin>
+             <plugin>
+                 <groupId>org.eclipse.jetty</groupId>
+                 <artifactId>jetty-maven-plugin</artifactId>
 -                <version>9.3.19.v20170502</version>
++                <version>${jetty.version}</version>
+             </plugin>
+             <plugin>
  				<groupId>org.apache.maven.plugins</groupId>
- 				<artifactId>maven-deploy-plugin</artifactId>
+ 				<artifactId>maven-compiler-plugin</artifactId>
  				<configuration>
- 					<skip>true</skip>
+ 					<source>1.8</source>
+ 					<target>1.8</target>
  				</configuration>
  			</plugin>
+             <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-deploy-plugin</artifactId>
+                 <configuration>
+                     <skip>true</skip>
+                 </configuration>
+             </plugin>
  		</plugins>
  	</build>
  


Mime
View raw message