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

Add changes to provide support for building the API manager product with JDK 17 #13510

Open
wants to merge 1 commit into
base: master-JDK17
Choose a base branch
from
Open

Add changes to provide support for building the API manager product with JDK 17 #13510

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
1 change: 1 addition & 0 deletions modules/features/product/org.wso2.am.multitenancy.dashboard.ui.feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
<plugin>
<groupId>org.wso2.maven</groupId>
<artifactId>carbon-p2-plugin</artifactId>
<extensions>true</extensions>
<executions>
<execution>
<id>4-p2-feature-generation</id>
Expand Down
1 change: 1 addition & 0 deletions modules/features/product/org.wso2.am.security.feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
<plugin>
<groupId>org.wso2.maven</groupId>
<artifactId>carbon-p2-plugin</artifactId>
<extensions>true</extensions>
<executions>
<execution>
<id>4-p2-feature-generation</id>
Expand Down
1 change: 1 addition & 0 deletions modules/features/product/org.wso2.am.styles.feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
<plugin>
<groupId>org.wso2.maven</groupId>
<artifactId>carbon-p2-plugin</artifactId>
<extensions>true</extensions>
<executions>
<execution>
<id>4-p2-feature-generation</id>
Expand Down
3 changes: 2 additions & 1 deletion modules/features/product/org.wso2.carbon.identity.local.auth.api.endpoint.feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,8 @@
<plugin>
<groupId>org.wso2.maven</groupId>
<artifactId>carbon-p2-plugin</artifactId>
<version>1.5.3</version>
<extensions>true</extensions>
<version>${carbon.p2.plugin.version}</version>
<executions>
<execution>
<id>p2-feature-generation</id>
Expand Down
1 change: 1 addition & 0 deletions modules/features/service/org.wso2.stratos.apimgt.dashboard.ui.feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
<plugin>
<groupId>org.wso2.maven</groupId>
<artifactId>carbon-p2-plugin</artifactId>
<extensions>true</extensions>
<executions>
<execution>
<id>p2-feature-generation</id>
Expand Down
1 change: 1 addition & 0 deletions modules/features/service/org.wso2.stratos.apimgt.login.ui.feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
<plugin>
<groupId>org.wso2.maven</groupId>
<artifactId>carbon-p2-plugin</artifactId>
<extensions>true</extensions>
<executions>
<execution>
<id>p2-feature-generation</id>
Expand Down
1 change: 1 addition & 0 deletions modules/features/service/org.wso2.stratos.apimgt.styles.feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
<plugin>
<groupId>org.wso2.maven</groupId>
<artifactId>carbon-p2-plugin</artifactId>
<extensions>true</extensions>
<executions>
<execution>
<id>p2-feature-generation</id>
Expand Down
1 change: 1 addition & 0 deletions modules/features/service/org.wso2.stratos.apimgt.utils.feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
<plugin>
<groupId>org.wso2.maven</groupId>
<artifactId>carbon-p2-plugin</artifactId>
<extensions>true</extensions>
<executions>
<execution>
<id>p2-feature-generation</id>
Expand Down
1 change: 1 addition & 0 deletions modules/is-km/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<plugin>
<groupId>org.wso2.maven</groupId>
<artifactId>carbon-p2-plugin</artifactId>
<extensions>true</extensions>
<executions>
<execution>
<id>feature-install</id>
Expand Down
2 changes: 1 addition & 1 deletion modules/org.wso2.stratos.apimgt.login.ui/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.equinox</groupId>
<groupId>org.eclipse.platform</groupId>
<artifactId>javax.servlet</artifactId>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion modules/p2-profile/product/carbon.product
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ version="4.9.26" useFeatures="true" includeLaunchers="true">
</plugins>

<features>
<feature id="org.wso2.carbon.core.runtime" version="4.9.26"/>
<feature id="org.wso2.carbon.core.runtime" version="4.9.27.SNAPSHOT"/>
</features>

<configurations>
Expand Down
1 change: 1 addition & 0 deletions modules/p2-profile/product/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
<plugin>
<groupId>org.wso2.maven</groupId>
<artifactId>carbon-p2-plugin</artifactId>
<extensions>true</extensions>
<executions>
<execution>
<id>2-p2-repo-generation</id>
Expand Down
8 changes: 4 additions & 4 deletions modules/styles/service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,17 +78,17 @@
</dependency>

