cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntimof...@apache.org
Subject cayenne git commit: Assemblies cleanup - added new modules - removed unused dependencies - fixed MacOS assembly structure
Date Thu, 21 Sep 2017 07:28:06 GMT
Repository: cayenne
Updated Branches:
  refs/heads/master b5c56b64c -> a971f44c8


Assemblies cleanup
 - added new modules
 - removed unused dependencies
 - fixed MacOS assembly structure


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

Branch: refs/heads/master
Commit: a971f44c82b6f14ef8e4533ebcf46dd5de270bbc
Parents: b5c56b6
Author: Nikita Timofeev <stariy95@gmail.com>
Authored: Thu Sep 21 10:27:54 2017 +0300
Committer: Nikita Timofeev <stariy95@gmail.com>
Committed: Thu Sep 21 10:27:54 2017 +0300

----------------------------------------------------------------------
 assembly/pom.xml                                    | 16 ++++++++++++++--
 .../main/resources/assemblies/assembly-generic.xml  |  9 +++------
 .../src/main/resources/assemblies/assembly-mac.xml  |  9 +++------
 .../src/main/resources/assemblies/assembly-src.xml  |  1 +
 .../main/resources/assemblies/assembly-windows.xml  |  9 +++------
 pom.xml                                             |  2 +-
 6 files changed, 25 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/a971f44c/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 4f52527..b5522b5 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -144,6 +144,18 @@
 			<version>${project.version}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>org.apache.cayenne</groupId>
+			<artifactId>cayenne-velocity</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.cayenne</groupId>
+			<artifactId>cayenne-project-compatibility</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
 	</dependencies>
 
 	<build>
@@ -318,7 +330,7 @@
 									<executable>/bin/chmod</executable>
 									<arguments>
 										<argument>755</argument>
-										<argument>target/cayenne-${project.version}-macosx/cayenne-${project.version}-macosx/CayenneModeler.app/Contents/MacOS/JavaAppLauncher</argument>
+										<argument>target/cayenne-${project.version}-macosx/CayenneModeler.app/Contents/MacOS/JavaAppLauncher</argument>
 									</arguments>
 								</configuration>
 							</execution>
@@ -335,7 +347,7 @@
 									<arguments>
 										<argument>create</argument>
 										<argument>-srcfolder</argument>
-										<argument>target/cayenne-${project.version}-macosx/cayenne-${project.version}-macosx</argument>
+										<argument>target/cayenne-${project.version}-macosx/</argument>
 										<argument>-format</argument>
 										<argument>UDZO</argument>
 										<argument>-volname</argument>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/a971f44c/assembly/src/main/resources/assemblies/assembly-generic.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/assembly-generic.xml b/assembly/src/main/resources/assemblies/assembly-generic.xml
index ad121d3..d2dc379 100644
--- a/assembly/src/main/resources/assemblies/assembly-generic.xml
+++ b/assembly/src/main/resources/assemblies/assembly-generic.xml
@@ -47,7 +47,7 @@
 			</excludes>
 		</fileSet>
 		<fileSet>
-			<directory>../cayenne-cgen/src/main/resources/templates/v1_2</directory>
+			<directory>../cayenne-cgen/src/main/resources/templates/v4_1</directory>
 			<outputDirectory>templates</outputDirectory>
 		</fileSet>
 	</fileSets>
@@ -91,23 +91,20 @@
 				<include>org.apache.cayenne:cayenne-cgen</include>
 				<include>org.apache.cayenne:cayenne-ant</include>
 				<include>org.apache.cayenne:cayenne-dbcp2</include>
-				<include>org.apache.cayenne:cayenne-java8</include>
 				<include>org.apache.cayenne:cayenne-jcache</include>
 				<include>org.apache.cayenne:cayenne-cache-invalidation</include>
 				<include>org.apache.cayenne:cayenne-jgroups</include>
 				<include>org.apache.cayenne:cayenne-jms</include>
 				<include>org.apache.cayenne:cayenne-xmpp</include>
+				<include>org.apache.cayenne:cayenne-velocity</include>
+				<include>org.apache.cayenne:cayenne-project-compatibility</include>
 			</includes>
 		</dependencySet>
 		<dependencySet>
 			<outputDirectory>lib/third-party</outputDirectory>
 			<!-- Include only a minimal set of dependencies to run cayenne-server and ant tasks
-->
 			<includes>
-				<include>commons-collections:commons-collections</include>
 				<include>org.slf4j:slf4j-api</include>
-				<include>commons-lang:commons-lang</include>
-				<include>org.apache.velocity:velocity</include>
-				<include>foundrylogic.vpp:vpp</include>
 			</includes>
 		</dependencySet>
 		<dependencySet>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/a971f44c/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 0261484..0ebb3ee 100644
--- a/assembly/src/main/resources/assemblies/assembly-mac.xml
+++ b/assembly/src/main/resources/assemblies/assembly-mac.xml
@@ -45,7 +45,7 @@
 			</excludes>
 		</fileSet>
 		<fileSet>
