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

[APIM] Add changes to provide support for building the API manager product with JDK 17 #1127

Closed
wants to merge 2 commits into from
Closed

[APIM] Add changes to provide support for building the API manager product with JDK 17 #1127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bcd6df2
Add changes to compile the product in Java17
madurangasiriwardena Mar 20, 2024
dc7ecfa
Add changes for https://github.com/wso2/api-manager/issues/2943
YasasRangika Jul 3, 2024
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 abdera/1.0.0.wso2v4/META-INF/services/org.apache.abdera.factory.ExtensionFactory
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.wso2.carbon.registry.app.PropertyExtensionFactory
121 changes: 121 additions & 0 deletions abdera/1.0.0.wso2v4/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
<!--
~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
~
~ WSO2 Inc. licenses this file to you under the Apache License,
~ Version 2.0 (the "License"); you may not use this file except
~ in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

<!-- <parent>-->
<!-- <groupId>org.wso2.carbon</groupId>-->
<!-- <artifactId>orbit-parent</artifactId>-->
<!-- <version>4.0.0</version>-->
<!-- <relativePath>../../pom.xml</relativePath>-->
<!-- </parent>-->

<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.abdera.wso2</groupId>
<artifactId>abdera</artifactId>
<packaging>bundle</packaging>
<name>abdera.wso2</name>
<version>1.0.0.wso2v4</version>
<description>
org.wso2.carbon.abdera. This bundle will represent abdera
</description>
<url>http://wso2.org</url>

<dependencies>
<dependency>
<groupId>org.apache.abdera</groupId>
<artifactId>abdera-client</artifactId>
<version>${version.abdera}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.abdera</groupId>
<artifactId>abdera-core</artifactId>
<version>${version.abdera}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.abdera</groupId>
<artifactId>abdera-parser</artifactId>
<version>${version.abdera}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.abdera</groupId>
<artifactId>abdera-server</artifactId>
<version>${version.abdera}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.abdera</groupId>
<artifactId>abdera-i18n</artifactId>
<version>${version.abdera}</version>
<optional>true</optional>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-Name>${pom.artifactId}</Bundle-Name>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Export-Package>org.apache.abdera.*;-split-package:=merge-first</Export-Package>
<Private-Package>
</Private-Package>
<Import-Package>
javax.xml.stream.*;version="1.0.1",
javax.activation.*;version="[0.0.0, 2.0.0)",
*;resolution:=optional
</Import-Package>
<Include-Resource>
META-INF/services/org.apache.abdera.factory.ExtensionFactory=META-INF/services/org.apache.abdera.factory.ExtensionFactory,
@abdera-core-${version.abdera}.jar!/META-INF/services/org.apache.abdera.factory.ExtensionFactory.example,
@abdera-core-${version.abdera}.jar!/abderamessages.properties,
@abdera-parser-${version.abdera}.jar!/META-INF/services/org.apache.abdera.writer.NamedWriter
</Include-Resource>
<DynamicImport-Package>*</DynamicImport-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>

<properties>
<version.abdera>1.0-wso2v2</version.abdera>
</properties>

