Skip to content

Commit

Permalink
Review WebSocket vs EL vs JSP specs and align all three
Browse files Browse the repository at this point in the history
  • Loading branch information
markt-asf committed Feb 6, 2020
1 parent 90e62f6 commit fb729fb
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 12 deletions.
2 changes: 1 addition & 1 deletion spec/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Jakarta Server Pages Specification
============================
==================================

This project generates the Jakarta Server Pages Specification.

Expand Down
25 changes: 16 additions & 9 deletions spec/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2019 Contributors to the Eclipse Foundation.
Copyright (c) 2019, 2020 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
Expand All @@ -17,16 +17,23 @@
-->
<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>

<parent>
<groupId>org.eclipse.ee4j.jsp</groupId>
<artifactId>jsp-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.5</version>
<relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>

<groupId>jakarta.el</groupId>
<artifactId>server-pages-spec</artifactId>
<version>3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Jakarta Server Pages Specification</name>
<description>Jakarta Server Pages - Specification</description>
<url>https://projects.eclipse.org/projects/ee4j.jsp</url>

<properties>
<site.output.dir>${project.build.directory}/staging</site.output.dir>
Expand All @@ -47,7 +54,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.4.1</version>
<version>3.0.0-M3</version>
<executions>
<execution>
<id>enforce-versions</id>
Expand All @@ -57,8 +64,8 @@
<configuration>
<rules>
<requireJavaVersion>
<version>[1.8.0,1.9.0)</version>
<message>You need JDK8 or lower</message>
<version>[1.8.0,)</version>
<message>You need JDK8 or higher</message>
</requireJavaVersion>
</rules>
</configuration>
Expand Down Expand Up @@ -147,8 +154,8 @@
<revdate>${revisiondate}</revdate>
</attributes>
</configuration>

</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions spec/src/main/asciidoc/license-efsl.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ document, or portions thereof, that you use:
* All existing copyright notices, or if one does not exist, a notice
(hypertext is preferred, but a textual representation is permitted)
of the form: "Copyright (c) [$date-of-document]
Eclipse Foundation, Inc. <<url to this license>>"
Eclipse Foundation, Inc. \<<url to this license>>"

Inclusion of the full text of this NOTICE must be provided. We
request that authorship attribution be provided in any software,
Expand Down Expand Up @@ -76,4 +76,4 @@ The name and trademarks of the copyright holders or the Eclipse
Foundation may NOT be used in advertising or publicity pertaining to
this document or its contents without specific, written prior
permission. Title to copyright in this document will at all times
remain with copyright holders.
remain with copyright holders.

0 comments on commit fb729fb

Please sign in to comment.