Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
40 changes: 0 additions & 40 deletions assemblies/features/base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,26 +59,6 @@
<artifactId>org.apache.servicemix.specs.activation-api-1.2.1</artifactId>
<version>1.2.1_3</version>
</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 @@ -155,21 +135,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.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
Expand All @@ -190,11 +155,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
21 changes: 0 additions & 21 deletions bom/artifacts/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -391,27 +391,6 @@
<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.subsystem</groupId>
<artifactId>org.apache.karaf.subsystem.core</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -516,11 +516,7 @@ private void doStart(InstanceState instance, String name, String javaOpts) throw
classpath.append(System.getProperty("path.separator"));
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" +
jdkOpts = " --add-opens java.base/java.security=ALL-UNNAMED" +
" --add-opens java.base/java.net=ALL-UNNAMED" +
" --add-opens java.base/java.lang=ALL-UNNAMED" +
" --add-opens java.base/java.util=ALL-UNNAMED" +
Expand All @@ -541,7 +537,7 @@ private void doStart(InstanceState instance, String name, String javaOpts) throw
jdkOpts += " -Djava.security.manager=allow";
}
} else {
jdkOpts = " -Djava.endorsed.dirs=\"" + new File(new File(new File(System.getProperty("java.home"), "jre"), "lib"), "endorsed") + System.getProperty("path.separator") + new File(new File(System.getProperty("java.home"), "lib"), "endorsed") + System.getProperty("path.separator") + new File(libDir, "endorsed").getCanonicalPath() + "\""
jdkOpts = " -Djava.endorsed.dirs=\"" + new File(new File(new File(System.getProperty("java.home"), "jre"), "lib"), "endorsed") + System.getProperty("path.separator") + new File(new File(System.getProperty("java.home"), "lib"), "endorsed") + "\""
+ " -Djava.ext.dirs=\"" + new File(new File(new File(System.getProperty("java.home"), "jre"), "lib"), "ext") + System.getProperty("path.separator") + new File(new File(System.getProperty("java.home"), "lib"), "ext") + System.getProperty("path.separator") + new File(libDir, "ext").getCanonicalPath() + "\"";
}
String command = "\""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -260,13 +260,6 @@ public Option[] config() {
KarafDistributionOption.editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg", "org.ops4j.pax.url.mvn.localRepository", localRepository),
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 All @@ -288,8 +281,7 @@ public Option[] config() {
new VMOption("--add-exports=jdk.naming.rmi/com.sun.jndi.url.rmi=ALL-UNNAMED"),
new VMOption("--add-exports=java.rmi/sun.rmi.registry=ALL-UNNAMED"),
new VMOption("-classpath"),
new VMOption("lib/jdk9plus/*" + File.pathSeparator + "lib/boot/*"
+ File.pathSeparator + "lib/endorsed/*")
new VMOption("lib/jdk9plus/*" + File.pathSeparator + "lib/boot/*")

};
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,6 @@ public Option[] baseConfig() throws Exception {
editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiServerPort", rmiServerPort),
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 All @@ -118,8 +110,7 @@ public Option[] baseConfig() throws Exception {
new VMOption("--add-exports=jdk.naming.rmi/com.sun.jndi.url.rmi=ALL-UNNAMED"),
new VMOption("--add-exports=java.rmi/sun.rmi.registry=ALL-UNNAMED"),
new VMOption("-classpath"),
new VMOption("lib/jdk9plus/*" + File.pathSeparator + "lib/boot/*"
+ File.pathSeparator + "lib/endorsed/*" )
new VMOption("lib/jdk9plus/*" + File.pathSeparator + "lib/boot/*")
};
} else {
return new Option[] {
Expand Down
1 change: 0 additions & 1 deletion pom.xml
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
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,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
71 changes: 0 additions & 71 deletions specs/activator/pom.xml

This file was deleted.

Loading