Fix merge errors with jakarta-ized sources
Signed-off-by: hs536 <sawamura.hiroki@fujitsu.com>
diff --git a/appserver/featuresets/glassfish/pom.xml b/appserver/featuresets/glassfish/pom.xml
index 345836f..6e1ddad 100644
--- a/appserver/featuresets/glassfish/pom.xml
+++ b/appserver/featuresets/glassfish/pom.xml
@@ -844,16 +844,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
<exclusions>
diff --git a/appserver/pom.xml b/appserver/pom.xml
index 4307289..267c1e5 100644
--- a/appserver/pom.xml
+++ b/appserver/pom.xml
@@ -158,9 +158,6 @@
<soap-api.version>1.4.0</soap-api.version>
<jakarta.jws-api.version>2.1.0</jakarta.jws-api.version>
- <!-- Jakarta XML Binding -->
- <jaxb.version>3.0.0-M2</jaxb.version>
-
<!-- Jakarta Standard Tag Library -->
<jstl-api.version>2.0.0-RC1</jstl-api.version>
<jstl-impl.version>2.0.0-M1</jstl-impl.version>
@@ -632,16 +629,6 @@
<artifactId>wsdl4j</artifactId>
<version>${wsdl4j.version}</version>
</dependency>
- <dependency>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- <version>${jakarta.activation-api.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
- <version>${jakarta.activation.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
diff --git a/nucleus/admin/cli/pom.xml b/nucleus/admin/cli/pom.xml
index a635e36..27f6e8c 100755
--- a/nucleus/admin/cli/pom.xml
+++ b/nucleus/admin/cli/pom.xml
@@ -110,12 +110,12 @@
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
- <version>${jaxb-api.version}</version>
+ <version>${jakarta.jaxb-api.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-osgi</artifactId>
- <version>${jaxb.version}</version>
+ <version>${jakarta.jaxb-impl.version}</version>
</dependency>
</dependencies>
diff --git a/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/JvmOptions.java b/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/JvmOptions.java
index 64bb457..e2b4a03 100644
--- a/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/JvmOptions.java
+++ b/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/JvmOptions.java
@@ -105,9 +105,9 @@
for (Map.Entry<String, String> entry : longProps.entrySet()) {
String value = entry.getValue();
if (value != null) {
- ss.add("--" + entry.getKey() + "=" + value);
+ options.add("--" + entry.getKey() + "=" + value);
} else {
- ss.add("--" + entry.getKey());
+ options.add("--" + entry.getKey());
}
}
diff --git a/nucleus/featuresets/atomic/pom.xml b/nucleus/featuresets/atomic/pom.xml
index 98f53a2..98cc16f 100644
--- a/nucleus/featuresets/atomic/pom.xml
+++ b/nucleus/featuresets/atomic/pom.xml
@@ -1047,7 +1047,7 @@
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
- <version>${jaxb-api.version}</version>
+ <version>${jakarta.jaxb-api.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
@@ -1058,18 +1058,7 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-osgi</artifactId>
- <version>${jaxb.version}</version>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- <version>${jakarta.activation-api.version}</version>
+ <version>${jakarta.jaxb-impl.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
@@ -1080,7 +1069,7 @@
<dependency>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
- <version>${jakarta.activation.version}</version>
+ <version>${activation.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml
index 321db4e..e0e621a 100644
--- a/nucleus/parent/pom.xml
+++ b/nucleus/parent/pom.xml
@@ -158,8 +158,6 @@
<javaee.version.new>8</javaee.version.new>
<jmockit.version>1.49</jmockit.version>
<osgi-resource-locator.version>1.0.3</osgi-resource-locator.version>
- <jakarta.activation-api.version>1.2.1</jakarta.activation-api.version>
- <jakarta.activation.version>1.2.1</jakarta.activation.version>
</properties>
<build>
diff --git a/nucleus/tests/admin/pom.xml b/nucleus/tests/admin/pom.xml
index 1aee2b9..0af0029 100644
--- a/nucleus/tests/admin/pom.xml
+++ b/nucleus/tests/admin/pom.xml
@@ -116,12 +116,12 @@
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
- <version>${jaxb-api.version}</version>
+ <version>${jakarta.jaxb-api.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-osgi</artifactId>
- <version>${jaxb.version}</version>
+ <version>${jakarta.jaxb-impl.version}</version>
</dependency>
</dependencies>
