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

Add changes to compile product with Java17 #285

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Add changes to compile product with Java17 #285

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
4 changes: 2 additions & 2 deletions modules/all/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@
!javax.xml.ws.*; version=1.0.0,
org.apache.axiom.*; version="${axiom.version}",
org.apache.neethi.*; version="${neethi.version}",
javax.servlet; version=2.4.0,
javax.servlet.http; version=2.4.0,
javax.servlet; version=[3.1.0, 4.0.0),
javax.servlet.http; version=[3.1.0, 4.0.0),
javax.xml.stream.*; version="1.0.1",
javax.mail.*; version="1.4.0",
javax.wsdl.*; version="1.6.2",
Expand Down
29 changes: 27 additions & 2 deletions modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ClassReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,16 @@ public class ClassReader extends ByteArrayInputStream {
private static final int CONSTANT_Double = 6;
private static final int CONSTANT_NameAndType = 12;
private static final int CONSTANT_Utf8 = 1;

/*java 8 9 10 11 new tokens https://docs.oracle.com/javase/specs/jvms/se11/html/jvms-4.html*/
private static final int CONSTANT_MethodHandle = 15;
private static final int CONSTANT_MethodType = 16;
private static final int CONSTANT_Dynamic = 17;
private static final int CONSTANT_InvokeDynamic = 18;
private static final int CONSTANT_Module = 19;
private static final int CONSTANT_Package = 20;
/*end of ava 8 9 10 11 new tokens*/

/**
* the constant pool. constant pool indices in the class file
* directly index into this array. The value stored in this array
Expand Down Expand Up @@ -348,10 +358,25 @@ protected final void readCpool() throws IOException {
int len = readShort();
skipFully(len);
break;

case CONSTANT_MethodHandle:
read(); // reference kind
readShort(); // reference index
break;
case CONSTANT_MethodType:
readShort(); // descriptor index
break;
case CONSTANT_Dynamic:
readShort(); // bootstrap method attr index
readShort(); // name and type index
break;
case CONSTANT_InvokeDynamic:
readShort(); // bootstrap method attr index
readShort(); // name and type index
break;
default:
// corrupt class file
throw new IllegalStateException("Error looking for paramter names in bytecode: unexpected bytes in file");
throw new IllegalStateException(
"Error looking for parameter names in bytecode: unexpected bytes in file, tag:" + c);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions modules/osgi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@
!org.apache.axis2.*,
javax.ws.rs; version=1.0,
javax.xml.namespace; version=0.0.0,
javax.servlet; version=2.4.0,
javax.servlet.http; version=2.4.0,
javax.servlet; version=[3.1.0, 4.0.0),
javax.servlet.http; version=[3.1.0, 4.0.0),
javax.transaction,
org.apache.commons.io,
org.osgi.framework; version=1.6.0,
Expand Down
2 changes: 1 addition & 1 deletion orbit/axis2-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@
<imp.pkg.version.axiom>[1.2.11, 1.3.0)</imp.pkg.version.axiom>
<exp.pkg.version.neethi>2.0.4.wso2v5</exp.pkg.version.neethi>
<imp.pkg.version.neethi>[2.0.4.wso2v4, 3.0.0)</imp.pkg.version.neethi>
<imp.pkg.version.javax.servlet>[2.6.0, 3.0.0)</imp.pkg.version.javax.servlet>
<imp.pkg.version.javax.servlet>[3.1.0, 4.0.0)</imp.pkg.version.javax.servlet>
<securevault.version>1.1.2</securevault.version>
<orbit.version.commons.fileuploader>1.3.1.wso2v1</orbit.version.commons.fileuploader>
<orbit.version.spring>3.1.0.wso2v3</orbit.version.spring>
Expand Down
5 changes: 4 additions & 1 deletion orbit/axis2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,6 +569,9 @@
xmlbeans;scope=compile|runtime;inline=false;
</Embed-Dependency>
<DynamicImport-Package>*</DynamicImport-Package>
<Provide-Capability>
osgi.service;objectClass=org.apache.axis2.engine.ListenerManager
</Provide-Capability>
</instructions>
</configuration>
</plugin>
Expand All @@ -586,7 +589,7 @@
<exp.pkg.version.axis2>${version.axis2}</exp.pkg.version.axis2>
<imp.pkg.version.axiom>[1.2.11, 1.3.0)</imp.pkg.version.axiom>
<imp.pkg.version.neethi>[2.0.4.wso2v4, 3.0.0)</imp.pkg.version.neethi>
<imp.pkg.version.javax.servlet>[2.6.0, 3.0.0)</imp.pkg.version.javax.servlet>
<imp.pkg.version.javax.servlet>[3.1.0, 4.0.0)</imp.pkg.version.javax.servlet>
<version.apache.felix.framework>1.4.0</version.apache.felix.framework>
<xmlbeans.version>3.1.0</xmlbeans.version>
<orbit.version.neethi>2.0.4.wso2v5</orbit.version.neethi>
Expand Down