Repository: cayenne Updated Branches: refs/heads/master 6716f6b88 -> c3c7d8024
CAY-1626 | Add JodaTime DateTime support * joda dependency must be compile, not provided at the level of cayenne-joda module Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/09d0461d Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/09d0461d Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/09d0461d Branch: refs/heads/master Commit: 09d0461dabd41c8116752ae8b38c94928c3622f6 Parents: 6716f6b Author: aadamchik <[email protected]> Authored: Sun May 10 11:01:36 2015 -0400 Committer: aadamchik <[email protected]> Committed: Sun May 10 11:06:09 2015 -0400 ---------------------------------------------------------------------- cayenne-joda/pom.xml | 196 ++++++++++++++++++++++++---------------------- pom.xml | 2 +- 2 files changed, 102 insertions(+), 96 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/09d0461d/cayenne-joda/pom.xml ---------------------------------------------------------------------- diff --git a/cayenne-joda/pom.xml b/cayenne-joda/pom.xml index 17c2df1..4ef37db 100644 --- a/cayenne-joda/pom.xml +++ b/cayenne-joda/pom.xml @@ -1,102 +1,108 @@ <?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 +<!-- 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/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>cayenne-parent</artifactId> - <groupId>org.apache.cayenne</groupId> - <version>4.0.M3-SNAPSHOT</version> - </parent> - <artifactId>cayenne-joda</artifactId> - <name>Cayenne Joda Extensions</name> - <packaging>jar</packaging> +<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/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>cayenne-parent</artifactId> + <groupId>org.apache.cayenne</groupId> + <version>4.0.M3-SNAPSHOT</version> + </parent> + <artifactId>cayenne-joda</artifactId> + <name>Cayenne Joda Extensions</name> + <packaging>jar</packaging> - <dependencies> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>joda-time</groupId> + <artifactId>joda-time</artifactId> + <version>2.7</version> + </dependency> + </dependencies> + </dependencyManagement> - <!-- Compile dependencies --> - <dependency> - <groupId>org.apache.cayenne</groupId> - <artifactId>cayenne-server</artifactId> - <version>${project.version}</version> - </dependency> + <dependencies> - <dependency> - <groupId>joda-time</groupId> - <artifactId>joda-time</artifactId> - <version>2.7</version> - <scope>provided</scope> - </dependency> + <!-- Compile dependencies --> + <dependency> + <groupId>org.apache.cayenne</groupId> + <artifactId>cayenne-server</artifactId> + <version>${project.version}</version> + </dependency> - <!-- Test dependencies --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.cayenne.build-tools</groupId> - <artifactId>cayenne-test-utilities</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>mockrunner</groupId> - <artifactId>mockrunner</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-remote-resources-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>process</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.cayenne.plugins</groupId> - <artifactId>maven-cayenne-plugin</artifactId> - <version>${project.version}</version> - <configuration> - <map>${project.basedir}/src/test/resources/joda.map.xml</map> - <destDir>${project.basedir}/src/test/java</destDir> - <defaultPackage>org.apache.cayenne.joda.db</defaultPackage> - <superPkg>org.apache.cayenne.joda.db.auto</superPkg> - </configuration> - </plugin> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <!--<configuration> - <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> - </configuration>--> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - </plugin> - </plugins> - </build> + <dependency> + <groupId>joda-time</groupId> + <artifactId>joda-time</artifactId> + </dependency> + + <!-- Test dependencies --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.cayenne.build-tools</groupId> + <artifactId>cayenne-test-utilities</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>mockrunner</groupId> + <artifactId>mockrunner</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-remote-resources-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>process</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.cayenne.plugins</groupId> + <artifactId>maven-cayenne-plugin</artifactId> + <version>${project.version}</version> + <configuration> + <map>${project.basedir}/src/test/resources/joda.map.xml</map> + <destDir>${project.basedir}/src/test/java</destDir> + <defaultPackage>org.apache.cayenne.joda.db</defaultPackage> + <superPkg>org.apache.cayenne.joda.db.auto</superPkg> + </configuration> + </plugin> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <!--<configuration> <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> + </configuration> --> + </plugin> + <plugin> + <artifactId>maven-pmd-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + </plugin> + </plugins> + </build> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cayenne/blob/09d0461d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b676493..c91bb5b 100644 --- a/pom.xml +++ b/pom.xml @@ -57,13 +57,13 @@ <module>cayenne-project</module> <module>cayenne-lifecycle</module> <module>cayenne-crypto</module> + <module>cayenne-joda</module> <module>itests</module> <module>modeler</module> <module>plugins</module> <module>tutorials</module> <module>docs</module> <module>assembly</module> - <module>cayenne-joda</module> </modules> <issueManagement> <system>jira</system>
