cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntimof...@apache.org
Subject [1/3] cayenne git commit: Cayenne-assembly upgrade to 3.1.0
Date Tue, 23 Jan 2018 13:00:45 GMT
Repository: cayenne
Updated Branches:
  refs/heads/master 14f175365 -> 8c3c49a4d


Cayenne-assembly upgrade to 3.1.0


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

Branch: refs/heads/master
Commit: a0c63e46bcf3cf5d412634225a88fd5d4fdb438e
Parents: 54bb53a
Author: Arseni Bulatski <ancarseni@gmail.com>
Authored: Mon Jan 22 15:22:15 2018 +0300
Committer: Arseni Bulatski <ancarseni@gmail.com>
Committed: Mon Jan 22 16:05:58 2018 +0300

----------------------------------------------------------------------
 .../main/resources/assemblies/assembly-mac.xml  | 26 ++++++++++----------
 docs/doc/src/main/resources/RELEASE-NOTES.txt   |  1 +
 pom.xml                                         |  2 +-
 3 files changed, 15 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/a0c63e46/assembly/src/main/resources/assemblies/assembly-mac.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/assembly-mac.xml b/assembly/src/main/resources/assemblies/assembly-mac.xml
index f3abac7..e2cb738 100644
--- a/assembly/src/main/resources/assemblies/assembly-mac.xml
+++ b/assembly/src/main/resources/assemblies/assembly-mac.xml
@@ -21,16 +21,16 @@
 		<format>dir</format>
 	</formats>
 
-	<includeBaseDirectory>true</includeBaseDirectory>
+	<includeBaseDirectory>false</includeBaseDirectory>
 
 	<fileSets>
 		<fileSet>
 			<directory>target/legal/META-INF/cayenne</directory>
-			<outputDirectory>/</outputDirectory>
+			<outputDirectory>cayenne-${project.version}-macosx/</outputDirectory>
 		</fileSet>
 		<fileSet>
 			<directory>../tutorials/</directory>
-			<outputDirectory>tutorials</outputDirectory>
+			<outputDirectory>cayenne-${project.version}-macosx/tutorials/</outputDirectory>
 			<includes>
 				<include>tutorial/**</include>
 				<include>tutorial-rop-server/**</include>
@@ -46,41 +46,41 @@
 		</fileSet>
 		<fileSet>
 			<directory>../cayenne-cgen/src/main/resources/templates/v4_1</directory>
-			<outputDirectory>templates</outputDirectory>
+			<outputDirectory>cayenne-${project.version}-macosx/templates/</outputDirectory>
 		</fileSet>
 	</fileSets>
 
 	<files>
 		<file>
 			<source>../docs/asciidoc/getting-started-guide/target/generated-docs/getting-started-guide.pdf</source>
-			<outputDirectory>doc</outputDirectory>
+			<outputDirectory>cayenne-${project.version}-macosx/doc/</outputDirectory>
 			<destName>getting-started.pdf</destName>
 		</file>
 		<file>
 			<source>../docs/asciidoc/getting-started-db-first/target/generated-docs/getting-started-db-first.pdf</source>
-			<outputDirectory>doc</outputDirectory>
+			<outputDirectory>cayenne-${project.version}-macosx/doc/</outputDirectory>
 			<destName>getting-started-db-first.pdf</destName>
 		</file>
 		<file>
 			<source>../docs/asciidoc/getting-started-rop/target/generated-docs/getting-started-rop.pdf</source>
-			<outputDirectory>doc</outputDirectory>
+			<outputDirectory>cayenne-${project.version}-macosx/doc/</outputDirectory>
 			<destName>getting-started-rop.pdf</destName>
 		</file>
 		<file>
 			<source>../docs/asciidoc/cayenne-guide/target/generated-docs/cayenne-guide.pdf</source>
-			<outputDirectory>doc</outputDirectory>
+			<outputDirectory>cayenne-${project.version}-macosx/doc/</outputDirectory>
 			<destName>cayenne-guide.pdf</destName>
 		</file>
 		<file>
 			<source>../docs/asciidoc/upgrade-guide/target/generated-docs/upgrade-guide.pdf</source>
-			<outputDirectory>doc</outputDirectory>
+			<outputDirectory>cayenne-${project.version}-macosx/doc/</outputDirectory>
 			<destName>upgrade-guide.pdf</destName>
 		</file>
 	</files>
 
 	<dependencySets>
 		<dependencySet>
-			<outputDirectory>lib</outputDirectory>
+			<outputDirectory>cayenne-${project.version}-macosx/lib/</outputDirectory>
 			<includes>
 				<include>org.apache.cayenne:cayenne-client</include>
 				<include>org.apache.cayenne:cayenne-crypto</include>
@@ -107,14 +107,14 @@
 			</includes>
 		</dependencySet>
 		<dependencySet>
-			<outputDirectory>lib/third-party</outputDirectory>
+			<outputDirectory>cayenne-${project.version}-macosx/lib/third-party/</outputDirectory>
 			<!-- Include only a minimal set of dependencies to run cayenne-server and ant tasks
-->
 			<includes>
 				<include>org.slf4j:slf4j-api</include>
 			</includes>
 		</dependencySet>
 		<dependencySet>
-			<outputDirectory>/</outputDirectory>
+			<outputDirectory>cayenne-${project.version}-macosx/</outputDirectory>
 			<includes>
 				<include>org.apache.cayenne.docs:cayenne-doc</include>
 			</includes>
@@ -126,7 +126,7 @@
 			</unpackOptions>
 		</dependencySet>
 		<dependencySet>
-			<outputDirectory>../../</outputDirectory>
+			<outputDirectory>/</outputDirectory>
 			<includes>
 				<include>org.apache.cayenne.modeler:cayenne-modeler-mac</include>
 			</includes>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/a0c63e46/docs/doc/src/main/resources/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/RELEASE-NOTES.txt b/docs/doc/src/main/resources/RELEASE-NOTES.txt
index 0c93335..5fba36f 100644
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@ -18,6 +18,7 @@ CAY-2377 Cleanup deprecated code.
 CAY-2391 cdbimport: add option to skip user-defined relationships
 CAY-2393 Add sqlserver-docker profile to automate tests on SQLServer
 CAY-2394 Upgrade to Apache Velocity 2.0
+CAY-2396 Upgrade maven-assembly-plugin to 3.1.0
 
 Bug Fixes:
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/a0c63e46/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index af8a347..90ea4d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -763,7 +763,7 @@
 				</plugin>
 				<plugin>
 					<artifactId>maven-assembly-plugin</artifactId>
-					<version>2.2</version>
+					<version>3.1.0</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-surefire-plugin</artifactId>


Mime
View raw message