cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From skolbac...@apache.org
Subject cayenne git commit: replace java8 profile with a direct dependency in the assembly
Date Mon, 08 Feb 2016 14:26:11 GMT
Repository: cayenne
Updated Branches:
  refs/heads/4.0.M3_prerelease aa77515fd -> 0b623050b


replace java8 profile with a direct dependency in the assembly


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

Branch: refs/heads/4.0.M3_prerelease
Commit: 0b623050b6db9dbd06f615bea5cde69c57fcee1d
Parents: aa77515
Author: Savva Kolbachev <s.kolbachev@gmail.com>
Authored: Mon Feb 8 17:25:49 2016 +0300
Committer: Savva Kolbachev <s.kolbachev@gmail.com>
Committed: Mon Feb 8 17:25:49 2016 +0300

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


http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b623050/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index ca14fbb..3411a81 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -72,6 +72,12 @@
 			<version>${project.version}</version>
 		</dependency>
 
+        <dependency>
+            <groupId>org.apache.cayenne</groupId>
+            <artifactId>cayenne-java8</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
 		 <dependency>
             <groupId>org.apache.cayenne</groupId>
             <artifactId>cayenne-dbcp2</artifactId>
@@ -341,20 +347,5 @@
 				</plugins>
 			</build>
 		</profile>
-
-        <profile>
-            <!-- Java8 assembly (can only be run on Java8 and higher) -->
-            <id>java8</id>
-            <activation>
-                <jdk>[1.8,)</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.cayenne</groupId>
-                    <artifactId>cayenne-java8</artifactId>
-                    <version>${project.version}</version>
-                </dependency>
-            </dependencies>
-        </profile>
 	</profiles>
 </project>


Mime
View raw message