This is an automated email from the ASF dual-hosted git repository. alien11689 pushed a commit to branch ARIES-2181-remove-indirect-aries-parent-relation-in-blueprint in repository https://gitbox.apache.org/repos/asf/aries.git
commit 2d8926128af7f0d9a6873a590aaf765a371b800b Author: Dominik Przybysz <[email protected]> AuthorDate: Tue May 6 20:23:13 2025 +0200 ARIES-2181: Remove indirect aries parent in all bluerint production modules --- blueprint/blueprint-api/pom.xml | 8 +- blueprint/blueprint-authz/pom.xml | 8 +- blueprint/blueprint-bundle/pom.xml | 8 +- blueprint/blueprint-cm/pom.xml | 8 +- blueprint/blueprint-compatibility/pom.xml | 8 +- blueprint/blueprint-core-compatibility/pom.xml | 8 +- blueprint/blueprint-core/pom.xml | 8 +- blueprint/blueprint-jexl-evaluator/pom.xml | 8 +- blueprint/blueprint-noosgi/pom.xml | 8 +- blueprint/blueprint-parent/LICENSE | 203 ------------------------- blueprint/blueprint-parent/NOTICE | 8 - blueprint/blueprint-parent/pom.xml | 76 --------- blueprint/blueprint-parser/pom.xml | 8 +- blueprint/blueprint-repository/pom.xml | 8 +- blueprint/blueprint-spring-camel/pom.xml | 8 +- blueprint/blueprint-spring-extender/pom.xml | 8 +- blueprint/blueprint-spring/pom.xml | 8 +- blueprint/blueprint-web-osgi/pom.xml | 8 +- blueprint/blueprint-web/pom.xml | 8 +- blueprint/pom.xml | 1 - 20 files changed, 64 insertions(+), 352 deletions(-) diff --git a/blueprint/blueprint-api/pom.xml b/blueprint/blueprint-api/pom.xml index 92eef325c..476201ecf 100644 --- a/blueprint/blueprint-api/pom.xml +++ b/blueprint/blueprint-api/pom.xml @@ -22,10 +22,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>blueprint-parent</artifactId> - <version>1.0.0</version> - <relativePath>../blueprint-parent/pom.xml</relativePath> + <groupId>org.apache.aries</groupId> + <artifactId>parent</artifactId> + <version>2.0.1</version> + <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.apache.aries.blueprint</groupId> diff --git a/blueprint/blueprint-authz/pom.xml b/blueprint/blueprint-authz/pom.xml index 1e8b688df..dcf039426 100644 --- a/blueprint/blueprint-authz/pom.xml +++ b/blueprint/blueprint-authz/pom.xml @@ -22,10 +22,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>blueprint-parent</artifactId> - <version>1.0.0</version> - <relativePath>../blueprint-parent/pom.xml</relativePath> + <groupId>org.apache.aries</groupId> + <artifactId>parent</artifactId> + <version>2.0.1</version> + <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.apache.aries.blueprint</groupId> diff --git a/blueprint/blueprint-bundle/pom.xml b/blueprint/blueprint-bundle/pom.xml index 78049c3fe..30867d073 100644 --- a/blueprint/blueprint-bundle/pom.xml +++ b/blueprint/blueprint-bundle/pom.xml @@ -22,10 +22,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>blueprint-parent</artifactId> - <version>1.0.1-SNAPSHOT</version> - <relativePath>../blueprint-parent/pom.xml</relativePath> + <groupId>org.apache.aries</groupId> + <artifactId>parent</artifactId> + <version>2.1.0</version> + <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.apache.aries.blueprint</groupId> diff --git a/blueprint/blueprint-cm/pom.xml b/blueprint/blueprint-cm/pom.xml index bbf25d9f2..d12ed72e2 100644 --- a/blueprint/blueprint-cm/pom.xml +++ b/blueprint/blueprint-cm/pom.xml @@ -22,10 +22,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>blueprint-parent</artifactId> - <version>1.0.0</version> - <relativePath>../blueprint-parent/pom.xml</relativePath> + <groupId>org.apache.aries</groupId> + <artifactId>parent</artifactId> + <version>2.0.1</version> + <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.apache.aries.blueprint</groupId> diff --git a/blueprint/blueprint-compatibility/pom.xml b/blueprint/blueprint-compatibility/pom.xml index ab56117ab..8eaac9f6a 100644 --- a/blueprint/blueprint-compatibility/pom.xml +++ b/blueprint/blueprint-compatibility/pom.xml @@ -22,10 +22,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>blueprint-parent</artifactId> - <version>1.0.1-SNAPSHOT</version> - <relativePath>../blueprint-parent/pom.xml</relativePath> + <groupId>org.apache.aries</groupId> + <artifactId>parent</artifactId> + <version>2.1.0</version> + <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.apache.aries.blueprint</groupId> diff --git a/blueprint/blueprint-core-compatibility/pom.xml b/blueprint/blueprint-core-compatibility/pom.xml index 5e276a9ac..6eb4f9773 100644 --- a/blueprint/blueprint-core-compatibility/pom.xml +++ b/blueprint/blueprint-core-compatibility/pom.xml @@ -22,10 +22,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>blueprint-parent</artifactId> - <version>1.0.0</version> - <relativePath>../blueprint-parent/pom.xml</relativePath> + <groupId>org.apache.aries</groupId> + <artifactId>parent</artifactId> + <version>2.0.1</version> + <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.apache.aries.blueprint</groupId> diff --git a/blueprint/blueprint-core/pom.xml b/blueprint/blueprint-core/pom.xml index ecaf6003a..1f7a04ef7 100644 --- a/blueprint/blueprint-core/pom.xml +++ b/blueprint/blueprint-core/pom.xml @@ -22,10 +22,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>blueprint-parent</artifactId> - <version>1.0.0</version> - <relativePath>../blueprint-parent/pom.xml</relativePath> + <groupId>org.apache.aries</groupId> + <artifactId>parent</artifactId> + <version>2.0.1</version> + <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.apache.aries.blueprint</groupId> diff --git a/blueprint/blueprint-jexl-evaluator/pom.xml b/blueprint/blueprint-jexl-evaluator/pom.xml index 3daa69189..dd8353055 100644 --- a/blueprint/blueprint-jexl-evaluator/pom.xml +++ b/blueprint/blueprint-jexl-evaluator/pom.xml @@ -22,10 +22,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>blueprint-parent</artifactId> - <version>1.0.0</version> - <relativePath>../blueprint-parent/pom.xml</relativePath> + <groupId>org.apache.aries</groupId> + <artifactId>parent</artifactId> + <version>2.0.1</version> + <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.apache.aries.blueprint</groupId> diff --git a/blueprint/blueprint-noosgi/pom.xml b/blueprint/blueprint-noosgi/pom.xml index 5ad08a5a0..7e94790f4 100644 --- a/blueprint/blueprint-noosgi/pom.xml +++ b/blueprint/blueprint-noosgi/pom.xml @@ -22,10 +22,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>blueprint-parent</artifactId> - <version>1.0.0</version> - <relativePath>../blueprint-parent/pom.xml</relativePath> + <groupId>org.apache.aries</groupId> + <artifactId>parent</artifactId> + <version>2.0.1</version> + <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.apache.aries.blueprint</groupId> diff --git a/blueprint/blueprint-parent/LICENSE b/blueprint/blueprint-parent/LICENSE deleted file mode 100644 index 6b0b1270f..000000000 --- a/blueprint/blueprint-parent/LICENSE +++ /dev/null @@ -1,203 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed 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. - diff --git a/blueprint/blueprint-parent/NOTICE b/blueprint/blueprint-parent/NOTICE deleted file mode 100644 index 424644d05..000000000 --- a/blueprint/blueprint-parent/NOTICE +++ /dev/null @@ -1,8 +0,0 @@ - -Apache Aries -Copyright 2009-2011 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - - diff --git a/blueprint/blueprint-parent/pom.xml b/blueprint/blueprint-parent/pom.xml deleted file mode 100644 index 7bed1b644..000000000 --- a/blueprint/blueprint-parent/pom.xml +++ /dev/null @@ -1,76 +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.aries</groupId> - <artifactId>parent</artifactId> - <version>2.1.0</version> - <relativePath>../../parent/pom.xml</relativePath> - </parent> - - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>blueprint-parent</artifactId> - <packaging>pom</packaging> - <version>1.0.1-SNAPSHOT</version> - <name>Apache Aries Blueprint Parent</name> - <description> - This bundle contains the blueprint parent pom. - </description> - - <scm> - <connection>scm:git:https://gitbox.apache.org/repos/asf/aries.git</connection> - <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/aries.git</developerConnection> - <url>https://gitbox.apache.org/repos/asf?p=aries.git;a=summary</url> - </scm> - - <properties> - <apache-rat-plugin.version>0.16.1</apache-rat-plugin.version> - </properties> - - <build> - <plugins> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <version>${apache-rat-plugin.version}</version> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - <configuration> - <reportFile>${project.build.directory}/${project.build.finalName}.rat</reportFile> - <excludeSubProjects>true</excludeSubProjects> - <excludes> - <exclude>**/NOTICE.vm</exclude> - <exclude>**/dependency-reduced-pom.xml</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - -</project> diff --git a/blueprint/blueprint-parser/pom.xml b/blueprint/blueprint-parser/pom.xml index 051e02a41..ea597fab4 100644 --- a/blueprint/blueprint-parser/pom.xml +++ b/blueprint/blueprint-parser/pom.xml @@ -22,10 +22,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>blueprint-parent</artifactId> - <version>1.0.0</version> - <relativePath>../blueprint-parent/pom.xml</relativePath> + <groupId>org.apache.aries</groupId> + <artifactId>parent</artifactId> + <version>2.0.1</version> + <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.apache.aries.blueprint</groupId> diff --git a/blueprint/blueprint-repository/pom.xml b/blueprint/blueprint-repository/pom.xml index 2c7b92ae0..0b9ea6f7e 100644 --- a/blueprint/blueprint-repository/pom.xml +++ b/blueprint/blueprint-repository/pom.xml @@ -20,10 +20,10 @@ <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> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>blueprint-parent</artifactId> - <version>1.0.0</version> - <relativePath>../blueprint-parent/pom.xml</relativePath> + <groupId>org.apache.aries</groupId> + <artifactId>parent</artifactId> + <version>2.0.1</version> + <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.apache.aries.blueprint</groupId> diff --git a/blueprint/blueprint-spring-camel/pom.xml b/blueprint/blueprint-spring-camel/pom.xml index 0a61eb9b5..e540abad1 100644 --- a/blueprint/blueprint-spring-camel/pom.xml +++ b/blueprint/blueprint-spring-camel/pom.xml @@ -22,10 +22,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>blueprint-parent</artifactId> - <version>1.0.0</version> - <relativePath>../blueprint-parent/pom.xml</relativePath> + <groupId>org.apache.aries</groupId> + <artifactId>parent</artifactId> + <version>2.0.1</version> + <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.apache.aries.blueprint</groupId> diff --git a/blueprint/blueprint-spring-extender/pom.xml b/blueprint/blueprint-spring-extender/pom.xml index 3704ec864..a7c00e80f 100644 --- a/blueprint/blueprint-spring-extender/pom.xml +++ b/blueprint/blueprint-spring-extender/pom.xml @@ -22,10 +22,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>blueprint-parent</artifactId> - <version>1.0.0</version> - <relativePath>../blueprint-parent/pom.xml</relativePath> + <groupId>org.apache.aries</groupId> + <artifactId>parent</artifactId> + <version>2.0.1</version> + <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.apache.aries.blueprint</groupId> diff --git a/blueprint/blueprint-spring/pom.xml b/blueprint/blueprint-spring/pom.xml index db4992e22..79b4aa269 100644 --- a/blueprint/blueprint-spring/pom.xml +++ b/blueprint/blueprint-spring/pom.xml @@ -22,10 +22,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>blueprint-parent</artifactId> - <version>1.0.0</version> - <relativePath>../blueprint-parent/pom.xml</relativePath> + <groupId>org.apache.aries</groupId> + <artifactId>parent</artifactId> + <version>2.0.1</version> + <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.apache.aries.blueprint</groupId> diff --git a/blueprint/blueprint-web-osgi/pom.xml b/blueprint/blueprint-web-osgi/pom.xml index 7d95ed1c8..03aaa9cdc 100644 --- a/blueprint/blueprint-web-osgi/pom.xml +++ b/blueprint/blueprint-web-osgi/pom.xml @@ -22,10 +22,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>blueprint-parent</artifactId> - <version>1.0.0</version> - <relativePath>../blueprint-parent/pom.xml</relativePath> + <groupId>org.apache.aries</groupId> + <artifactId>parent</artifactId> + <version>2.0.1</version> + <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.apache.aries.blueprint</groupId> diff --git a/blueprint/blueprint-web/pom.xml b/blueprint/blueprint-web/pom.xml index f65142fba..41ec23717 100644 --- a/blueprint/blueprint-web/pom.xml +++ b/blueprint/blueprint-web/pom.xml @@ -22,10 +22,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>blueprint-parent</artifactId> - <version>1.0.0</version> - <relativePath>../blueprint-parent/pom.xml</relativePath> + <groupId>org.apache.aries</groupId> + <artifactId>parent</artifactId> + <version>2.0.1</version> + <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.apache.aries.blueprint</groupId> diff --git a/blueprint/pom.xml b/blueprint/pom.xml index 18a1c5642..2065c1290 100644 --- a/blueprint/pom.xml +++ b/blueprint/pom.xml @@ -38,7 +38,6 @@ </description> <modules> - <module>blueprint-parent</module> <module>blueprint-api</module> <module>blueprint-parser</module> <module>blueprint-core</module>
