Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[KARAF-7768] Remove org/apache/karaf/specs #1816

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[KARAF-7768] Remove org/apache/karaf/specs #1816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 0 additions & 70 deletions assemblies/features/base/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,26 +75,6 @@
<groupId>com.sun.istack</groupId>
<artifactId>istack-commons-runtime</artifactId>
</dependency>
<dependency>
<groupId>org.apache.karaf.specs</groupId>
<artifactId>org.apache.karaf.specs.locator</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf.specs</groupId>
<artifactId>org.apache.karaf.specs.java.xml</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf.specs</groupId>
<artifactId>org.apache.karaf.specs.java.xml.ws</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf.specs</groupId>
<artifactId>org.apache.karaf.specs.activator</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>org.apache.karaf.main</artifactId>
Expand Down Expand Up @@ -171,51 +151,6 @@
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.apache.karaf.specs</groupId>
<artifactId>org.apache.karaf.specs.locator</artifactId>
<outputDirectory>target/classes/resources/lib/endorsed</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.apache.karaf.specs</groupId>
<artifactId>org.apache.karaf.specs.java.xml</artifactId>
<outputDirectory>target/classes/resources/lib/endorsed</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.apache.karaf.specs</groupId>
<artifactId>org.apache.karaf.specs.java.xml.ws</artifactId>
<outputDirectory>target/classes/resources/lib/endorsed</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<outputDirectory>target/classes/resources/lib/jdk9plus</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<outputDirectory>target/classes/resources/lib/jdk9plus</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.activation-api-1.2.1</artifactId>
<outputDirectory>target/classes/resources/lib/jdk9plus</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<outputDirectory>target/classes/resources/lib/jdk9plus</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>txw2</artifactId>
<outputDirectory>target/classes/resources/lib/jdk9plus</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>com.sun.istack</groupId>
<artifactId>istack-commons-runtime</artifactId>
<outputDirectory>target/classes/resources/lib/jdk9plus</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.apache.karaf</groupId>
<artifactId>org.apache.karaf.main</artifactId>
Expand All @@ -226,11 +161,6 @@
<artifactId>osgi.core</artifactId>
<outputDirectory>target/classes/resources/lib/boot</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.apache.karaf.specs</groupId>
<artifactId>org.apache.karaf.specs.activator</artifactId>
<outputDirectory>target/classes/resources/lib/boot</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.apache.karaf</groupId>
<artifactId>org.apache.karaf.client</artifactId>
Expand Down
3 changes: 0 additions & 3 deletions assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,9 +302,6 @@ run() {
if [ "${ROOT_INSTANCE_RUNNING}" = "false" ] || [ "${CHECK_ROOT_INSTANCE_RUNNING}" = "false" ] ; then
${KARAF_EXEC} "${JAVA}" ${JAVA_OPTS} \
--add-reads=java.xml=java.logging \
--add-exports=java.base/org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED \
--patch-module java.base="${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.locator-@@project.version@@.jar" \
--patch-module java.xml="${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.java.xml-@@project.version@@.jar" \
--add-opens java.base/java.security=ALL-UNNAMED \
--add-opens java.base/java.net=ALL-UNNAMED \
--add-opens java.base/java.lang=ALL-UNNAMED \
Expand Down
3 changes: 0 additions & 3 deletions assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,9 +418,6 @@ if "%KARAF_PROFILER%" == "" goto :RUN
if "%IS_RUNNABLE%" == "true" (
"%JAVA%" %JAVA_OPTS% %OPTS% ^
--add-reads=java.xml=java.logging ^
--add-exports=java.base/org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED ^
--patch-module java.base="%KARAF_HOME%\lib\endorsed\org.apache.karaf.specs.locator-@@project.version@@.jar" ^
--patch-module java.xml="%KARAF_HOME%\lib\endorsed\org.apache.karaf.specs.java.xml-@@project.version@@.jar" ^
--add-opens java.base/java.security=ALL-UNNAMED ^
--add-opens java.base/java.net=ALL-UNNAMED ^
--add-opens java.base/java.lang=ALL-UNNAMED ^
Expand Down
4 changes: 1 addition & 3 deletions assemblies/features/base/src/main/resources/resources/etc/system.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,10 @@ karaf.local.roles = admin,manager,viewer,systembundles
xml.catalog.files =

#
# Specs options
# ServiceMix specs options
#
org.apache.servicemix.specs.debug = false
org.apache.servicemix.specs.timeout = 0
org.apache.karaf.specs.debug = false
org.apache.karaf.specs.timeout = 0

#
# Settings for the OSGi 4.3 Weaving
Expand Down
20 changes: 0 additions & 20 deletions bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,26 +151,6 @@
<artifactId>org.apache.karaf.client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.karaf.specs</groupId>
<artifactId>org.apache.karaf.specs.locator</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.karaf.specs</groupId>
<artifactId>org.apache.karaf.specs.activator</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.karaf.specs</groupId>
<artifactId>org.apache.karaf.specs.java.xml</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.karaf.specs</groupId>
<artifactId>org.apache.karaf.specs.java.xml.ws</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.karaf.bundle</groupId>
Expand Down
3 changes: 0 additions & 3 deletions instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,9 +517,6 @@ private void doStart(InstanceState instance, String name, String javaOpts) throw
classpath.append(jdk9Classpath);
}
jdkOpts = " --add-reads=java.xml=java.logging" +
" --add-exports=java.base/org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED" +
" --patch-module java.base=" + System.getProperty("karaf.home") + "/lib/endorsed/org.apache.karaf.specs.locator-" + System.getProperty("karaf.version") + ".jar" +
" --patch-module java.xml=" + System.getProperty("karaf.home") + "/lib/endorsed/org.apache.karaf.specs.java.xml-" + System.getProperty("karaf.version") + ".jar" +
" --add-opens java.base/java.security=ALL-UNNAMED" +
" --add-opens java.base/java.net=ALL-UNNAMED" +
" --add-opens java.base/java.lang=ALL-UNNAMED" +
Expand Down
2 changes: 0 additions & 2 deletions instance/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,6 @@ xml.catalog.files =
#
org.apache.servicemix.specs.debug = false
org.apache.servicemix.specs.timeout = 0
org.apache.karaf.specs.debug = false
org.apache.karaf.specs.timeout = 0

#
# Settings for the OSGi 4.3 Weaving
Expand Down
6 changes: 0 additions & 6 deletions itests/common/src/main/java/org/apache/karaf/itests/KarafTestSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,12 +261,6 @@ public Option[] config() {
KarafDistributionOption.editConfigurationFilePut("etc/branding.properties", "welcome", ""), // No welcome banner
KarafDistributionOption.editConfigurationFilePut("etc/branding-ssh.properties", "welcome", ""),
new VMOption("--add-reads=java.xml=java.logging"),
new VMOption("--add-exports=java.base/org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED"),
new VMOption("--patch-module"),
new VMOption("java.base=lib/endorsed/org.apache.karaf.specs.locator-"
+ System.getProperty("karaf.version") + ".jar"),
new VMOption("--patch-module"), new VMOption("java.xml=lib/endorsed/org.apache.karaf.specs.java.xml-"
+ System.getProperty("karaf.version") + ".jar"),
new VMOption("--add-opens"),
new VMOption("java.base/java.security=ALL-UNNAMED"),
new VMOption("--add-opens"),
Expand Down
7 changes: 0 additions & 7 deletions ...src/test/java/org/apache/karaf/itests/mavenresolver/KarafMinimalMonitoredTestSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,6 @@ public Option[] baseConfig() throws Exception {
editConfigurationFilePut("etc/startup.properties", "file:../../" + new File(url.toURI()).getName(), "1"),
composite(editConfigurationFilePut("etc/org.apache.karaf.features.cfg", new File("target/test-classes/etc/org.apache.karaf.features.cfg"))),
new VMOption("--add-reads=java.xml=java.logging"),
new VMOption("--add-exports=java.base/org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED"),
new VMOption("--patch-module"),
new VMOption("java.base=lib/endorsed/org.apache.karaf.specs.locator-"
+ System.getProperty("karaf.version") + ".jar"),
new VMOption("--patch-module"),
new VMOption("java.xml=lib/endorsed/org.apache.karaf.specs.java.xml-"
+ System.getProperty("karaf.version") + ".jar"),
new VMOption("--add-opens"),
new VMOption("java.base/java.security=ALL-UNNAMED"),
new VMOption("--add-opens"),
Expand Down
1 change: 0 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
<module>event</module>
<module>tooling</module>
<module>manual</module>
<module>specs</module>
<module>assemblies</module>
<module>examples</module>
<module>archetypes</module>
Expand Down
6 changes: 0 additions & 6 deletions services/interceptor/impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,12 +125,6 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf.specs</groupId>
<artifactId>org.apache.karaf.specs.locator</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
72 changes: 0 additions & 72 deletions specs/activator/pom.xml
View file
Open in desktop

This file was deleted.

Loading