<dependency>
<groupId>org.eclipse.equinox</groupId>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.http.servlet</artifactId>
</dependency>

<dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.http.helper</artifactId>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.http.service.api</artifactId>
</dependency>

<dependency>
<groupId>org.eclipse.equinox</groupId>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.jsp.jasper</artifactId>
</dependency>

Expand Down
73 changes: 37 additions & 36 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@
<plugin>
<groupId>org.wso2.maven</groupId>
<artifactId>carbon-p2-plugin</artifactId>
<extensions>true</extensions>
<version>${carbon.p2.plugin.version}</version>
</plugin>
<plugin>
Expand All @@ -156,7 +157,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>3.2.0</version>
<version>5.1.9</version>
<extensions>true</extensions>
<configuration>
<obrRepository>NONE</obrRepository>
Expand Down Expand Up @@ -187,7 +188,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven.javadoc.plugin.version}</version>
<configuration>
<source>1.8</source>
<source>17</source>
<attach>true</attach>
<additionalJOption>-Xdoclint:none</additionalJOption>
</configuration>
Expand Down Expand Up @@ -234,22 +235,22 @@
</dependency>

<dependency>
<groupId>org.eclipse.osgi</groupId>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<version>${version.equinox.osgi}</version>
</dependency>
<dependency>
<groupId>org.eclipse.equinox</groupId>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.jsp.jasper</artifactId>
<version>${version.equinox.jsp.jasper}</version>
</dependency>
<dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.http.helper</artifactId>
<version>${version.equinox.http.helper}</version>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.http.service.api</artifactId>
<version>${version.equinox.http.service.api}</version>
</dependency>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi.services</artifactId>
<version>${version.equinox.osgi.services}</version>
</dependency>
Expand Down Expand Up @@ -332,7 +333,7 @@
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.equinox</groupId>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.http.servlet</artifactId>
<version>${version.equinox.http.servlet}</version>
</dependency>
Expand Down Expand Up @@ -1281,42 +1282,42 @@

<project.scm.id>scm-server</project.scm.id>

<carbon.analytics.common.version>5.3.11</carbon.analytics.common.version>
<carbon.analytics.common.version>5.3.14-SNAPSHOT</carbon.analytics.common.version>

<!-- APIM Portals Component Version -->
<carbon.apimgt.ui.version>9.1.83</carbon.apimgt.ui.version>

<!-- APIM Component Version -->
<carbon.apimgt.version>9.29.142</carbon.apimgt.version>
<carbon.apimgt.version>9.29.144-SNAPSHOT</carbon.apimgt.version>

<carbon.apimgt.imp.pkg.version>[9.0.0, 10.0.0)</carbon.apimgt.imp.pkg.version>

<!-- Carbon Registry -->
<carbon.registry.version>4.8.32</carbon.registry.version>
<carbon.registry.version>4.8.36-SNAPSHOT</carbon.registry.version>
<carbon.registry.package.import.version.range>[4.7.0, 5.0.0)</carbon.registry.package.import.version.range>


<!-- Carbon Governance -->
<carbon.governance.version>4.8.33</carbon.governance.version>
<carbon.governance.version>4.8.34-SNAPSHOT</carbon.governance.version>

<!--carbon versions-->
<carbon.kernel.version>4.9.26</carbon.kernel.version>
<carbon.kernel.version>4.9.27-SNAPSHOT</carbon.kernel.version>
<apimserver.version>4.3.0-SNAPSHOT</apimserver.version>

<cipher.tool.version>1.1.23</cipher.tool.version>

<carbon.commons.version>4.9.11</carbon.commons.version>
<carbon.commons.version>4.9.12-SNAPSHOT</carbon.commons.version>
<carbon.kernel.imp.pkg.version>[4.5.0, 5.0.0)</carbon.kernel.imp.pkg.version>

<!-- carbon mediation -->
<carbon.mediation.version>4.7.204</carbon.mediation.version>
<carbon.mediation.version>4.7.210-SNAPSHOT</carbon.mediation.version>

