Repository: cayenne Updated Branches: refs/heads/master fca0df5c7 -> 5be9a2eb4
cleanup of poms before merging pull request 15 * upgrading of the maven components Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/5be9a2eb Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/5be9a2eb Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/5be9a2eb Branch: refs/heads/master Commit: 5be9a2eb4810e5e67b90e132e21aa15127813e5c Parents: fca0df5 Author: aadamchik <aadamc...@apache.org> Authored: Wed Oct 29 19:46:50 2014 +0300 Committer: aadamchik <aadamc...@apache.org> Committed: Wed Oct 29 20:54:22 2014 +0300 ---------------------------------------------------------------------- cayenne-server/pom.xml | 28 +++++++----- cayenne-tools/pom.xml | 31 ++++++++----- docs/doc/pom.xml | 7 +-- plugins/maven-cayenne-modeler-plugin/pom.xml | 6 +-- plugins/maven-cayenne-plugin/pom.xml | 55 +++++++++++++++++------ plugins/pom.xml | 35 +++++++++++---- pom.xml | 4 +- 7 files changed, 110 insertions(+), 56 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/5be9a2eb/cayenne-server/pom.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/pom.xml b/cayenne-server/pom.xml index 80b83dd..5bfb01e 100644 --- a/cayenne-server/pom.xml +++ b/cayenne-server/pom.xml @@ -1,14 +1,22 @@ <?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. --> +<!-- + 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> http://git-wip-us.apache.org/repos/asf/cayenne/blob/5be9a2eb/cayenne-tools/pom.xml ---------------------------------------------------------------------- diff --git a/cayenne-tools/pom.xml b/cayenne-tools/pom.xml index 45485df..835b909 100644 --- a/cayenne-tools/pom.xml +++ b/cayenne-tools/pom.xml @@ -1,15 +1,22 @@ <?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. --> - +<!-- + 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";> @@ -56,7 +63,7 @@ </dependency> <dependency> - <groupId>ant</groupId> + <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/cayenne/blob/5be9a2eb/docs/doc/pom.xml ---------------------------------------------------------------------- diff --git a/docs/doc/pom.xml b/docs/doc/pom.xml index 08fc4b5..8c8f111 100644 --- a/docs/doc/pom.xml +++ b/docs/doc/pom.xml @@ -46,12 +46,7 @@ <artifactId>cayenne-modeler</artifactId> <version>${project.version}</version> </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </dependency> - + <dependency> <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> http://git-wip-us.apache.org/repos/asf/cayenne/blob/5be9a2eb/plugins/maven-cayenne-modeler-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/maven-cayenne-modeler-plugin/pom.xml b/plugins/maven-cayenne-modeler-plugin/pom.xml index f47f071..ba26d2b 100644 --- a/plugins/maven-cayenne-modeler-plugin/pom.xml +++ b/plugins/maven-cayenne-modeler-plugin/pom.xml @@ -17,7 +17,6 @@ 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";> <parent> @@ -48,7 +47,7 @@ </dependency> <dependency> - <groupId>org.apache.maven</groupId> + <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-tools-api</artifactId> </dependency> @@ -76,9 +75,6 @@ <plugins> <plugin> <artifactId>maven-checkstyle-plugin</artifactId> - <!--<configuration> - <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> - </configuration>--> </plugin> <plugin> <artifactId>maven-pmd-plugin</artifactId> http://git-wip-us.apache.org/repos/asf/cayenne/blob/5be9a2eb/plugins/maven-cayenne-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/maven-cayenne-plugin/pom.xml b/plugins/maven-cayenne-plugin/pom.xml index b2df095..5401797 100644 --- a/plugins/maven-cayenne-plugin/pom.xml +++ b/plugins/maven-cayenne-plugin/pom.xml @@ -1,15 +1,22 @@ <?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. --> - +<!-- + 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";> <parent> @@ -41,8 +48,23 @@ </dependency> <dependency> - <groupId>org.apache.maven</groupId> + <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-tools-api</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-compat</artifactId> + </dependency> + + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-interpolation</artifactId> + </dependency> + + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> </dependency> <dependency> @@ -83,7 +105,7 @@ </dependency> <dependency> - <groupId>org.apache.maven.shared</groupId> + <groupId>org.apache.maven.plugin-testing</groupId> <artifactId>maven-plugin-testing-harness</artifactId> <scope>test</scope> </dependency> @@ -93,12 +115,19 @@ <artifactId>derby</artifactId> <scope>test</scope> </dependency> + <dependency> <groupId>xmlunit</groupId> <artifactId>xmlunit</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + <scope>test</scope> + </dependency> + </dependencies> <build> http://git-wip-us.apache.org/repos/asf/cayenne/blob/5be9a2eb/plugins/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/pom.xml b/plugins/pom.xml index d807f89..042f904 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -39,28 +39,47 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> - <version>2.0.9</version> + <version>3.2.3</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-artifact</artifactId> - <version>2.0.9</version> + <version>3.2.3</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> - <version>2.0.9</version> + <version>3.0-alpha-2</version> </dependency> <dependency> - <groupId>org.apache.maven</groupId> + <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-tools-api</artifactId> - <version>2.0.5</version> + <version>3.3</version> </dependency> <dependency> - <groupId>org.apache.maven.shared</groupId> + <groupId>org.apache.maven.plugin-testing</groupId> <artifactId>maven-plugin-testing-harness</artifactId> - <version>1.0-beta-1</version> - <scope>test</scope> + <version>3.2.0</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + <version>3.2.3</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-compat</artifactId> + <version>3.2.3</version> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + <version>1.6</version> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-interpolation</artifactId> + <version>1.21</version> </dependency> </dependencies> </dependencyManagement> http://git-wip-us.apache.org/repos/asf/cayenne/blob/5be9a2eb/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index ec5cac1..bcf4caf 100644 --- a/pom.xml +++ b/pom.xml @@ -231,9 +231,9 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>ant</groupId> + <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.6.5</version> + <version>1.9.4</version> <scope>provided</scope> <exclusions> <exclusion>