<repositories>
<repository>
<id>wso2-nexus</id>
<name>WSO2 internal Repository</name>
<url>https://maven.wso2.org/nexus/content/groups/wso2-public/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<checksumPolicy>ignore</checksumPolicy>
</releases>
</repository>
</repositories>
</project>
94 changes: 94 additions & 0 deletions commons-fileupload/1.5.0.wso2v3/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
<!--
Copyright © 2023 WSO2 LLC. (http://www.wso2.com).

WSO2 LLC. licenses this file to you under the Apache License,
Version 2.0 (the "License"); you may not use this file except
in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.orbit.commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<packaging>bundle</packaging>
<name>commons-fileupload orbit bundle</name>
<version>1.5.0.wso2v3</version>
<description>
org.wso2.carbon.commons.fileupload. This bundle will export packages from
commons-fileupload.jar
</description>
<url>http://wso2.org</url>

<distributionManagement>
<repository>
<id>wso2.releases</id>
<name>WSO2 internal Repository</name>
<url>https://maven.wso2.org/nexus/content/repositories/releases/</url>
</repository>

<snapshotRepository>
<id>wso2.snapshots</id>
<name>Apache Snapshot Repository</name>
<url>https://maven.wso2.org/nexus/content/repositories/snapshots/</url>
</snapshotRepository>
</distributionManagement>

<dependencies>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>${version.commons.fileupload}</version>
<optional>true</optional>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-Vendor>WSO2, Inc.</Bundle-Vendor>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Export-Package>
org.apache.commons.fileupload.*;version="${version.commons.fileupload}"
</Export-Package>
<Import-Package>
!org.apache.commons.fileupload.*,
javax.servlet; version="${imp.pkg.version.javax.servlet}",
javax.servlet.http;version="${imp.pkg.version.javax.servlet}",
org.apache.commons.io;version="${org.apache.commons.io.version}",
org.apache.commons.io.output;version="${org.apache.commons.io.version}"
</Import-Package>
<DynamicImport-Package>
javax.portlet
</DynamicImport-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>

<properties>
<org.apache.commons.io.version>[2.0, 3.0)</org.apache.commons.io.version>
<imp.pkg.version.javax.servlet>[3.1.0, 4.0.0)</imp.pkg.version.javax.servlet>
<version.commons.fileupload>1.5</version.commons.fileupload>
</properties>

</project>
91 changes: 91 additions & 0 deletions csrfguard/3.1.0.wso2v5/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (c) 2021, WSO2 Inc. (http://wso2.com) All Rights Reserved.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

<parent>
<groupId>org.wso2</groupId>
<artifactId>wso2</artifactId>
<version>1</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.orbit.org.owasp</groupId>
<artifactId>csrfguard</artifactId>
<packaging>bundle</packaging>
<name>org.owasp.csrfguard</name>
<version>3.1.0.wso2v5</version>
<description>
This bundle will export packages from owasp csrfguard
</description>
<url>http://wso2.org</url>

<dependencies>
<dependency>
<groupId>org.wso2.org.owasp</groupId>
<artifactId>csrfguard</artifactId>
<version>${version.csrfguard}</version>
<optional>true</optional>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Export-Package>
org.owasp.csrfguard.*;version="${project.version}"
</Export-Package>
<Import-Package>
!org.owasp.csrfguardorg.*,
javax.servlet.jsp.*; version="${javax.servlet.jsp.version}",
javax.servlet.*;version="${javax.servlet.version}"
</Import-Package>
<Private-Package>
</Private-Package>
<Include-Resource>
@csrfguard-${version.csrfguard}.jar
</Include-Resource>
</instructions>
</configuration>
</plugin>
</plugins>
</build>

<properties>
<version.csrfguard>3.1.0-wso2v2</version.csrfguard>
<javax.servlet.version>[3.0.0,4.0.0)</javax.servlet.version>
<javax.servlet.jsp.version>[2.3.0,2.4.0)</javax.servlet.jsp.version>
</properties>

<distributionManagement>
<repository>
<id>wso2.releases</id>
<name>WSO2 internal Repository</name>
<url>https://maven.wso2.org/nexus/content/repositories/releases/</url>
</repository>
</distributionManagement>

</project>
86 changes: 86 additions & 0 deletions encoder/1.2.0.wso2v3/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
~
~ WSO2 Inc. licenses this file to you under the Apache License,
~ Version 2.0 (the "License"); you may not use this file except
~ in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.orbit.org.owasp.encoder</groupId>
<artifactId>encoder</artifactId>
<packaging>bundle</packaging>
<name>OWASP Java Encoder</name>
<version>${encoder.orbit.version}</version>
<description>A custom bundle that wraps OWASP Java Encoder</description>
<url>http://www.wso2.com</url>

<dependencies>
<dependency>
<groupId>org.owasp.encoder</groupId>
<artifactId>encoder</artifactId>
<version>${encoder.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.owasp.encoder</groupId>
<artifactId>encoder-jsp</artifactId>
<version>${encoder.version}</version>
<optional>true</optional>
</dependency>
</dependencies>

<distributionManagement>
<repository>
<id>wso2.releases</id>
<name>WSO2 internal Repository</name>
<url>https://maven.wso2.org/nexus/content/repositories/releases/</url>
</repository>
</distributionManagement>

<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.3.7</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Export-Package>
org.owasp.encoder; version="${encoder.orbit.version}",
org.owasp.encoder.tag; version="${encoder.orbit.version}",
</Export-Package>
<Import-Package>
javax.servlet.jsp; version="${jsp-api.imp.pkg.version.range}";resolution:=optional,
javax.servlet.jsp.tagext; version="${jsp-api.imp.pkg.version.range}";resolution:=optional,
</Import-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>

<properties>
<encoder.version>1.2</encoder.version>
<encoder.orbit.version>1.2.0.wso2v3</encoder.orbit.version>
<jsp-api.imp.pkg.version.range>[2.3.0, 2.4.0)</jsp-api.imp.pkg.version.range>
</properties>
</project>
Loading