CAY-2026 Java 7 * Removing Java 6 OS X modeler * also missed dbcp2 jar in assembly
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/e1157f3a Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/e1157f3a Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/e1157f3a Branch: refs/heads/master Commit: e1157f3a69661adccadc671ab36f6c6a314874ea Parents: 26d8434 Author: aadamchik <[email protected]> Authored: Sat Sep 12 08:35:09 2015 +0300 Committer: aadamchik <[email protected]> Committed: Sat Sep 12 11:30:06 2015 +0300 ---------------------------------------------------------------------- assembly/pom.xml | 5 - .../resources/assemblies/assembly-generic.xml | 1 + .../main/resources/assemblies/assembly-mac.xml | 2 +- .../resources/assemblies/assembly-windows.xml | 1 + modeler/cayenne-modeler-mac-legacy/pom.xml | 138 ------------------- .../japplication/resources/CayenneModeler.icns | Bin 32923 -> 0 bytes modeler/pom.xml | 1 - 7 files changed, 3 insertions(+), 145 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/e1157f3a/assembly/pom.xml ---------------------------------------------------------------------- diff --git a/assembly/pom.xml b/assembly/pom.xml index 55752dd..1b2962a 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -197,11 +197,6 @@ <artifactId>cayenne-modeler-mac</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.cayenne.modeler</groupId> - <artifactId>cayenne-modeler-mac-legacy</artifactId> - <version>${project.version}</version> - </dependency> </dependencies> <build> <plugins> http://git-wip-us.apache.org/repos/asf/cayenne/blob/e1157f3a/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 b3e7712..861f28d 100644 --- a/assembly/src/main/resources/assemblies/assembly-generic.xml +++ b/assembly/src/main/resources/assemblies/assembly-generic.xml @@ -80,6 +80,7 @@ <include>org.apache.cayenne:cayenne-lifecycle</include> <include>org.apache.cayenne:cayenne-server</include> <include>org.apache.cayenne:cayenne-tools</include> + <include>org.apache.cayenne:cayenne-dbcp2</include> </includes> </dependencySet> <dependencySet> http://git-wip-us.apache.org/repos/asf/cayenne/blob/e1157f3a/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 52175b5..e704d37 100644 --- a/assembly/src/main/resources/assemblies/assembly-mac.xml +++ b/assembly/src/main/resources/assemblies/assembly-mac.xml @@ -80,6 +80,7 @@ <include>org.apache.cayenne:cayenne-lifecycle</include> <include>org.apache.cayenne:cayenne-server</include> <include>org.apache.cayenne:cayenne-tools</include> + <include>org.apache.cayenne:cayenne-dbcp2</include> </includes> </dependencySet> <dependencySet> @@ -108,7 +109,6 @@ <outputDirectory>../../</outputDirectory> <includes> <include>org.apache.cayenne.modeler:cayenne-modeler-mac</include> - <include>org.apache.cayenne.modeler:cayenne-modeler-mac-legacy</include> </includes> <unpack>true</unpack> <unpackOptions> http://git-wip-us.apache.org/repos/asf/cayenne/blob/e1157f3a/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 366846a..d05a328 100644 --- a/assembly/src/main/resources/assemblies/assembly-windows.xml +++ b/assembly/src/main/resources/assemblies/assembly-windows.xml @@ -80,6 +80,7 @@ <include>org.apache.cayenne:cayenne-lifecycle</include> <include>org.apache.cayenne:cayenne-server</include> <include>org.apache.cayenne:cayenne-tools</include> + <include>org.apache.cayenne:cayenne-dbcp2</include> </includes> </dependencySet> <dependencySet> http://git-wip-us.apache.org/repos/asf/cayenne/blob/e1157f3a/modeler/cayenne-modeler-mac-legacy/pom.xml ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler-mac-legacy/pom.xml b/modeler/cayenne-modeler-mac-legacy/pom.xml deleted file mode 100644 index 5f05b8b..0000000 --- a/modeler/cayenne-modeler-mac-legacy/pom.xml +++ /dev/null @@ -1,138 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.apache.cayenne.modeler</groupId> - <artifactId>cayenne-modeler-parent</artifactId> - <version>4.0.M3-SNAPSHOT</version> - </parent> - - <artifactId>cayenne-modeler-mac-legacy</artifactId> - <name>Cayenne Modeler Mac OS X - Old Apple Java</name> - <packaging>jar</packaging> - - <dependencies> - <dependency> - <groupId>org.apache.cayenne.modeler</groupId> - <artifactId>cayenne-modeler</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.cayenne.modeler</groupId> - <artifactId>cayenne-modeler-mac-ext</artifactId> - <version>${project.version}</version> - </dependency> - - <!-- - adding cayenne runtime dependencies explicitly, - as they are marked as "provided" in the modeler pom - and won't be included in the jar - --> - <dependency> - <groupId>org.apache.cayenne</groupId> - <artifactId>cayenne-server</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cayenne</groupId> - <artifactId>cayenne-project</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cayenne.modeler</groupId> - <artifactId>cayenne-wocompat</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - - <profiles> - <profile> - <id>code-quality</id> - - <activation> - <property> - <name>!fast-and-dirty</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <!--<configuration> - <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> - </configuration>--> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>mac</id> - <build> - <plugins> - <plugin> - <groupId>org.objectstyle.japp</groupId> - <artifactId>japp-maven-plugin</artifactId> - <configuration> - <name>CayenneModeler-Java6-legacy</name> - <longName>${project.version}</longName> - <destDir>${project.build.outputDirectory}</destDir> - <mainClass>org.apache.cayenne.modeler.osx.OSXMain</mainClass> - <icon>src/japplication/resources/CayenneModeler.icns</icon> - <os>mac</os> - <jvm>1.5+</jvm> - <flavor>osx_legacy</flavor> - <jvmOptions>-Xmx500m -Dapple.laf.useScreenMenuBar=true</jvmOptions> - </configuration> - <executions> - <execution> - <phase>generate-resources</phase> - <goals> - <goal>japp</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - - <pluginRepositories> - <pluginRepository> - <id>objectstyle</id> - <name>ObjectStyle repository</name> - <url>http://maven.objectstyle.org/nexus/content/groups/cayenne-deps</url> - <layout>default</layout> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </pluginRepository> - </pluginRepositories> -</project> http://git-wip-us.apache.org/repos/asf/cayenne/blob/e1157f3a/modeler/cayenne-modeler-mac-legacy/src/japplication/resources/CayenneModeler.icns ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler-mac-legacy/src/japplication/resources/CayenneModeler.icns b/modeler/cayenne-modeler-mac-legacy/src/japplication/resources/CayenneModeler.icns deleted file mode 100644 index c3836e7..0000000 Binary files a/modeler/cayenne-modeler-mac-legacy/src/japplication/resources/CayenneModeler.icns and /dev/null differ http://git-wip-us.apache.org/repos/asf/cayenne/blob/e1157f3a/modeler/pom.xml ---------------------------------------------------------------------- diff --git a/modeler/pom.xml b/modeler/pom.xml index 4425738..1e9fb5b 100644 --- a/modeler/pom.xml +++ b/modeler/pom.xml @@ -39,7 +39,6 @@ <module>cayenne-modeler-generic-ext</module> <module>cayenne-modeler-mac-ext</module> <module>cayenne-modeler-mac</module> - <module>cayenne-modeler-mac-legacy</module> <module>cayenne-modeler-win</module> </modules>
