This is an automated email from the ASF dual-hosted git repository. alien11689 pushed a commit to branch ARIES-2179-remove-blueprint-annotation-api-usage in repository https://gitbox.apache.org/repos/asf/aries.git
commit adfe2a77a7344fc222e89a2387db71572f40c4e1 Author: Dominik Przybysz <[email protected]> AuthorDate: Sun May 4 12:23:56 2025 +0200 ARIES-2179: Remove blueprint annotation api usage --- blueprint/blueprint-bundle/pom.xml | 2 - blueprint/blueprint-core/pom.xml | 9 - .../blueprint/container/BlueprintExtender.java | 18 -- .../examples/blueprint-sample-fragment/LICENSE | 203 --------------------- .../examples/blueprint-sample-fragment/NOTICE | 8 - .../examples/blueprint-sample-fragment/pom.xml | 96 ---------- .../aries/blueprint/fragment/FragmentBean.java | 23 --- blueprint/examples/pom.xml | 1 - blueprint/itests/blueprint-itests/pom.xml | 6 - samples/pom.xml | 1 - spi-fly/spi-fly-itests/test.bndrun | 12 +- 11 files changed, 6 insertions(+), 373 deletions(-) diff --git a/blueprint/blueprint-bundle/pom.xml b/blueprint/blueprint-bundle/pom.xml index f7598a513..cec70f97d 100644 --- a/blueprint/blueprint-bundle/pom.xml +++ b/blueprint/blueprint-bundle/pom.xml @@ -61,7 +61,6 @@ org.osgi.service.event*;resolution:=optional, org.osgi.service.framework;resolution:=optional, org.osgi.service.cm;version="[1.2,2)", - org.apache.aries.blueprint.annotation.service;provide:=true;resolution:=optional, org.apache.aries.quiesce.manager;provide:=true;resolution:=optional, org.apache.aries.quiesce.participant;provide:=true;resolution:=optional, * @@ -71,7 +70,6 @@ org.osgi.service.blueprint;uses:="org.osgi.service.blueprint.container,org.osgi.service.blueprint.reflect,org.apache.aries.blueprint,org.apache.aries.blueprint.ext,org.apache.aries.blueprint.mutable,org.apache.aries.blueprint.compendium.cm";version="1.1.0";-split-package:=merge-first, org.osgi.service.blueprint.container;-split-package:=merge-first, org.osgi.service.blueprint.reflect;-split-package:=merge-first, - !org.apache.aries.blueprint.annotation*, org.apache.aries.blueprint, org.apache.aries.blueprint.services, org.apache.aries.blueprint.mutable, diff --git a/blueprint/blueprint-core/pom.xml b/blueprint/blueprint-core/pom.xml index 1cdda2df6..ebc6ea19b 100644 --- a/blueprint/blueprint-core/pom.xml +++ b/blueprint/blueprint-core/pom.xml @@ -52,7 +52,6 @@ </aries.osgi.activator> <!-- Export package versions are maintained in packageinfo files --> <aries.osgi.export.pkg> - !org.apache.aries.blueprint.annotation*, org.apache.aries.blueprint;-split-package:=merge-first, org.apache.aries.blueprint.mutable, org.apache.aries.blueprint.ext, @@ -65,7 +64,6 @@ !org.apache.aries.blueprint*, org.apache.aries.quiesce.manager;provide:=true;resolution:=optional, org.apache.aries.quiesce.participant;provide:=true;resolution:=optional, - org.apache.aries.blueprint.annotation.service, org.osgi.service.blueprint.*;provide:=true, org.osgi.service.event*;resolution:=optional, org.osgi.service.framework;resolution:=optional, @@ -96,7 +94,6 @@ <lastReleaseVersion>1.6.0</lastReleaseVersion> <asm.version>9.8</asm.version> - <blueprint.annotation.api.version>1.0.1</blueprint.annotation.api.version> <blueprint.api.version>1.0.1</blueprint.api.version> <blueprint.parser.version>1.6.0</blueprint.parser.version> <easymock.version>5.5.0</easymock.version> @@ -136,12 +133,6 @@ <artifactId>org.apache.aries.blueprint.api</artifactId> <version>${blueprint.api.version}</version> </dependency> - <dependency> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>org.apache.aries.blueprint.annotation.api</artifactId> - <optional>true</optional> - <version>${blueprint.annotation.api.version}</version> - </dependency> <dependency> <groupId>org.apache.aries.blueprint</groupId> <artifactId>blueprint-parser</artifactId> diff --git a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java index 31ca19a84..ecb4f8780 100644 --- a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java +++ b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java @@ -39,7 +39,6 @@ import java.util.concurrent.FutureTask; import java.util.concurrent.ScheduledExecutorService; import org.apache.aries.blueprint.BlueprintConstants; -import org.apache.aries.blueprint.annotation.service.BlueprintAnnotationScanner; import org.apache.aries.blueprint.namespace.NamespaceHandlerRegistryImpl; import org.apache.aries.blueprint.services.BlueprintExtenderService; import org.apache.aries.blueprint.services.ParserService; @@ -446,23 +445,6 @@ public class BlueprintExtender implements BundleActivator, BundleTrackerCustomiz addEntries(bundle, baseName, filePattern, pathList); } } - // Check annotations - if (blueprintHeaderAnnotation != null && blueprintHeaderAnnotation.trim().equalsIgnoreCase("true")) { - LOGGER.debug("Scanning bundle {}/{} for blueprint annotations", bundle.getSymbolicName(), bundle.getVersion()); - ServiceReference sr = this.context.getServiceReference(BlueprintAnnotationScanner.class.getName()); - if (sr != null) { - BlueprintAnnotationScanner bas = (BlueprintAnnotationScanner) this.context.getService(sr); - try { - // try to generate the blueprint definition XML - URL url = bas.createBlueprintModel(bundle); - if (url != null) { - pathList.add(url); - } - } finally { - this.context.ungetService(sr); - } - } - } if (!pathList.isEmpty()) { LOGGER.debug("Found blueprint application in bundle {}/{} with paths: {}", bundle.getSymbolicName(), bundle.getVersion(), pathList); // Check compatibility diff --git a/blueprint/examples/blueprint-sample-fragment/LICENSE b/blueprint/examples/blueprint-sample-fragment/LICENSE deleted file mode 100644 index 6b0b1270f..000000000 --- a/blueprint/examples/blueprint-sample-fragment/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/examples/blueprint-sample-fragment/NOTICE b/blueprint/examples/blueprint-sample-fragment/NOTICE deleted file mode 100644 index 424644d05..000000000 --- a/blueprint/examples/blueprint-sample-fragment/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/examples/blueprint-sample-fragment/pom.xml b/blueprint/examples/blueprint-sample-fragment/pom.xml deleted file mode 100644 index 88d4d5189..000000000 --- a/blueprint/examples/blueprint-sample-fragment/pom.xml +++ /dev/null @@ -1,96 +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.blueprint</groupId> - <artifactId>blueprint-parent</artifactId> - <version>1.0.0</version> - <relativePath>../../blueprint-parent/pom.xml</relativePath> - </parent> - - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>org.apache.aries.blueprint.sample-fragment</artifactId> - <name>Apache Aries Blueprint Sample Fragment for Testing Annotation</name> - <version>1.0.1-SNAPSHOT</version> - <packaging>bundle</packaging> - <description> - Example blueprint fragment, mostly used for annotation tests. - </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> - <aries.osgi.export> - org.apache.aries.blueprint.fragment;-noimport:=true - </aries.osgi.export> - <aries.osgi.import> - org.apache.aries.blueprint.annotation;provide:=true, - * - </aries.osgi.import> - <aries.osgi.private.pkg/> - - <org.apache.aries.blueprint.annotation.api.version>1.0.1</org.apache.aries.blueprint.annotation.api.version> - </properties> - - <profiles> - <profile> - <id>dev</id> - <properties> - <blueprint.api.version>${blueprint.api.dev.version}</blueprint.api.version> - </properties> - </profile> - </profiles> - - <dependencies> - <dependency> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>org.apache.aries.blueprint.annotation.api</artifactId> - <version>${org.apache.aries.blueprint.annotation.api.version}</version> - </dependency> - </dependencies> - - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <inherited>true</inherited> - <configuration> - <excludeDependencies>${aries.osgi.exclude.dependencies}</excludeDependencies> - <instructions> - <Fragment-Host>org.apache.aries.blueprint.sample-annotation</Fragment-Host> - </instructions> - </configuration> - </plugin> - - </plugins> - </pluginManagement> - </build> - -</project> diff --git a/blueprint/examples/blueprint-sample-fragment/src/main/java/org/apache/aries/blueprint/fragment/FragmentBean.java b/blueprint/examples/blueprint-sample-fragment/src/main/java/org/apache/aries/blueprint/fragment/FragmentBean.java deleted file mode 100644 index 7f232724b..000000000 --- a/blueprint/examples/blueprint-sample-fragment/src/main/java/org/apache/aries/blueprint/fragment/FragmentBean.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * 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. - */ -package org.apache.aries.blueprint.fragment; - -import org.apache.aries.blueprint.annotation.Bean; - -@Bean(id="fragment") -public class FragmentBean {} - diff --git a/blueprint/examples/pom.xml b/blueprint/examples/pom.xml index 38b3a3411..c502c7b93 100644 --- a/blueprint/examples/pom.xml +++ b/blueprint/examples/pom.xml @@ -39,7 +39,6 @@ <modules> <module>blueprint-sample</module> - <module>blueprint-sample-fragment</module> <module>blueprint-sample-war</module> </modules> diff --git a/blueprint/itests/blueprint-itests/pom.xml b/blueprint/itests/blueprint-itests/pom.xml index 1c5a3feb4..bced00274 100644 --- a/blueprint/itests/blueprint-itests/pom.xml +++ b/blueprint/itests/blueprint-itests/pom.xml @@ -333,12 +333,6 @@ <version>${commons-jexl.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>org.apache.aries.blueprint.sample-fragment</artifactId> - <version>${blueprint.sample.fragment.version}</version> - <scope>test</scope> - </dependency> <dependency> <groupId>org.ops4j.pax.logging</groupId> <artifactId>pax-logging-api</artifactId> diff --git a/samples/pom.xml b/samples/pom.xml index 00adb96fb..f42a6f223 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -47,7 +47,6 @@ <properties> <!-- Aries Blueprint Versions --> - <org.apache.aries.blueprint.annotation.api.version>1.0.0</org.apache.aries.blueprint.annotation.api.version> <org.apache.aries.blueprint.version>1.1.0</org.apache.aries.blueprint.version> <!-- Aries Jndi Versions --> diff --git a/spi-fly/spi-fly-itests/test.bndrun b/spi-fly/spi-fly-itests/test.bndrun index 5a0a0d03e..14bd1f248 100644 --- a/spi-fly/spi-fly-itests/test.bndrun +++ b/spi-fly/spi-fly-itests/test.bndrun @@ -52,12 +52,12 @@ -runbundles: \ assertj-core;version='[3.27.3,3.27.4)',\ - junit-jupiter-api;version='[5.12.1,5.12.2)',\ - junit-jupiter-engine;version='[5.12.1,5.12.2)',\ - junit-jupiter-params;version='[5.12.1,5.12.2)',\ - junit-platform-commons;version='[1.12.1,1.12.2)',\ - junit-platform-engine;version='[1.12.1,1.12.2)',\ - junit-platform-launcher;version='[1.12.1,1.12.2)',\ + junit-jupiter-api;version='[5.12.2,5.12.3)',\ + junit-jupiter-engine;version='[5.12.2,5.12.3)',\ + junit-jupiter-params;version='[5.12.2,5.12.3)',\ + junit-platform-commons;version='[1.12.2,1.12.3)',\ + junit-platform-engine;version='[1.12.2,1.12.3)',\ + junit-platform-launcher;version='[1.12.2,1.12.3)',\ net.bytebuddy.byte-buddy;version='[1.15.11,1.15.12)',\ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.8,1.3.9)',\ org.apache.aries.spifly.examples.spi.bundle;version='[1.0.6,1.0.7)',\