<!-- carbon identity -->
<carbon.identity.version>5.25.705</carbon.identity.version>
<carbon.identity.governance.version>1.8.107</carbon.identity.governance.version>
<carbon.identity.event.handler.account.lock.version>1.8.14</carbon.identity.event.handler.account.lock.version>
<carbon.identity.event.handler.notification.version>1.7.33</carbon.identity.event.handler.notification.version>
<carbon.identity-inbound-auth-oauth.version>6.13.16</carbon.identity-inbound-auth-oauth.version>
<carbon.identity.version>5.25.707-SNAPSHOT</carbon.identity.version>
<carbon.identity.governance.version>1.9.17-SNAPSHOT</carbon.identity.governance.version>
<carbon.identity.event.handler.account.lock.version>1.8.15-SNAPSHOT</carbon.identity.event.handler.account.lock.version>
<carbon.identity.event.handler.notification.version>1.7.34-SNAPSHOT</carbon.identity.event.handler.notification.version>
<carbon.identity-inbound-auth-oauth.version>6.13.18-SNAPSHOT</carbon.identity-inbound-auth-oauth.version>
<carbon.identity-data-publisher-oauth.version>1.6.10</carbon.identity-data-publisher-oauth.version>
<carbon.identity-user-ws.version>5.7.5</carbon.identity-user-ws.version>
<carbon.identity-inbound-auth-openid.version>5.9.9</carbon.identity-inbound-auth-openid.version>
Expand All @@ -1326,7 +1327,7 @@
<carbon.identity-metadata-saml2.version>1.7.70</carbon.identity-metadata-saml2.version>
<carbon.identity-data-publisher-application-authentication.version>5.6.8</carbon.identity-data-publisher-application-authentication.version>
<carbon.extension.identity.oauth2.grantType.jwt.version>2.2.4</carbon.extension.identity.oauth2.grantType.jwt.version>
<carbon.identity.carbon.auth.saml2.version>5.8.7</carbon.identity.carbon.auth.saml2.version>
<carbon.identity.carbon.auth.saml2.version>5.8.8-SNAPSHOT</carbon.identity.carbon.auth.saml2.version>
<carbon.identity.auth.version>1.8.41</carbon.identity.auth.version>
<identity.apps.version>1.6.378</identity.apps.version>
<identity.oauth.addons.version>2.4.38</identity.oauth.addons.version>
Expand All @@ -1343,7 +1344,7 @@

<siddhi.version>3.2.13</siddhi.version>

<axis2-transports.wso2.version>2.0.0-wso2v42</axis2-transports.wso2.version>
<axis2-transports.wso2.version>2.0.0-wso2v70-SNAPSHOT</axis2-transports.wso2.version>
<cxf-bundle.version>2.6.1.wso2v2</cxf-bundle.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<log4j.version>1.2.17</log4j.version>
Expand All @@ -1355,7 +1356,7 @@
<woden.version>1.0.0.M8-wso2v1</woden.version>
<synapse.version>4.0.0-wso2v105</synapse.version>
<passthru.transport.patch.version>1.0.2</passthru.transport.patch.version>
<axis2.wso2.version>1.6.1-wso2v98</axis2.wso2.version>
<axis2.wso2.version>1.6.1-wso2v98-SNAPSHOT</axis2.wso2.version>
<axiom.wso2.version>1.2.11-wso2v29</axiom.wso2.version>
<servlet-api.version>2.5</servlet-api.version>
<log4j.version>1.2.13</log4j.version>
Expand All @@ -1374,19 +1375,19 @@
<bcprov.jdk13.version>140</bcprov.jdk13.version>
<bcprov.jdk15.version>132</bcprov.jdk15.version>
<version.javax.servlet.jsp>2.2.0.v201112011158</version.javax.servlet.jsp>
<version.equinox.osgi>3.8.1.v20120830-144521</version.equinox.osgi>
<version.equinox.jsp.jasper>1.0.400.v20130327-1442</version.equinox.jsp.jasper>
<version.equinox.http.helper>1.1.0.wso2v1</version.equinox.http.helper>
<version.equinox.osgi.services>3.3.100.v20120522-1822</version.equinox.osgi.services>
<version.equinox.http.servlet>1.1.300.v20120522-1841</version.equinox.http.servlet>
<carbon.p2.plugin.version>5.1.2</carbon.p2.plugin.version>
<version.equinox.osgi>3.19.0</version.equinox.osgi>
<version.equinox.jsp.jasper>1.2.0</version.equinox.jsp.jasper>
<version.equinox.http.service.api>1.2.2</version.equinox.http.service.api>
<version.equinox.osgi.services>3.12.0</version.equinox.osgi.services>
<version.equinox.http.servlet>1.8.100</version.equinox.http.servlet>
<carbon.p2.plugin.version>5.2.50-SNAPSHOT</carbon.p2.plugin.version>
<orbit.version.jettison>1.3.4.wso2v1</orbit.version.jettison>
<emma.version>2.1.5320</emma.version>
<javax.ws.rs-api.version>2.1.1</javax.ws.rs-api.version>
<javax.annotation-api.version>1.2</javax.annotation-api.version>
<waffle-jna.version>1.6.wso2v6</waffle-jna.version>
<version.org.wso2.orbit.javax.xml.bind>2.3.1.wso2v1</version.org.wso2.orbit.javax.xml.bind>
<opensaml2.wso2.version>3.3.1.wso2v11</opensaml2.wso2.version>
<opensaml2.wso2.version>3.3.1.wso2v12</opensaml2.wso2.version>
<transport.http.netty.version>6.3.51</transport.http.netty.version>

