Skip to content

Commit a4e8272

Browse files
rovargarovarga
committed
[KARAF-7768] Remove org/apache/karaf/specs
1 parent 5627aa3 commit a4e8272

File tree

52 files changed

+5
-5176
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+5
-5176
lines changed

‎assemblies/features/base/pom.xml‎

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -75,26 +75,6 @@
7575
<groupId>com.sun.istack</groupId>
7676
<artifactId>istack-commons-runtime</artifactId>
7777
</dependency>
78-
<dependency>
79-
<groupId>org.apache.karaf.specs</groupId>
80-
<artifactId>org.apache.karaf.specs.locator</artifactId>
81-
<scope>runtime</scope>
82-
</dependency>
83-
<dependency>
84-
<groupId>org.apache.karaf.specs</groupId>
85-
<artifactId>org.apache.karaf.specs.java.xml</artifactId>
86-
<scope>runtime</scope>
87-
</dependency>
88-
<dependency>
89-
<groupId>org.apache.karaf.specs</groupId>
90-
<artifactId>org.apache.karaf.specs.java.xml.ws</artifactId>
91-
<scope>runtime</scope>
92-
</dependency>
93-
<dependency>
94-
<groupId>org.apache.karaf.specs</groupId>
95-
<artifactId>org.apache.karaf.specs.activator</artifactId>
96-
<scope>runtime</scope>
97-
</dependency>
9878
<dependency>
9979
<groupId>org.apache.karaf</groupId>
10080
<artifactId>org.apache.karaf.main</artifactId>
@@ -171,51 +151,6 @@
171151
</goals>
172152
<configuration>
173153
<artifactItems>
174-
<artifactItem>
175-
<groupId>org.apache.karaf.specs</groupId>
176-
<artifactId>org.apache.karaf.specs.locator</artifactId>
177-
<outputDirectory>target/classes/resources/lib/endorsed</outputDirectory>
178-
</artifactItem>
179-
<artifactItem>
180-
<groupId>org.apache.karaf.specs</groupId>
181-
<artifactId>org.apache.karaf.specs.java.xml</artifactId>
182-
<outputDirectory>target/classes/resources/lib/endorsed</outputDirectory>
183-
</artifactItem>
184-
<artifactItem>
185-
<groupId>org.apache.karaf.specs</groupId>
186-
<artifactId>org.apache.karaf.specs.java.xml.ws</artifactId>
187-
<outputDirectory>target/classes/resources/lib/endorsed</outputDirectory>
188-
</artifactItem>
189-
<artifactItem>
190-
<groupId>jakarta.xml.bind</groupId>
191-
<artifactId>jakarta.xml.bind-api</artifactId>
192-
<outputDirectory>target/classes/resources/lib/jdk9plus</outputDirectory>
193-
</artifactItem>
194-
<artifactItem>
195-
<groupId>javax.annotation</groupId>
196-
<artifactId>javax.annotation-api</artifactId>
197-
<outputDirectory>target/classes/resources/lib/jdk9plus</outputDirectory>
198-
</artifactItem>
199-
<artifactItem>
200-
<groupId>org.apache.servicemix.specs</groupId>
201-
<artifactId>org.apache.servicemix.specs.activation-api-1.2.1</artifactId>
202-
<outputDirectory>target/classes/resources/lib/jdk9plus</outputDirectory>
203-
</artifactItem>
204-
<artifactItem>
205-
<groupId>org.glassfish.jaxb</groupId>
206-
<artifactId>jaxb-runtime</artifactId>
207-
<outputDirectory>target/classes/resources/lib/jdk9plus</outputDirectory>
208-
</artifactItem>
209-
<artifactItem>
210-
<groupId>org.glassfish.jaxb</groupId>
211-
<artifactId>txw2</artifactId>
212-
<outputDirectory>target/classes/resources/lib/jdk9plus</outputDirectory>
213-
</artifactItem>
214-
<artifactItem>
215-
<groupId>com.sun.istack</groupId>
216-
<artifactId>istack-commons-runtime</artifactId>
217-
<outputDirectory>target/classes/resources/lib/jdk9plus</outputDirectory>
218-
</artifactItem>
219154
<artifactItem>
220155
<groupId>org.apache.karaf</groupId>
221156
<artifactId>org.apache.karaf.main</artifactId>
@@ -226,11 +161,6 @@
226161
<artifactId>osgi.core</artifactId>
227162
<outputDirectory>target/classes/resources/lib/boot</outputDirectory>
228163
</artifactItem>
229-
<artifactItem>
230-
<groupId>org.apache.karaf.specs</groupId>
231-
<artifactId>org.apache.karaf.specs.activator</artifactId>
232-
<outputDirectory>target/classes/resources/lib/boot</outputDirectory>
233-
</artifactItem>
234164
<artifactItem>
235165
<groupId>org.apache.karaf</groupId>
236166
<artifactId>org.apache.karaf.client</artifactId>

