Skip to content

Commit

Permalink
Align POMs with EL and JSP
Browse files Browse the repository at this point in the history 
Signed-off-by: Mark Thomas <markt@apache.org>
  • Loading branch information
@markt-asf
markt-asf committed Jul 3, 2020
1 parent 50bf811 commit 99fc346
Show file tree
Hide file tree
Showing 2 changed files with 86 additions and 82 deletions.
36 changes: 3 additions & 33 deletions pom.xml
View file
Expand Up @@ -27,48 +27,18 @@
<version>1.0.6</version>
</parent>

<groupId>org.eclipse.ee4j.websocket</groupId>
<groupId>jakarta.websocket</groupId>
<artifactId>websocket-parent</artifactId>
<packaging>pom</packaging>
<version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Jakarta WebSocket</name>
<description>Jakarta WebSocket</description>
<url>https://projects.eclipse.org/projects/ee4j.websocket</url>

<inceptionYear>2012</inceptionYear>

<scm>
<connection>scm:git:https://github.com/eclipse-ee4j/websocket-api</connection>
<developerConnection>scm:git:ssh://git@github.com/eclipse-ee4j/websocket-api</developerConnection>
<url>https://github.com/eclipse-ee4j/websocket-api</url>
<tag>1.1</tag>
</scm>

<properties>
<api_package>jakarta.websocket</api_package>
<spec_version>2.0</spec_version>
<!--<spec_build>02</spec_build>-->
<new_spec_version>2.0</new_spec_version>
<spec_impl_version>2.0.0</spec_impl_version>
<packages.export>jakarta.websocket.*</packages.export>
</properties>

<modules>
<module>api</module>
<module>spec</module>
</modules>

<licenses>
<license>
<name>Eclipse Public License 2.0</name>
<url>https://projects.eclipse.org/license/epl-2.0</url>
<distribution>repo</distribution>
</license>
<license>
<name>GNU General Public License, version 2 with the GNU Classpath Exception</name>
<url>https://projects.eclipse.org/license/secondary-gpl-2.0-cp</url>
<distribution>repo</distribution>
</license>
</licenses>

</project>
132 changes: 83 additions & 49 deletions spec/pom.xml
View file
Expand Up @@ -16,8 +16,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
<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">

<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
Expand All @@ -31,17 +30,65 @@
<artifactId>websocket-spec</artifactId>
<version>2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Jakarta WebSocket - Specification</name>

<name>Jakarta WebSocket Specification</name>
<description>Jakarta WebSocket - Specification</description>
<url>https://projects.eclipse.org/projects/ee4j.websocket</url>

<licenses>
<license>
<name>Eclipse Foundation Specification License – v1.0</name>
<url>https://www.eclipse.org/legal/efsl.php</url>
<distribution>repo</distribution>
</license>
</licenses>

<developers>
<developer>
<id>jakarta-ee4j-websocket</id>
<name>Jakarta WebSocket Developers</name>
<organization>Eclipse Foundation</organization>
<email>websocket-dev@eclipse.org</email>
</developer>
</developers>

<contributors>
<contributor>
<name>Jakarta WebSocket Contributors</name>
<email>websocket-dev@eclipse.org</email>
<url>https://github.com/eclipse-ee4j/websocket-api/graphs/contributors</url>
</contributor>
</contributors>

<mailingLists>
<mailingList>
<name>WebSocket dev mailing list</name>
<post>websocket-dev@eclipse.org</post>
<subscribe>https://dev.eclipse.org/mailman/listinfo/websocket-dev</subscribe>
<unsubscribe>https://dev.eclipse.org/mailman/listinfo/websocket-dev</unsubscribe>
<archive>https://dev.eclipse.org/mhonarc/lists/websocket-dev</archive>
</mailingList>
</mailingLists>

<scm>
<connection>scm:git:https://github.com/eclipse-ee4j/websocket-api.git</connection>
<developerConnection>scm:git:ssh://git@github.com/eclipse-ee4j/websocket-api.git</developerConnection>
<url>https://github.com/eclipse-ee4j/websocket-api</url>
<tag>HEAD</tag>
</scm>

<issueManagement>
<system>github</system>
<url>https://github.com/eclipse-ee4j/websocket-api/issues</url>
</issueManagement>

<properties>
<site.output.dir>${project.build.directory}/staging</site.output.dir>
<maven.site.skip>true</maven.site.skip>
<asciidoctor.maven.plugin.version>1.5.7.1</asciidoctor.maven.plugin.version>
<asciidoctorj.version>1.6.2</asciidoctorj.version>
<asciidoctorj.pdf.version>1.5.0-alpha.16</asciidoctorj.pdf.version>
<jruby.version>9.2.6.0</jruby.version>
<asciidoctor.maven.plugin.version>2.0.0-RC.1</asciidoctor.maven.plugin.version>
<asciidoctorj.version>2.2.0</asciidoctorj.version>
<asciidoctorj.pdf.version>1.5.3</asciidoctorj.pdf.version>
<jruby.version>9.2.11.1</jruby.version>
<!-- status: DRAFT, BETA, etc., or blank for final -->
<status>DRAFT</status>
<maven.build.timestamp.format>MMMM dd, yyyy</maven.build.timestamp.format>
Expand All @@ -51,46 +98,53 @@
<build>
<defaultGoal>package</defaultGoal>
<plugins>
<!-- Sets minimal Maven version to 3.5.4 and Java version to 8 -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.1.0</version>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M3</version>
<executions>
<execution>
<id>timestamp-property</id>
<id>enforce</id>
<goals>
<goal>timestamp-property</goal>
<goal>enforce</goal>
</goals>
<phase>validate</phase>
<configuration>
<name>current.year</name>
<pattern>yyyy</pattern>
<locale>en_US</locale>
<rules>
<requireMavenVersion>
<version>3.5.4</version>
<message>You need Maven 3.5.4 or higher</message>
</requireMavenVersion>
<requireJavaVersion>
<version>1.8</version>
<message>You need JDK8 or higher</message>
</requireJavaVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M3</version>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>enforce-versions</id>
<id>timestamp-property</id>
<goals>
<goal>enforce</goal>
<goal>timestamp-property</goal>
</goals>
<phase>validate</phase>
<configuration>
<rules>
<requireJavaVersion>
<version>[1.8.0,)</version>
<message>You need JDK8 or higher</message>
</requireJavaVersion>
</rules>
<name>current.year</name>
<pattern>yyyy</pattern>
<locale>en_US</locale>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
Expand Down Expand Up @@ -175,32 +229,12 @@
</attributes>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.2</version>
<configuration>
<mavenExecutorId>forked-path</mavenExecutorId>
<useReleaseProfile>false</useReleaseProfile>
<arguments>${release.arguments}</arguments>
</configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-gitexe</artifactId>
<version>1.9.4</version>
</dependency>
</dependencies>
</plugin>

<!--
This is the rule that builds the zip file for download.
-->
<!-- This is the rule that builds the zip file for download. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.1</version>
<version>3.2.0</version>
<inherited>false</inherited>
<executions>
<execution>
Expand Down

0 comments on commit 99fc346

Please sign in to comment.