-			<directory>../cayenne-cgen/src/main/resources/templates/v1_2</directory>
+			<directory>../cayenne-cgen/src/main/resources/templates/v4_1</directory>
 			<outputDirectory>templates</outputDirectory>
 		</fileSet>
 	</fileSets>
@@ -89,23 +89,20 @@
 				<include>org.apache.cayenne:cayenne-cgen</include>
 				<include>org.apache.cayenne:cayenne-ant</include>
 				<include>org.apache.cayenne:cayenne-dbcp2</include>
-				<include>org.apache.cayenne:cayenne-java8</include>
 				<include>org.apache.cayenne:cayenne-jcache</include>
 				<include>org.apache.cayenne:cayenne-cache-invalidation</include>
 				<include>org.apache.cayenne:cayenne-jgroups</include>
 				<include>org.apache.cayenne:cayenne-jms</include>
 				<include>org.apache.cayenne:cayenne-xmpp</include>
+				<include>org.apache.cayenne:cayenne-velocity</include>
+				<include>org.apache.cayenne:cayenne-project-compatibility</include>
 			</includes>
 		</dependencySet>
 		<dependencySet>
 			<outputDirectory>lib/third-party</outputDirectory>
 			<!-- Include only a minimal set of dependencies to run cayenne-server and ant tasks
-->
 			<includes>
-				<include>commons-collections:commons-collections</include>
 				<include>org.slf4j:slf4j-api</include>
-				<include>commons-lang:commons-lang</include>
-				<include>org.apache.velocity:velocity</include>
-				<include>foundrylogic.vpp:vpp</include>
 			</includes>
 		</dependencySet>
 		<dependencySet>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/a971f44c/assembly/src/main/resources/assemblies/assembly-src.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/assembly-src.xml b/assembly/src/main/resources/assemblies/assembly-src.xml
index b056612..2a97cc6 100644
--- a/assembly/src/main/resources/assemblies/assembly-src.xml
+++ b/assembly/src/main/resources/assemblies/assembly-src.xml
@@ -36,6 +36,7 @@
                 <exclude>**/.classpath</exclude>
                 <exclude>**/.project</exclude>
                 <exclude>**/.settings</exclude>
+				<exclude>**/out/**</exclude>
 			</excludes>
 		</fileSet>
 		<fileSet>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/a971f44c/assembly/src/main/resources/assemblies/assembly-windows.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/assembly-windows.xml b/assembly/src/main/resources/assemblies/assembly-windows.xml
index 185ab68..09f7a05 100644
--- a/assembly/src/main/resources/assemblies/assembly-windows.xml
+++ b/assembly/src/main/resources/assemblies/assembly-windows.xml
@@ -45,7 +45,7 @@
 			</excludes>
 		</fileSet>
 		<fileSet>
-			<directory>../cayenne-cgen/src/main/resources/templates/v1_2</directory>
+			<directory>../cayenne-cgen/src/main/resources/templates/v4_1</directory>
 			<outputDirectory>templates</outputDirectory>
 		</fileSet>
 	</fileSets>
@@ -89,23 +89,20 @@
 				<include>org.apache.cayenne:cayenne-cgen</include>
 				<include>org.apache.cayenne:cayenne-ant</include>
 				<include>org.apache.cayenne:cayenne-dbcp2</include>
-				<include>org.apache.cayenne:cayenne-java8</include>
 				<include>org.apache.cayenne:cayenne-jcache</include>
 				<include>org.apache.cayenne:cayenne-cache-invalidation</include>
 				<include>org.apache.cayenne:cayenne-jgroups</include>
 				<include>org.apache.cayenne:cayenne-jms</include>
 				<include>org.apache.cayenne:cayenne-xmpp</include>
+				<include>org.apache.cayenne:cayenne-velocity</include>
+				<include>org.apache.cayenne:cayenne-project-compatibility</include>
 			</includes>
 		</dependencySet>
 		<dependencySet>
 			<outputDirectory>lib/third-party</outputDirectory>
 			<!-- Include only a minimal set of dependencies to run cayenne-server and ant tasks
-->
 			<includes>
-				<include>commons-collections:commons-collections</include>
 				<include>org.slf4j:slf-api</include>
-				<include>commons-lang:commons-lang</include>
-				<include>org.apache.velocity:velocity</include>
-				<include>foundrylogic.vpp:vpp</include>
 			</includes>
 		</dependencySet>
 		<dependencySet>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/a971f44c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c0cdb39..66e7069 100644
--- a/pom.xml
+++ b/pom.xml
@@ -754,7 +754,7 @@
 				</plugin>
 				<plugin>
 					<artifactId>maven-assembly-plugin</artifactId>
-					<version>3.0.0</version>
+					<version>2.2</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-surefire-plugin</artifactId>


Mime
View raw message