‎assemblies/features/base/src/main/filtered-resources/resources/bin/karaf‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -302,9 +302,6 @@ run() {
302302
if [ "${ROOT_INSTANCE_RUNNING}" = "false" ] || [ "${CHECK_ROOT_INSTANCE_RUNNING}" = "false" ] ; then
303303
${KARAF_EXEC} "${JAVA}" ${JAVA_OPTS} \
304304
--add-reads=java.xml=java.logging \
305-
--add-exports=java.base/org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED \
306-
--patch-module java.base="${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.locator-@@project.version@@.jar" \
307-
--patch-module java.xml="${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.java.xml-@@project.version@@.jar" \
308305
--add-opens java.base/java.security=ALL-UNNAMED \
309306
--add-opens java.base/java.net=ALL-UNNAMED \
310307
--add-opens java.base/java.lang=ALL-UNNAMED \

‎assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -418,9 +418,6 @@ if "%KARAF_PROFILER%" == "" goto :RUN
418418
if "%IS_RUNNABLE%" == "true" (
419419
"%JAVA%" %JAVA_OPTS% %OPTS% ^
420420
--add-reads=java.xml=java.logging ^
421-
--add-exports=java.base/org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED ^
422-
--patch-module java.base="%KARAF_HOME%\lib\endorsed\org.apache.karaf.specs.locator-@@project.version@@.jar" ^
423-
--patch-module java.xml="%KARAF_HOME%\lib\endorsed\org.apache.karaf.specs.java.xml-@@project.version@@.jar" ^
424421
--add-opens java.base/java.security=ALL-UNNAMED ^
425422
--add-opens java.base/java.net=ALL-UNNAMED ^
426423
--add-opens java.base/java.lang=ALL-UNNAMED ^

‎assemblies/features/base/src/main/resources/resources/etc/system.properties‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,10 @@ karaf.local.roles = admin,manager,viewer,systembundles
9999
xml.catalog.files =
100100

101101
#
102-
# Specs options
102+
# ServiceMix specs options
103103
#
104104
org.apache.servicemix.specs.debug = false
105105
org.apache.servicemix.specs.timeout = 0
106-
org.apache.karaf.specs.debug = false
107-
org.apache.karaf.specs.timeout = 0
108106

109107
#
110108
# Settings for the OSGi 4.3 Weaving

‎bom/pom.xml‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -151,26 +151,6 @@
151151
<artifactId>org.apache.karaf.client</artifactId>
152152
<version>${project.version}</version>
153153
</dependency>
154-
<dependency>
155-
<groupId>org.apache.karaf.specs</groupId>
156-
<artifactId>org.apache.karaf.specs.locator</artifactId>
157-
<version>${project.version}</version>
158-
</dependency>
159-
<dependency>
160-
<groupId>org.apache.karaf.specs</groupId>
161-
<artifactId>org.apache.karaf.specs.activator</artifactId>
162-
<version>${project.version}</version>
163-
</dependency>
164-
<dependency>
165-
<groupId>org.apache.karaf.specs</groupId>
166-
<artifactId>org.apache.karaf.specs.java.xml</artifactId>
167-
<version>${project.version}</version>
168-
</dependency>
169-
<dependency>
170-
<groupId>org.apache.karaf.specs</groupId>
171-
<artifactId>org.apache.karaf.specs.java.xml.ws</artifactId>
172-
<version>${project.version}</version>
173-
</dependency>
174154

175155
<dependency>
176156
<groupId>org.apache.karaf.bundle</groupId>

‎features/core/src/main/java/org/apache/karaf/features/internal/service/BootFeaturesInstaller.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ protected void installBootFeatures(boolean quitIfUnsuccessful) {
106106
}
107107
featuresService.bootDone();
108108
publishBootFinished();
109-
} catch (Throwable e) {
109+
} catch (Exception e) {
110110
// Special handling in case the bundle has been refreshed.
111111
// In such a case, simply exits without logging any exception
112112
// as the restart should cause the feature service to finish

‎instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -517,9 +517,6 @@ private void doStart(InstanceState instance, String name, String javaOpts) throw
517517
classpath.append(jdk9Classpath);
518518
}
519519
jdkOpts = " --add-reads=java.xml=java.logging" +
520-
" --add-exports=java.base/org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED" +
521-
" --patch-module java.base=" + System.getProperty("karaf.home") + "/lib/endorsed/org.apache.karaf.specs.locator-" + System.getProperty("karaf.version") + ".jar" +
522-
" --patch-module java.xml=" + System.getProperty("karaf.home") + "/lib/endorsed/org.apache.karaf.specs.java.xml-" + System.getProperty("karaf.version") + ".jar" +
523520
" --add-opens java.base/java.security=ALL-UNNAMED" +
524521
" --add-opens java.base/java.net=ALL-UNNAMED" +
525522
" --add-opens java.base/java.lang=ALL-UNNAMED" +

‎instance/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,6 @@ xml.catalog.files =
9797
#
9898
org.apache.servicemix.specs.debug = false
9999
org.apache.servicemix.specs.timeout = 0
100-
org.apache.karaf.specs.debug = false
101-
org.apache.karaf.specs.timeout = 0
102100

103101
#
104102
# Settings for the OSGi 4.3 Weaving

‎itests/common/src/main/java/org/apache/karaf/itests/KarafTestSupport.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -261,12 +261,6 @@ public Option[] config() {
261261
KarafDistributionOption.editConfigurationFilePut("etc/branding.properties", "welcome", ""), // No welcome banner
262262
KarafDistributionOption.editConfigurationFilePut("etc/branding-ssh.properties", "welcome", ""),
263263
new VMOption("--add-reads=java.xml=java.logging"),
264-
new VMOption("--add-exports=java.base/org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED"),
265-
new VMOption("--patch-module"),
266-
new VMOption("java.base=lib/endorsed/org.apache.karaf.specs.locator-"
267-
+ System.getProperty("karaf.version") + ".jar"),
268-
new VMOption("--patch-module"), new VMOption("java.xml=lib/endorsed/org.apache.karaf.specs.java.xml-"
269-
+ System.getProperty("karaf.version") + ".jar"),
270264
new VMOption("--add-opens"),
271265
new VMOption("java.base/java.security=ALL-UNNAMED"),
272266
new VMOption("--add-opens"),

‎itests/test/src/test/java/org/apache/karaf/itests/mavenresolver/KarafMinimalMonitoredTestSupport.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,6 @@ public Option[] baseConfig() throws Exception {
9191
editConfigurationFilePut("etc/startup.properties", "file:../../" + new File(url.toURI()).getName(), "1"),
9292
composite(editConfigurationFilePut("etc/org.apache.karaf.features.cfg", new File("target/test-classes/etc/org.apache.karaf.features.cfg"))),
9393
new VMOption("--add-reads=java.xml=java.logging"),
94-
new VMOption("--add-exports=java.base/org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED"),
95-
new VMOption("--patch-module"),
96-
new VMOption("java.base=lib/endorsed/org.apache.karaf.specs.locator-"
97-
+ System.getProperty("karaf.version") + ".jar"),
98-
new VMOption("--patch-module"),
99-
new VMOption("java.xml=lib/endorsed/org.apache.karaf.specs.java.xml-"
100-
+ System.getProperty("karaf.version") + ".jar"),
10194
new VMOption("--add-opens"),
10295
new VMOption("java.base/java.security=ALL-UNNAMED"),
10396
new VMOption("--add-opens"),

0 commit comments

Comments
 (0)