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

Jump to bottom

JBTM-3750 upgrade openjdk-orb to 9.0.1.Final (get rid of Jakarta transformation) #2088

Merged
merged 1 commit into from
Feb 10, 2023
Merged

JBTM-3750 upgrade openjdk-orb to 9.0.1.Final (get rid of Jakarta transformation) #2088

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions ArjunaJTS/idl/idlj-openjdk/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@
<dependencies>
<dependency>
<groupId>org.jboss.openjdk-orb</groupId>
<artifactId>openjdk-orb-jakarta</artifactId>
<artifactId>openjdk-orb</artifactId>
<version>${version.org.jboss.openjdk-orb}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.openjdk-orb</groupId>
<artifactId>openjdk-orb-jakarta</artifactId>
<artifactId>openjdk-orb</artifactId>
<version>${version.org.jboss.openjdk-orb}</version>
<classifier>sources</classifier>
<scope>provided</scope>
Expand Down Expand Up @@ -133,7 +133,7 @@
<artifactItems>
<artifactItem>
<groupId>org.jboss.openjdk-orb</groupId>
<artifactId>openjdk-orb-jakarta</artifactId>
<artifactId>openjdk-orb</artifactId>
<classifier>sources</classifier>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
<includes>**/*.idl</includes>
Expand Down
2 changes: 1 addition & 1 deletion ArjunaJTS/jtax/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@
</dependency>
<dependency>
<groupId>org.jboss.openjdk-orb</groupId>
<artifactId>openjdk-orb-jakarta</artifactId>
<artifactId>openjdk-orb</artifactId>
<version>${version.org.jboss.openjdk-orb}</version>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ArjunaJTS/jts/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@
</dependency>
<dependency>
<groupId>org.jboss.openjdk-orb</groupId>
<artifactId>openjdk-orb-jakarta</artifactId>
<artifactId>openjdk-orb</artifactId>
<version>${version.org.jboss.openjdk-orb}</version>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions ArjunaJTS/orbportability/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
</dependency>
<dependency>
<groupId>org.jboss.openjdk-orb</groupId>
<artifactId>openjdk-orb-jakarta</artifactId>
<artifactId>openjdk-orb</artifactId>
<version>${version.org.jboss.openjdk-orb}</version>
<scope>test</scope>
</dependency>
Expand Down Expand Up @@ -158,7 +158,7 @@
<dependencies>
<dependency>
<groupId>org.jboss.openjdk-orb</groupId>
<artifactId>openjdk-orb-jakarta</artifactId>
<artifactId>openjdk-orb</artifactId>
<version>${version.org.jboss.openjdk-orb}</version>
<scope>provided</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@
<version.org.jboss.logging.jboss-logging>3.5.0.Final</version.org.jboss.logging.jboss-logging>
<version.org.jboss.logging.jboss-logging-processor>2.2.1.Final</version.org.jboss.logging.jboss-logging-processor>
<version.org.jboss.logmanager>1.5.1.Final</version.org.jboss.logmanager>
<version.org.jboss.openjdk-orb>8.1.9.Final</version.org.jboss.openjdk-orb>
<version.org.jboss.openjdk-orb>9.0.1.Final</version.org.jboss.openjdk-orb>
<version.org.jboss.resteasy>6.2.2.Final</version.org.jboss.resteasy>
<version.org.jboss.weld>5.0.1.Final</version.org.jboss.weld>
<version.org.jboss.ws>2.0.0.Final</version.org.jboss.ws>
Expand Down
4 changes: 2 additions & 2 deletions qa/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@
</dependency>
<dependency>
<groupId>org.jboss.openjdk-orb</groupId>
<artifactId>openjdk-orb-jakarta</artifactId>
<artifactId>openjdk-orb</artifactId>
<version>${version.org.jboss.openjdk-orb}</version>
</dependency>
<dependency>
<groupId>org.jboss.openjdk-orb</groupId>
<artifactId>openjdk-orb-jakarta</artifactId>
<artifactId>openjdk-orb</artifactId>
<version>${version.org.jboss.openjdk-orb}</version>
<classifier>sources</classifier>
</dependency>
Expand Down
10 changes: 5 additions & 5 deletions qa/tests/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
<if>
<equals arg1="${orbtype}" arg2="openjdk"/>
<then>
<unzip src="${external.libraries}/openjdk-orb-jakarta-sources.jar"
dest="${external.libraries}/lib/openjdk-orb-jakarta-sources">
<unzip src="${external.libraries}/openjdk-orb-sources.jar"
dest="${external.libraries}/lib/openjdk-orb-sources">
<patternset>
<include name="**/*.idl"/>
</patternset>
Expand All @@ -59,9 +59,9 @@
</unzip>
<property name="org.jboss.jbossts.qa.orb.home" value="ext"/>
<property name="org.jboss.jbossts.qa.orb.classpath"
value="${external.libraries}/openjdk-orb-jakarta.jar;${external.libraries}/openjdk-orb-jakarta-sources.jar"/>
value="${external.libraries}/openjdk-orb.jar;${external.libraries}/openjdk-orb-sources.jar"/>
<property name="idl.params"
value="include='${external.libraries}/lib/openjdk-orb-jakarta-sources/com/sun/tools/corba/se/idl;${external.libraries}/lib/idlj-idl-openjdk-sources/idl/omg;${external.libraries}/lib/idlj-idl-openjdk-sources/idl/arjuna',classpath='${org.jboss.jbossts.qa.orb.classpath}'"/>
value="include='${external.libraries}/lib/openjdk-orb-sources/com/sun/tools/corba/se/idl;${external.libraries}/lib/idlj-idl-openjdk-sources/idl/omg;${external.libraries}/lib/idlj-idl-openjdk-sources/idl/arjuna',classpath='${org.jboss.jbossts.qa.orb.classpath}'"/>

<property name="is.sunorb" value="1"/>
</then>
Expand All @@ -79,7 +79,7 @@
<include name="narayana-jts-idlj.jar"/>
<include name="jakarta.transaction-api.jar"/>
<include name="jboss-logging.jar"/>
<include name="openjdk-orb-jakarta.jar" if="is.sunorb"/>
<include name="openjdk-orb.jar" if="is.sunorb"/>
</fileset>
<pathelement path="${org.jboss.jbossts.qa.orb.classpath}"/>
<pathelement location="${external.libraries}/orbportability.jar"/>
Expand Down