Author: aadamchik
Date: Sat Nov 16 21:23:31 2013
New Revision: 1542588
URL: http://svn.apache.org/r1542588
Log:
CAY-1883 - Clean up Cayenne maven structure - get rid of aggregate modules
* cleanup, killing unused aggregator plugin, being explicit about the scope of
various dependencies
* jdbc4-compat no longer needed under Java 6
Removed:
cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/
cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/src/main/java/org/apache/cayenne/maven/plugin/util/
Modified:
cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/pom.xml
cayenne/main/trunk/cayenne-core/pom.xml
cayenne/main/trunk/cayenne-di/pom.xml
cayenne/main/trunk/pom.xml
Modified: cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/pom.xml?rev=1542588&r1=1542587&r2=1542588&view=diff
==============================================================================
--- cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/pom.xml (original)
+++ cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/pom.xml Sat Nov 16
21:23:31 2013
@@ -1,23 +1,16 @@
<?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";>
+<!-- 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>
@@ -26,7 +19,7 @@
<artifactId>build-tools-parent</artifactId>
<version>3.2M2-SNAPSHOT</version>
</parent>
-
+
<artifactId>cayenne-build-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>Cayenne Internal Build Plugin</name>
@@ -42,48 +35,6 @@
<artifactId>maven-plugin-api</artifactId>
<version>2.0.4</version>
</dependency>
- <dependency>
- <groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>com.caucho</groupId>
- <artifactId>resin-hessian</artifactId>
- </dependency>
-
- <!--
- declare non-standard dependencies coming from
ObjectStyle repo here to seed the repo and avoid using
- objectstyle repo for the main build
- -->
- <dependency>
- <groupId>mockrunner</groupId>
- <artifactId>mockrunner</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.objectstyle</groupId>
- <artifactId>jdbc4-compat</artifactId>
- </dependency>
-
- <dependency>
- <groupId>opensymphony</groupId>
- <artifactId>oscache</artifactId>
- </dependency>
-
- <dependency>
- <groupId>foundrylogic.vpp</groupId>
- <artifactId>vpp</artifactId>
- </dependency>
- <dependency>
- <groupId>jgoodies</groupId>
- <artifactId>forms</artifactId>
- </dependency>
-
- <dependency>
- <groupId>jgoodies</groupId>
- <artifactId>looks</artifactId>
- </dependency>
</dependencies>
Modified: cayenne/main/trunk/cayenne-core/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-core/pom.xml?rev=1542588&r1=1542587&r2=1542588&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-core/pom.xml (original)
+++ cayenne/main/trunk/cayenne-core/pom.xml Sat Nov 16 21:23:31 2013
@@ -1,69 +1,33 @@
<?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";>
+<!-- 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</groupId>
<artifactId>cayenne-parent</artifactId>
<version>3.2M2-SNAPSHOT</version>
</parent>
- <groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-core</artifactId>
<name>Cayenne Core</name>
<description>Cayenne Core</description>
<packaging>jar</packaging>
<dependencies>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.cayenne.buildtools</groupId>
- <artifactId>cayenne-test-utilities</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-di</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.objectstyle</groupId>
- <artifactId>jdbc4-compat</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-mock</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>com.caucho</groupId>
<artifactId>resin-hessian</artifactId>
</dependency>
@@ -76,10 +40,6 @@
<artifactId>jgroups-all</artifactId>
</dependency>
<dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- </dependency>
- <dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>
@@ -120,14 +80,44 @@
<groupId>opensymphony</groupId>
<artifactId>oscache</artifactId>
</dependency>
- <dependency>
- <groupId>mockrunner</groupId>
- <artifactId>mockrunner</artifactId>
- </dependency>
+
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId>
</dependency>
+
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cayenne.buildtools</groupId>
+ <artifactId>cayenne-test-utilities</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-mock</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>mockrunner</groupId>
+ <artifactId>mockrunner</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -141,10 +131,10 @@
<phase>generate-sources</phase>
<configuration>
<sourceDirectory>
-
${basedir}/src/main/jjtree/org/apache/cayenne/ejbql
+
${basedir}/src/main/jjtree/org/apache/cayenne/ejbql
</sourceDirectory>
<outputDirectory>
-
${project.build.directory}/generated-sources/javacc/org/apache/cayenne/ejbql
+
${project.build.directory}/generated-sources/javacc/org/apache/cayenne/ejbql
</outputDirectory>
<buildNodeFiles>false</buildNodeFiles>
</configuration>
@@ -152,16 +142,11 @@
<goal>jjtree-javacc</goal>
</goals>
</execution>
- <!--
-
src/main/jjtree/org/apache/cayenne/exp/parser for now is generated outside of
- Maven with JavaCC command line
tools (maybe we should do the same for EJBQL) :
-
- # Parser grammar out of tree
grammar:
- $ ./javacc-5.0/bin/jjtree
src/main/jjtree/org/apache/cayenne/exp/parser/ExpressionParser.jjt
-
- # docs
- $ ./javacc-5.0/bin/jjdoc
-TEXT=true ExpressionParser.jj
- -->
+ <!--
src/main/jjtree/org/apache/cayenne/exp/parser for now is generated
+ outside of Maven with JavaCC
command line tools (maybe we should do the same
+ for EJBQL) : # Parser grammar
out of tree grammar: $ ./javacc-5.0/bin/jjtree
+
src/main/jjtree/org/apache/cayenne/exp/parser/ExpressionParser.jjt # docs
+ $ ./javacc-5.0/bin/jjdoc
-TEXT=true ExpressionParser.jj -->
</executions>
</plugin>
<plugin>
@@ -172,7 +157,8 @@
<configuration>
<tasks>
<!-- This will
remove duplicate Node file -->
- <delete
file="${project.build.directory}/generated-sources/jjtree/org/apache/cayenne/ejbql/parser/Node.java"
/>
+ <delete
+
file="${project.build.directory}/generated-sources/jjtree/org/apache/cayenne/ejbql/parser/Node.java"
/>
</tasks>
</configuration>
<goals>
Modified: cayenne/main/trunk/cayenne-di/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-di/pom.xml?rev=1542588&r1=1542587&r2=1542588&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-di/pom.xml (original)
+++ cayenne/main/trunk/cayenne-di/pom.xml Sat Nov 16 21:23:31 2013
@@ -1,23 +1,16 @@
<?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";>
+<!-- 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</groupId>
@@ -32,6 +25,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
<build>
Modified: cayenne/main/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/pom.xml?rev=1542588&r1=1542587&r2=1542588&view=diff
==============================================================================
--- cayenne/main/trunk/pom.xml (original)
+++ cayenne/main/trunk/pom.xml Sat Nov 16 21:23:31 2013
@@ -327,18 +327,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javacc</groupId>
- <artifactId>javacc</artifactId>
- <version>3.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.objectstyle</groupId>
- <artifactId>jdbc4-compat</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>jgoodies</groupId>
<artifactId>forms</artifactId>
<version>1.0.5</version>
