Skip to content

Commit

Permalink
Add module-info and remove automatic module name from manifest
Browse files Browse the repository at this point in the history
  • Loading branch information
markt-asf committed Nov 2, 2021
1 parent a335fcf commit a3ceedd
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 3 deletions.
3 changes: 0 additions & 3 deletions api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,6 @@
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
<manifestEntries>
<Automatic-Module-Name>jakarta.el</Automatic-Module-Name>
</manifestEntries>
</archive>
<excludes>
<exclude>**/*.java</exclude>
Expand Down
20 changes: 20 additions & 0 deletions api/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/*
* Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
* http://www.eclipse.org/legal/epl-2.0.
*
* This Source Code may also be made available under the following Secondary
* Licenses when the conditions for such availability set forth in the
* Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
* version 2 with the GNU Classpath Exception, which is available at
* https://www.gnu.org/software/classpath/license.html.
*
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
module jakarta.el {
exports jakarta.el;

requires transitive java.desktop;
}
2 changes: 2 additions & 0 deletions spec/src/main/asciidoc/ELSpec.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -3011,6 +3011,8 @@ This appendix is non-normative.
* https://github.com/eclipse-ee4j/el-ri/issues/172[#172]
Add support for coercing arrays.

* Add a JPMS module descriptor that defines the module name as `jakarta.el`.

=== Changes between 4.0 and JSR 341

* The API has moved from the `javax.el` package to the `jakarta.el`
Expand Down

0 comments on commit a3ceedd

Please sign in to comment.