Skip to content

Commit ac91b59

Browse files
dmatejdmatej
committed
Upgrade to latest ORB dependencies
Signed-off-by: David Matějček <[email protected]>
1 parent 69dd5eb commit ac91b59

File tree

13 files changed

+312
-27
lines changed

13 files changed

+312
-27
lines changed

‎csiv2-idl/src/main/java/module-info.java‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/*
2+
* Copyright (c) 2025 Contributors to the Eclipse Foundation
3+
*
4+
* This program and the accompanying materials are made available under the
5+
* terms of the Eclipse Public License v. 2.0, which is available at
6+
* http://www.eclipse.org/legal/epl-2.0.
7+
*
8+
* This Source Code may also be made available under the following Secondary
9+
* Licenses when the conditions for such availability set forth in the
10+
* Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
11+
* version 2 with the GNU Classpath Exception, which is available at
12+
* https://www.gnu.org/software/classpath/license.html.
13+
*
14+
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15+
*/
16+
17+
module org.glassfish.corba.idl {
18+
19+
requires org.glassfish.corba.omgapi;
20+
21+
exports com.sun.corba.ee.org.omg.CSI;
22+
exports com.sun.corba.ee.org.omg.CSIIOP;
23+
exports com.sun.corba.ee.org.omg.GSSUP;
24+
}

‎exception-annotation-processor/src/main/java/module-info.java‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/*
2+
* Copyright (c) 2025 Contributors to the Eclipse Foundation
3+
*
4+
* This program and the accompanying materials are made available under the
5+
* terms of the Eclipse Public License v. 2.0, which is available at
6+
* http://www.eclipse.org/legal/epl-2.0.
7+
*
8+
* This Source Code may also be made available under the following Secondary
9+
* Licenses when the conditions for such availability set forth in the
10+
* Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
11+
* version 2 with the GNU Classpath Exception, which is available at
12+
* https://www.gnu.org/software/classpath/license.html.
13+
*
14+
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15+
*/
16+
17+
module org.glassfish.corba.annotation.processing {
18+
19+
requires java.compiler;
20+
requires org.glassfish.pfl.basic;
21+
}

‎exception-annotation-processor/src/main/java/org/glassfish/corba/annotation/processing/ExceptionWrapperProcessor.java‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/*
2+
* Copyright (c) 2025 Contributors to the Eclipse Foundation
23
* Copyright (c) 2018, 2020 Oracle and/or its affiliates.
34
*
45
* This program and the accompanying materials are made available under the
@@ -19,15 +20,22 @@
1920

2021
package org.glassfish.corba.annotation.processing;
2122

22-
import org.glassfish.pfl.basic.logex.ExceptionWrapper;
23-
import org.glassfish.pfl.basic.logex.Message;
23+
import java.io.IOException;
24+
import java.util.Date;
25+
import java.util.HashMap;
26+
import java.util.Map;
27+
import java.util.Set;
2428

25-
import javax.annotation.processing.*;
29+
import javax.annotation.processing.AbstractProcessor;
30+
import javax.annotation.processing.RoundEnvironment;
31+
import javax.annotation.processing.SupportedAnnotationTypes;
32+
import javax.annotation.processing.SupportedSourceVersion;
2633
import javax.lang.model.SourceVersion;
2734
import javax.lang.model.element.Element;
2835
import javax.lang.model.element.TypeElement;
29-
import java.io.IOException;
30-
import java.util.*;
36+
37+
import org.glassfish.pfl.basic.logex.ExceptionWrapper;
38+
import org.glassfish.pfl.basic.logex.Message;
3139

3240
/**
3341
* This class creates properties files for annotated exception interfaces. Applicable interfaces are annotated with the

‎functional-tests/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@
3939
<dependencies>
4040
<dependency>
4141
<groupId>org.glassfish.gmbal</groupId>
42-
<artifactId>gmbal</artifactId>
43-
<version>${gmbal-version}</version>
42+
<artifactId>gmbal-api-only</artifactId>
4443
</dependency>
4544
<dependency>
4645
<groupId>${project.groupId}</groupId>
@@ -97,7 +96,7 @@
9796
<dependency>
9897
<groupId>org.glassfish.external</groupId>
9998
<artifactId>management-api</artifactId>
100-
<version>3.2.3</version>
99+
<version>3.3.0</version>
101100
<scope>test</scope>
102101
</dependency>
103102
<dependency>

‎idlj/src/main/java/module-info.java‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/*
2+
* Copyright (c) 2025 Contributors to the Eclipse Foundation
3+
*
4+
* This program and the accompanying materials are made available under the
5+
* terms of the Eclipse Public License v. 2.0, which is available at
6+
* http://www.eclipse.org/legal/epl-2.0.
7+
*
8+
* This Source Code may also be made available under the following Secondary
9+
* Licenses when the conditions for such availability set forth in the
10+
* Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
11+
* version 2 with the GNU Classpath Exception, which is available at
12+
* https://www.gnu.org/software/classpath/license.html.
13+
*
14+
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15+
*/
16+
17+
module org.glassfish.corba.idl.compiler {
18+
19+
// This module does not export any packages
20+
21+
}

