You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by sk...@apache.org on 2016/11/14 19:20:07 UTC

[1/2] cayenne git commit: Returned missing in final assembly LEGAL.txt and NOTICE.txt files

Repository: cayenne
Updated Branches:
  refs/heads/master 56906f07a -> 5708e3530


Returned missing in final assembly LEGAL.txt and NOTICE.txt files


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

Branch: refs/heads/master
Commit: b85f87d0c37fd2b358f9f33ff82d74de425dc45e
Parents: 56906f0
Author: Nikita Timofeev <st...@gmail.com>
Authored: Mon Nov 14 15:02:29 2016 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Mon Nov 14 15:02:29 2016 +0300

----------------------------------------------------------------------
 assembly/pom.xml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/b85f87d0/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 45c042e..c330f92 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -149,10 +149,17 @@
 			<build>
 				<plugins>
 					<plugin>
-                       <artifactId>maven-remote-resources-plugin</artifactId>
-                       <configuration>
-                               <outputDirectory>${project.build.directory}/legal</outputDirectory>
-                       </configuration>
+						<artifactId>maven-remote-resources-plugin</artifactId>
+						<executions>
+							<execution>
+								<goals>
+									<goal>process</goal>
+								</goals>
+								<configuration>
+									<outputDirectory>${project.build.directory}/legal</outputDirectory>
+								</configuration>
+							</execution>
+						</executions>
 	                </plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>


[2/2] cayenne git commit: Merge branch '128'

Posted by sk...@apache.org.
Merge branch '128'


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

Branch: refs/heads/master
Commit: 5708e3530cbbea0b3c39739e71e9713f54d6dad5
Parents: 56906f0 b85f87d
Author: Savva Kolbachev <s....@gmail.com>
Authored: Mon Nov 14 22:19:53 2016 +0300
Committer: Savva Kolbachev <s....@gmail.com>
Committed: Mon Nov 14 22:19:53 2016 +0300

----------------------------------------------------------------------
 assembly/pom.xml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------