You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by al...@apache.org on 2025/05/08 14:03:14 UTC
(aries) 01/01: ARIES-2181: Remove indirect aries parent relation in jndi
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-jndi
in repository https://gitbox.apache.org/repos/asf/aries.git
commit 231680f28af268ac5bb86844a9d259b38accefba
Author: Dominik Przybysz <al...@gmail.com>
AuthorDate: Thu May 8 16:02:51 2025 +0200
ARIES-2181: Remove indirect aries parent relation in jndi
---
.github/workflows/jndi.yml | 1 +
jndi/jndi-api/pom.xml | 29 +----
jndi/jndi-bundle/pom.xml | 21 +--
jndi/jndi-core/pom.xml | 15 ++-
jndi/jndi-legacy-support/pom.xml | 26 +---
jndi/jndi-rmi/pom.xml | 27 +---
jndi/jndi-url-itest-biz/pom.xml | 8 +-
jndi/jndi-url-itest-web/pom.xml | 8 +-
jndi/jndi-url-itest/pom.xml | 47 +++++--
.../aries/jndi/itests/JndiUrlIntegrationTest.java | 2 +-
jndi/jndi-url/pom.xml | 37 ++----
jndi/parent/pom.xml | 144 ---------------------
jndi/pom.xml | 1 -
13 files changed, 88 insertions(+), 278 deletions(-)
diff --git a/.github/workflows/jndi.yml b/.github/workflows/jndi.yml
index d83fb3e76..ea93f2d66 100644
--- a/.github/workflows/jndi.yml
+++ b/.github/workflows/jndi.yml
@@ -17,6 +17,7 @@ on:
paths:
- parent/**
- testsupport/**
+ - util/**
- jndi/**
- .github/workflows/jndi.yml
push:
diff --git a/jndi/jndi-api/pom.xml b/jndi/jndi-api/pom.xml
index 67c3c389b..0ff4e09cb 100644
--- a/jndi/jndi-api/pom.xml
+++ b/jndi/jndi-api/pom.xml
@@ -22,10 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>jndi-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>parent</artifactId>
+ <version>3.0.0</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.jndi</groupId>
@@ -53,25 +53,6 @@
org.apache.aries.jndi.spi
</aries.osgi.export.pkg>
<aries.osgi.private.pkg/>
- <lastReleaseVersion>1.0.0</lastReleaseVersion>
+ <lastReleaseVersion>1.1.0</lastReleaseVersion>
</properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.aries.versioning</groupId>
- <artifactId>org.apache.aries.versioning.plugin</artifactId>
- <executions>
- <execution>
- <id>default-verify</id>
- <phase>verify</phase>
- <goals>
- <goal>version-check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/jndi/jndi-bundle/pom.xml b/jndi/jndi-bundle/pom.xml
index 534b07e84..d64a144c6 100644
--- a/jndi/jndi-bundle/pom.xml
+++ b/jndi/jndi-bundle/pom.xml
@@ -22,10 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>jndi-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>parent</artifactId>
+ <version>3.0.0</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.jndi</groupId>
@@ -248,19 +248,6 @@
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.aries.versioning</groupId>
- <artifactId>org.apache.aries.versioning.plugin</artifactId>
- <executions>
- <execution>
- <id>default-verify</id>
- <phase>verify</phase>
- <goals>
- <goal>version-check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</profile>
diff --git a/jndi/jndi-core/pom.xml b/jndi/jndi-core/pom.xml
index e782a982e..87daadc3a 100644
--- a/jndi/jndi-core/pom.xml
+++ b/jndi/jndi-core/pom.xml
@@ -22,10 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>jndi-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>parent</artifactId>
+ <version>3.0.0</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.jndi</groupId>
@@ -56,6 +56,10 @@
<lastReleaseVersion>1.0.0</lastReleaseVersion>
<jndi-api.version>1.1.1-SNAPSHOT</jndi-api.version>
+ <org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>
+ <osgi.core.version>8.0.0</osgi.core.version>
+ <osgi.cmpn.version>7.0.0</osgi.cmpn.version>
+ <osgi.enterprise.version>7.0.0</osgi.enterprise.version>
</properties>
<dependencies>
@@ -73,6 +77,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.enterprise</artifactId>
+ <version>${osgi.enterprise.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -83,6 +88,7 @@
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
+ <version>${org.apache.aries.testsupport.unit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -96,5 +102,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
</project>
diff --git a/jndi/jndi-legacy-support/pom.xml b/jndi/jndi-legacy-support/pom.xml
index dece5f1bf..2f7c19eab 100644
--- a/jndi/jndi-legacy-support/pom.xml
+++ b/jndi/jndi-legacy-support/pom.xml
@@ -22,10 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>jndi-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>parent</artifactId>
+ <version>3.0.0</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.jndi</groupId>
@@ -61,22 +61,4 @@
<scope>provided</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.aries.versioning</groupId>
- <artifactId>org.apache.aries.versioning.plugin</artifactId>
- <executions>
- <execution>
- <id>default-verify</id>
- <phase>verify</phase>
- <goals>
- <goal>version-check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/jndi/jndi-rmi/pom.xml b/jndi/jndi-rmi/pom.xml
index 8ffd1bb0d..61162ac1e 100644
--- a/jndi/jndi-rmi/pom.xml
+++ b/jndi/jndi-rmi/pom.xml
@@ -22,10 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>jndi-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>parent</artifactId>
+ <version>3.0.0</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.jndi</groupId>
@@ -74,23 +74,4 @@
<scope>provided</scope>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.aries.versioning</groupId>
- <artifactId>org.apache.aries.versioning.plugin</artifactId>
- <executions>
- <execution>
- <id>default-verify</id>
- <phase>verify</phase>
- <goals>
- <goal>version-check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/jndi/jndi-url-itest-biz/pom.xml b/jndi/jndi-url-itest-biz/pom.xml
index db6818caa..dc42c3de8 100644
--- a/jndi/jndi-url-itest-biz/pom.xml
+++ b/jndi/jndi-url-itest-biz/pom.xml
@@ -22,10 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>jndi-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>parent</artifactId>
+ <version>3.0.0</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.jndi</groupId>
diff --git a/jndi/jndi-url-itest-web/pom.xml b/jndi/jndi-url-itest-web/pom.xml
index 31b36821f..8a67c177e 100644
--- a/jndi/jndi-url-itest-web/pom.xml
+++ b/jndi/jndi-url-itest-web/pom.xml
@@ -22,10 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>jndi-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>parent</artifactId>
+ <version>3.0.0</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.jndi</groupId>
diff --git a/jndi/jndi-url-itest/pom.xml b/jndi/jndi-url-itest/pom.xml
index c6648948c..8287fc1c0 100644
--- a/jndi/jndi-url-itest/pom.xml
+++ b/jndi/jndi-url-itest/pom.xml
@@ -22,10 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>jndi-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>parent</artifactId>
+ <version>3.0.0</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.jndi</groupId>
@@ -43,9 +43,8 @@
</scm>
<properties>
- <asm-debug-all.version>5.2</asm-debug-all.version>
+ <asm.version>9.8</asm.version>
<cm.version>3.2.0-v20070116</cm.version>
- <depends-maven-plugin.version>1.5.0</depends-maven-plugin.version>
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
<jakarta.servlet-api.version>4.0.4</jakarta.servlet-api.version>
<jndi-api.version>1.1.1-SNAPSHOT</jndi-api.version>
@@ -53,10 +52,17 @@
<jndi-url-itest-biz.version>1.0.1-SNAPSHOT</jndi-url-itest-biz.version>
<jndi-url-itest-web.version>1.0.1-SNAPSHOT</jndi-url-itest-web.version>
<jndi-url.version>1.1.1-SNAPSHOT</jndi-url.version>
+ <org.apache.aries.util.version>2.0.0-SNAPSHOT</org.apache.aries.util.version>
+ <org.apache.aries.proxy.api.version>1.1.1</org.apache.aries.proxy.api.version>
+ <org.apache.aries.proxy.impl.version>1.1.14</org.apache.aries.proxy.impl.version>
+ <org.apache.aries.blueprint.api.version>1.0.1</org.apache.aries.blueprint.api.version>
+ <org.apache.aries.blueprint.core.version>1.10.3</org.apache.aries.blueprint.core.version>
<org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>
<org.apache.felix.fileinstall.version>3.7.4</org.apache.felix.fileinstall.version>
<org.apache.servicemix.bundles.cglib.version>3.3.0_1</org.apache.servicemix.bundles.cglib.version>
<org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
+ <osgi.core.version>8.0.0</osgi.core.version>
+ <osgi.cmpn.version>7.0.0</osgi.cmpn.version>
<pax-exam.version>4.13.5</pax-exam.version>
<pax-swissbox.version>1.8.3</pax-swissbox.version>
<pax-tinybundles.version>2.1.1</pax-tinybundles.version>
@@ -115,28 +121,33 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
+ <version>${org.apache.aries.blueprint.api.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
+ <version>${org.apache.aries.blueprint.core.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
+ <version>${org.apache.aries.util.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.api</artifactId>
+ <version>${org.apache.aries.proxy.api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy</artifactId>
+ <version>${org.apache.aries.proxy.impl.version}</version>
</dependency>
<!-- pax exam -->
@@ -214,9 +225,27 @@
<dependency>
<groupId>org.ow2.asm</groupId>
- <artifactId>asm-debug-all</artifactId>
+ <artifactId>asm</artifactId>
+ <version>${asm.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <version>${asm.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-tree</artifactId>
+ <version>${asm.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-analysis</artifactId>
+ <version>${asm.version}</version>
<scope>test</scope>
- <version>${asm-debug-all.version}</version>
</dependency>
<dependency>
@@ -291,8 +320,8 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.fileinstall</artifactId>
- <scope>test</scope>
<version>${org.apache.felix.fileinstall.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
diff --git a/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java b/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java
index 67d5b7048..98a073bdd 100644
--- a/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java
+++ b/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java
@@ -166,7 +166,7 @@ public class JndiUrlIntegrationTest extends AbstractIntegrationTest {
mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi.url.itest.web").versionAsInProject(),
mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi.url.itest.biz").versionAsInProject(),
- mavenBundle("org.ow2.asm", "asm-debug-all").versionAsInProject(),
+ addAsmBundles(),
mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject()
);
}
diff --git a/jndi/jndi-url/pom.xml b/jndi/jndi-url/pom.xml
index b2a024986..eb097f5c0 100644
--- a/jndi/jndi-url/pom.xml
+++ b/jndi/jndi-url/pom.xml
@@ -22,10 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>jndi-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>parent</artifactId>
+ <version>3.0.0</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.jndi</groupId>
@@ -61,10 +61,15 @@
<aries.osgi.import.service>
org.apache.aries.proxy.ProxyManager
</aries.osgi.import.service>
- <lastReleaseVersion>1.0.0</lastReleaseVersion>
+ <lastReleaseVersion>1.1.0</lastReleaseVersion>
<jndi-api.version>1.1.1-SNAPSHOT</jndi-api.version>
<jndi-core.version>1.1.0-SNAPSHOT</jndi-core.version>
+ <org.apache.aries.proxy.api.version>1.1.1</org.apache.aries.proxy.api.version>
+ <org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>
+ <osgi.core.version>8.0.0</osgi.core.version>
+ <osgi.cmpn.version>7.0.0</osgi.cmpn.version>
+ <osgi.enterprise.version>7.0.0</osgi.enterprise.version>
</properties>
<dependencies>
@@ -83,6 +88,7 @@
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.api</artifactId>
+ <version>${org.apache.aries.proxy.api.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -92,11 +98,13 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.enterprise</artifactId>
+ <version>${osgi.enterprise.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
+ <version>${org.apache.aries.testsupport.unit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -110,23 +118,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.aries.versioning</groupId>
- <artifactId>org.apache.aries.versioning.plugin</artifactId>
- <executions>
- <execution>
- <id>default-verify</id>
- <phase>verify</phase>
- <goals>
- <goal>version-check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/jndi/parent/pom.xml b/jndi/parent/pom.xml
deleted file mode 100644
index e7ff52cf4..000000000
--- a/jndi/parent/pom.xml
+++ /dev/null
@@ -1,144 +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>3.0.1-SNAPSHOT</version>
- <relativePath>../../parent/pom.xml</relativePath>
- </parent>
-
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>jndi-parent</artifactId>
- <packaging>pom</packaging>
- <name>Apache Aries JNDI Parent</name>
- <version>1.0.0-SNAPSHOT</version>
- <description>
- JNDI project 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>
- <org.apache.aries.util.version>2.0.0-SNAPSHOT</org.apache.aries.util.version>
- <org.apache.aries.proxy.api.version>1.1.1</org.apache.aries.proxy.api.version>
- <org.apache.aries.proxy.impl.version>1.1.14</org.apache.aries.proxy.impl.version>
- <org.apache.aries.blueprint.api.version>1.0.1</org.apache.aries.blueprint.api.version>
- <org.apache.aries.blueprint.core.version>1.10.3</org.apache.aries.blueprint.core.version>
- <osgi.core.version>8.0.0</osgi.core.version>
- <osgi.cmpn.version>7.0.0</osgi.cmpn.version>
- <osgi.enterprise.version>7.0.0</osgi.enterprise.version>
- <org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>
- <slf4j-api.version>2.0.16</slf4j-api.version>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.util</artifactId>
- <version>${org.apache.aries.util.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy.api</artifactId>
- <version>${org.apache.aries.proxy.api.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy</artifactId>
- <version>${org.apache.aries.proxy.impl.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint.api</artifactId>
- <version>${org.apache.aries.blueprint.api.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>${org.apache.aries.blueprint.core.version}</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <version>${osgi.core.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>${osgi.cmpn.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.enterprise</artifactId>
- <version>${osgi.enterprise.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j-api.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.testsupport</groupId>
- <artifactId>org.apache.aries.testsupport.unit</artifactId>
- <version>${org.apache.aries.testsupport.unit.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.aries.versioning</groupId>
- <artifactId>org.apache.aries.versioning.plugin</artifactId>
- <executions>
- <execution>
- <id>default-verify</id>
- <phase>verify</phase>
- <goals>
- <goal>version-check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/jndi/pom.xml b/jndi/pom.xml
index 516d5ae44..d18a1412a 100644
--- a/jndi/pom.xml
+++ b/jndi/pom.xml
@@ -38,7 +38,6 @@
</description>
<modules>
- <module>parent</module>
<module>jndi-api</module>
<module>jndi-core</module>
<module>jndi-url</module>