‎internal-api/pom.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@
3535
<dependencies>
3636
<dependency>
3737
<groupId>org.glassfish.gmbal</groupId>
38-
<artifactId>gmbal</artifactId>
39-
<version>${gmbal-version}</version>
38+
<artifactId>gmbal-api-only</artifactId>
4039
</dependency>
4140
<dependency>
4241
<groupId>org.glassfish.pfl</groupId>

‎internal-api/src/main/java/module-info.java‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
/*
2+
* Copyright (c) 2025 Contributors to the Eclipse Foundation
3+
*
4+
* This program and the accompanying materials are made available under the
5+
* terms of the Eclipse Public License v. 2.0, which is available at
6+
* http://www.eclipse.org/legal/epl-2.0.
7+
*
8+
* This Source Code may also be made available under the following Secondary
9+
* Licenses when the conditions for such availability set forth in the
10+
* Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
11+
* version 2 with the GNU Classpath Exception, which is available at
12+
* https://www.gnu.org/software/classpath/license.html.
13+
*
14+
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15+
*/
16+
17+
module org.glassfish.corba.internal {
18+
19+
requires org.glassfish.gmbal.api;
20+
requires org.glassfish.pfl.basic;
21+
22+
exports com.sun.corba.ee.impl.threadpool;
23+
exports com.sun.corba.ee.spi.logex.stdcorba;
24+
exports com.sun.corba.ee.spi.threadpool;
25+
}

‎omgapi/src/main/java/module-info.java‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
/*
2+
* Copyright (c) 2025 Contributors to the Eclipse Foundation
3+
*
4+
* This program and the accompanying materials are made available under the
5+
* terms of the Eclipse Public License v. 2.0, which is available at
6+
* http://www.eclipse.org/legal/epl-2.0.
7+
*
8+
* This Source Code may also be made available under the following Secondary
9+
* Licenses when the conditions for such availability set forth in the
10+
* Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
11+
* version 2 with the GNU Classpath Exception, which is available at
12+
* https://www.gnu.org/software/classpath/license.html.
13+
*
14+
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15+
*/
16+
17+
module org.glassfish.corba.omgapi {
18+
19+
requires java.desktop;
20+
requires java.logging;
21+
requires java.rmi;
22+
23+
exports com.sun.corba.ee.org.omg.CORBA;
24+
exports javax.rmi;
25+
exports javax.rmi.CORBA;
26+
exports org.omg.CORBA;
27+
exports org.omg.CORBA.ContainedPackage;
28+
exports org.omg.CORBA.ContainerPackage;
29+
exports org.omg.CORBA.InterfaceDefPackage;
30+
exports org.omg.CORBA.ValueDefPackage;
31+
exports org.omg.CORBA_2_3;
32+
exports org.omg.CORBA_2_3.portable;
33+
exports org.omg.CORBA.DynAnyPackage;
34+
exports org.omg.CORBA.ORBPackage;
35+
exports org.omg.CORBA.portable;
36+
exports org.omg.CORBA.TSIdentificationPackage;
37+
exports org.omg.CORBA.TypeCodePackage;
38+
exports org.omg.CosNaming;
39+
exports org.omg.CosNaming.NamingContextExtPackage;
40+
exports org.omg.CosNaming.NamingContextPackage;
41+
exports org.omg.CosTransactions;
42+
exports org.omg.CosTSPortability;
43+
exports org.omg.CosTSInteroperation;
44+
exports org.omg.Dynamic;
45+
exports org.omg.DynamicAny;
46+
exports org.omg.DynamicAny.DynAnyFactoryPackage;
47+
exports org.omg.DynamicAny.DynAnyPackage;
48+
exports org.omg.IOP;
49+
exports org.omg.IOP.CodecFactoryPackage;
50+
exports org.omg.IOP.CodecPackage;
51+
exports org.omg.Messaging;
52+
exports org.omg.PortableInterceptor;
53+
exports org.omg.PortableInterceptor.ORBInitInfoPackage;
54+
exports org.omg.PortableServer;
55+
exports org.omg.PortableServer.CurrentPackage;
56+
exports org.omg.PortableServer.POAManagerPackage;
57+
exports org.omg.PortableServer.POAPackage;
58+
exports org.omg.PortableServer.portable;
59+
exports org.omg.PortableServer.ServantLocatorPackage;
60+
exports org.omg.SendingContext;
61+
exports org.omg.SendingContext.CodeBasePackage;
62+
exports org.omg.TimeBase;
63+
exports org.omg.stub.java.rmi;
64+
65+
opens org.omg.CORBA;
66+
}

