Merge pull request #23955 from dmatej/felix705

Using released Felix instead of temporary prerelease by OmniFish
eclipse-ee4j · Jun 3, 2022 · ba05d6d · ba05d6d
2 parents b1f4fbb + 43edcc1
commit ba05d6d
Showing 1 changed file with 2 additions and 12 deletions.
diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml
@@ -466,12 +466,12 @@
             <dependency>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.main</artifactId>
-                <version>7.0.4-omnifish-M2</version>
+                <version>7.0.5</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.framework</artifactId>
-                <version>7.0.4-omnifish-M2</version>
+                <version>7.0.5</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
@@ -1435,16 +1435,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <!-- Temporary solution to get prereleased Felix artifacts with fixes -->
-            <id>staging</id>
-            <repositories>
-                <repository>
-                    <id>omnifish-prereleases</id>
-                    <url>https://omnifish.jfrog.io/artifactory/prereleases</url>
-                </repository>
-            </repositories>
-        </profile>
         <profile>
             <id>findbugs</id>
             <activation>