<imp.pkg.version.javax.servlet>[2.6.0, 3.0.0)</imp.pkg.version.javax.servlet>
Expand Down Expand Up @@ -1422,7 +1423,7 @@
<!-- MB Features -->

<carbon.messaging.version>3.3.33</carbon.messaging.version>
<carbon.event-processing.version>2.3.10</carbon.event-processing.version>
<carbon.event-processing.version>2.3.13-SNAPSHOT</carbon.event-processing.version>
<andes.version>3.3.32</andes.version>
<orbit.version.geronimo-jms_1.1_spec>1.1.1.wso2v1</orbit.version.geronimo-jms_1.1_spec>
<commons-digester.version>1.8.1</commons-digester.version>
Expand Down Expand Up @@ -1464,7 +1465,7 @@
<diagnostics.tool.version>1.0.16</diagnostics.tool.version>

<!-- Authenticator Properties -->
<identity.outbound.auth.oidc.version>5.11.34</identity.outbound.auth.oidc.version>
<identity.outbound.auth.oidc.version>5.11.35-SNAPSHOT</identity.outbound.auth.oidc.version>
<swagger-parser-version>2.0.14</swagger-parser-version>
<nimbus.jwt.version>7.3.0.wso2v1</nimbus.jwt.version>
<json-smart.version>2.5.0</json-smart.version>
Expand All @@ -1473,8 +1474,8 @@

<!-- WSDL4J dependencies -->
<wsdl4j.version>1.6.3.wso2v3</wsdl4j.version>
<wso2is.km.version>1.7.8</wso2is.km.version>
<wso2is7.km.version>2.0.2</wso2is7.km.version>
<wso2is.km.version>1.7.10-SNAPSHOT</wso2is.km.version>
<wso2is7.km.version>2.0.3-SNAPSHOT</wso2is7.km.version>
<okta.keymanager.feature.version>3.2.1</okta.keymanager.feature.version>
<azure.keymanager.feature.version>1.0.9</azure.keymanager.feature.version>
<keycloak.keymanager.feature.version>2.1.1</keycloak.keymanager.feature.version>
Expand All @@ -1490,7 +1491,7 @@
<com.squareup.okhttp3.version>4.9.0</com.squareup.okhttp3.version>
<io.gsonfire.version>1.8.3</io.gsonfire.version>
<org.apache.oltu.oauth2.version>1.0.1</org.apache.oltu.oauth2.version>
<identity.org.mgt.version>1.3.153</identity.org.mgt.version>
<identity.org.mgt.version>1.3.154-SNAPSHOT</identity.org.mgt.version>
<identity.org.mgt.core.version>1.0.99</identity.org.mgt.core.version>
<identity.inbound.provisioning.scim2.version>3.1.1</identity.inbound.provisioning.scim2.version>
<xmlsec.wso2.version>1.5.6-wso2v1</xmlsec.wso2.version>
Expand Down