‎orbmain/pom.xml‎

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,21 +47,14 @@
4747
<artifactId>glassfish-corba-internal-api</artifactId>
4848
<version>${project.version}</version>
4949
</dependency>
50-
<dependency>
51-
<groupId>${project.groupId}</groupId>
52-
<artifactId>exception-annotation-processor</artifactId>
53-
<version>${project.version}</version>
54-
<scope>provided</scope>
55-
</dependency>
5650
<dependency>
5751
<groupId>org.osgi</groupId>
58-
<artifactId>org.osgi.core</artifactId>
59-
<version>6.0.0</version>
52+
<artifactId>osgi.core</artifactId>
53+
<version>8.0.0</version>
6054
</dependency>
6155
<dependency>
6256
<groupId>org.glassfish.gmbal</groupId>
63-
<artifactId>gmbal</artifactId>
64-
<version>${gmbal-version}</version>
57+
<artifactId>gmbal-api-only</artifactId>
6558
</dependency>
6659
<dependency>
6760
<groupId>org.glassfish.pfl</groupId>
@@ -95,10 +88,30 @@
9588
<scope>test</scope>
9689
<optional>true</optional>
9790
</dependency>
91+
<!-- It is used just by compiler, so we need to ensure order of build of modules. -->
92+
<dependency>
93+
<groupId>${project.groupId}</groupId>
94+
<artifactId>exception-annotation-processor</artifactId>
95+
<version>${project.version}</version>
96+
<scope>provided</scope>
97+
<optional>true</optional>
98+
</dependency>
9899
</dependencies>
99100

100101
<build>
101102
<plugins>
103+
<plugin>
104+
<artifactId>maven-compiler-plugin</artifactId>
105+
<configuration>
106+
<annotationProcessorPaths>
107+
<annotationProcessorPath>
108+
<groupId>${project.groupId}</groupId>
109+
<artifactId>exception-annotation-processor</artifactId>
110+
<version>${project.version}</version>
111+
</annotationProcessorPath>
112+
</annotationProcessorPaths>
113+
</configuration>
114+
</plugin>
102115
<plugin>
103116
<groupId>org.apache.felix</groupId>
104117
<artifactId>maven-bundle-plugin</artifactId>

‎orbmain/src/main/java/module-info.java‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
/*
2+
* Copyright (c) 2025 Contributors to the Eclipse Foundation
3+
*
4+
* This program and the accompanying materials are made available under the
5+
* terms of the Eclipse Public License v. 2.0, which is available at
6+
* http://www.eclipse.org/legal/epl-2.0.
7+
*
8+
* This Source Code may also be made available under the following Secondary
9+
* Licenses when the conditions for such availability set forth in the
10+
* Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
11+
* version 2 with the GNU Classpath Exception, which is available at
12+
* https://www.gnu.org/software/classpath/license.html.
13+
*
14+
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15+
*/
16+
17+
module org.glassfish.corba.orb {
18+
19+
requires java.desktop;
20+
requires java.logging;
21+
requires java.naming;
22+
requires java.rmi;
23+
requires java.sql;
24+
25+
requires org.glassfish.corba.internal;
26+
requires org.glassfish.corba.omgapi;
27+
28+
requires org.glassfish.gmbal.api;
29+
30+
requires org.glassfish.pfl.basic;
31+
requires org.glassfish.pfl.dynamic;
32+
requires org.glassfish.pfl.tf;
33+
34+
requires osgi.core;
35+
36+
exports com.sun.corba.ee.impl.javax.rmi;
37+
exports com.sun.corba.ee.impl.javax.rmi.CORBA;
38+
exports com.sun.corba.ee.impl.legacy.connection;
39+
exports com.sun.corba.ee.impl.orb;
40+
exports com.sun.corba.ee.impl.util;
41+
exports com.sun.corba.ee.spi.transport;
42+
43+
opens com.sun.corba.ee.impl.oa.poa;
44+
opens com.sun.corba.ee.impl.oa.toa;
45+
opens com.sun.corba.ee.spi.ior;
46+
opens com.sun.corba.ee.spi.orb;
47+
48+
}

0 commit comments

Comments
 (0)