Skip to content

Commit bc36b96

Browse files
markt-asfmarkt-asf
committed
Align with EL and Pages
1 parent 3db377e commit bc36b96

File tree

4 files changed

+51
-66
lines changed

4 files changed

+51
-66
lines changed

‎api/pom.xml‎

Lines changed: 19 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.eclipse.ee4j</groupId>
2626
<artifactId>project</artifactId>
27-
<version>2.0.0-SNAPSHOT</version>
27+
<version>2.0.0-M1</version>
2828
<relativePath/>
2929
</parent>
3030

@@ -47,7 +47,6 @@
4747
<email>[email protected]</email>
4848
</developer>
4949
</developers>
50-
5150
<contributors>
5251
<contributor>
5352
<name>Jakarta WebSocket Contributors</name>
@@ -79,20 +78,21 @@
7978
</issueManagement>
8079

8180
<properties>
82-
<!-- Make sure the spec version is in sync with the maven version -->
81+
<!-- Timestamp for repeatable builds (more recent than parent) -->
82+
<project.build.outputTimestamp>2025-10-15T00:00:00Z</project.build.outputTimestamp>
83+
<!-- OSGi properties -->
84+
<!-- Make sure the two versions are in sync with the maven version -->
8385
<spec.version>2.3</spec.version>
8486
<bundle.version>${project.version}</bundle.version>
85-
<vendorName>Eclipse Foundation</vendorName>
8687
</properties>
8788

8889
<build>
8990
<pluginManagement>
9091
<plugins>
91-
<!-- Sets minimal Maven version to 3.5.4 -->
92+
<!-- Sets minimal Maven version -->
9293
<plugin>
9394
<groupId>org.apache.maven.plugins</groupId>
9495
<artifactId>maven-enforcer-plugin</artifactId>
95-
<version>3.6.2</version>
9696
<executions>
9797
<execution>
9898
<id>enforce-maven</id>
@@ -102,9 +102,12 @@
102102
<configuration>
103103
<rules>
104104
<requireMavenVersion>
105-
<version>3.5.4</version>
106-
<message>You need Maven 3.5.4 or higher</message>
105+
<version>3.8.6</version>
107106
</requireMavenVersion>
107+
<!-- Plugins used to build spec require Java 21 so use 21 a minimum for all modules -->
108+
<requireJavaVersion>
109+
<version>21</version>
110+
</requireJavaVersion>
108111
</rules>
109112
</configuration>
110113
</execution>
@@ -130,7 +133,7 @@
130133
<version>2.4</version>
131134
<configuration>
132135
<excludeFile>etc/config/copyright-exclude</excludeFile>
133-
<!--svn|mercurial|git - defaults to svn -->
136+
<!-- svn|mercurial|git - defaults to svn -->
134137
<scm>git</scm>
135138
<!-- turn on/off debugging -->
136139
<debug>false</debug>
@@ -154,15 +157,19 @@
154157
<version>6.0.0</version>
155158
<configuration>
156159
<instructions>
157-
<Bundle-Description>Jakarta WebSocket ${spec.version}</Bundle-Description>
158160
<Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
159161
<Bundle-Version>${bundle.version}</Bundle-Version>
162+
<Bundle-Description>Jakarta WebSocket ${spec.version}</Bundle-Description>
160163
<Extension-Name>${extensionName}</Extension-Name>
161164
<Specification-Version>${spec.version}</Specification-Version>
162165
<Specification-Vendor>${vendorName}</Specification-Vendor>
163166
<Implementation-Version>${project.version}</Implementation-Version>
164-
<Implementation-Vendor>${vendorName}</Implementation-Vendor>
167+
<Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
168+
<Implementation-Vendor-Id>org.eclipse</Implementation-Vendor-Id>
165169
<Export-Package>jakarta.websocket.*</Export-Package>
170+
<_removeheaders>Bnd-LastModified</_removeheaders>
171+
<_reproducible>true</_reproducible>
172+
<_removeheaders>Include-Resource</_removeheaders>
166173
</instructions>
167174
</configuration>
168175
<executions>
@@ -178,6 +185,7 @@
178185

179186
<!-- Adds the manifest file created by the org.apache.felix:maven-bundle-plugin -->
180187
<plugin>
188+
<groupId>org.apache.maven.plugins</groupId>
181189
<artifactId>maven-jar-plugin</artifactId>
182190
<version>3.4.2</version>
183191
<configuration>
@@ -249,16 +257,6 @@ Use is subject to <a href="{@docRoot}/doc-files/EFSL.html" target="_top">license
249257
</execution>
250258
</executions>
251259
</plugin>
252-
<plugin>
253-
<groupId>org.sonatype.central</groupId>
254-
<artifactId>central-publishing-maven-plugin</artifactId>
255-
<configuration>
256-
<publishingServerId>central</publishingServerId>
257-
<autoPublish>true</autoPublish>
258-
<waitUntil>published</waitUntil>
259-
<centralSnapshotsUrl>https://central.sonatype.com/repository/maven-snapshots/</centralSnapshotsUrl>
260-
</configuration>
261-
</plugin>
262260
</plugins>
263261
</pluginManagement>
264262
</build>
@@ -268,18 +266,4 @@ Use is subject to <a href="{@docRoot}/doc-files/EFSL.html" target="_top">license
268266
<module>server</module>
269267
</modules>
270268

271-
<!-- Required if parent is a SNAPSHOT -->
272-
<repositories>
273-
<repository>
274-
<name>Central Portal Snapshots</name>
275-
<id>central-portal-snapshots</id>
276-
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
277-
<releases>
278-
<enabled>false</enabled>
279-
</releases>
280-
<snapshots>
281-
<enabled>true</enabled>
282-
</snapshots>
283-
</repository>
284-
</repositories>
285269
</project>

‎pom.xml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2019, 2024 Contributors to the Eclipse Foundation
4+
Copyright (c) 2019, 2025 Contributors to the Eclipse Foundation.
55
All rights reserved.
66
77
This program and the accompanying materials are made available under the
@@ -24,16 +24,19 @@
2424
<parent>
2525
<groupId>org.eclipse.ee4j</groupId>
2626
<artifactId>project</artifactId>
27-
<version>1.0.9</version>
27+
<version>2.0.0-M1</version>
2828
</parent>
2929

3030
<groupId>jakarta.websocket</groupId>
3131
<artifactId>websocket-parent</artifactId>
3232
<version>2.3.0-SNAPSHOT</version>
3333
<packaging>pom</packaging>
3434

35-
<name>Jakarta WebSocket</name>
36-
<description>Jakarta WebSocket</description>
35+
<name>Jakarta WebSocket Parent</name>
36+
<description>
37+
This POM is only used as a convenient way to build each of the modules.
38+
The individual modules do not inherit from this POM.
39+
</description>
3740
<url>https://projects.eclipse.org/projects/ee4j.websocket</url>
3841

3942
<modules>

‎spec/pom.xml‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2019, 2024 Contributors to the Eclipse Foundation.
4+
Copyright (c) 2019, 2025 Contributors to the Eclipse Foundation.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,13 +16,14 @@
1616
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
1717
1818
-->
19+
1920
<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">
2021
<modelVersion>4.0.0</modelVersion>
2122

2223
<parent>
2324
<groupId>org.eclipse.ee4j</groupId>
2425
<artifactId>project</artifactId>
25-
<version>1.0.9</version>
26+
<version>2.0.0-M1</version>
2627
<relativePath/>
2728
</parent>
2829

@@ -35,10 +36,13 @@
3536
<description>Jakarta WebSocket - Specification</description>
3637
<url>https://projects.eclipse.org/projects/ee4j.websocket</url>
3738

39+
<!--
40+
Override the license in the parent POM as specifications all use the EFSL.
41+
-->
3842
<licenses>
3943
<license>
40-
<name>Eclipse Foundation Specification License – v1.0</name>
41-
<url>https://www.eclipse.org/legal/efsl.php</url>
44+
<name>Eclipse Foundation Specification License – v2.0</name>
45+
<url>https://www.eclipse.org/legal/efsl/</url>
4246
<distribution>repo</distribution>
4347
</license>
4448
</licenses>
@@ -51,7 +55,6 @@
5155
<email>[email protected]</email>
5256
</developer>
5357
</developers>
54-
5558
<contributors>
5659
<contributor>
5760
<name>Jakarta WebSocket Contributors</name>
@@ -97,7 +100,7 @@
97100
<build>
98101
<defaultGoal>package</defaultGoal>
99102
<plugins>
100-
<!-- Sets minimal Maven version to 3.5.4 and Java version to 8 -->
103+
<!-- Sets minimal Maven version and Java version-->
101104
<plugin>
102105
<groupId>org.apache.maven.plugins</groupId>
103106
<artifactId>maven-enforcer-plugin</artifactId>
@@ -110,12 +113,11 @@
110113
<configuration>
111114
<rules>
112115
<requireMavenVersion>
113-
<version>3.5.4</version>
114-
<message>You need Maven 3.5.4 or higher</message>
116+
<version>3.8.6</version>
115117
</requireMavenVersion>
118+
<!-- Plugins used to build spec require Java 21 so use 21 a minimum for all modules -->
116119
<requireJavaVersion>
117-
<version>1.8</version>
118-
<message>You need JDK8 or higher</message>
120+
<version>21</version>
119121
</requireJavaVersion>
120122
</rules>
121123
</configuration>
@@ -177,6 +179,8 @@
177179
<sourceDirectory>${basedir}/src/main/asciidoc</sourceDirectory>
178180
<outputFile>${project.build.directory}/generated-docs/jakarta-websocket-spec-${project.version}.html</outputFile>
179181
<attributes>
182+
<source-highlighter>coderay</source-highlighter>
183+
<imagesdir>images</imagesdir>
180184
<doctype>book</doctype>
181185
<docinfo>private-head</docinfo>
182186
<status>${status}</status>
@@ -202,6 +206,8 @@
202206
<sourceDirectory>${basedir}/src/main/asciidoc</sourceDirectory>
203207
<outputFile>${project.build.directory}/generated-docs/jakarta-websocket-spec-${project.version}.pdf</outputFile>
204208
<attributes>
209+
<source-highlighter>coderay</source-highlighter>
210+
<imagesdir>images</imagesdir>
205211
<pdf-stylesdir>${project.basedir}/src/main/theme</pdf-stylesdir>
206212
<pdf-style>jakartaee</pdf-style>
207213
<doctype>book</doctype>
@@ -227,7 +233,6 @@
227233
<revremark>${status}</revremark>
228234
<revdate>${revisiondate}</revdate>
229235
<revyear>${current.year}</revyear>
230-
<source-highlighter>coderay</source-highlighter>
231236
</attributes>
232237
</configuration>
233238
</plugin>

‎tck/pom.xml‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,15 @@
1515
1616
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
1717
18-
--><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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
18+
-->
19+
20+
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
1921
<modelVersion>4.0.0</modelVersion>
2022

2123
<parent>
2224
<groupId>org.eclipse.ee4j</groupId>
2325
<artifactId>project</artifactId>
24-
<version>2.0.0-SNAPSHOT</version>
26+
<version>2.0.0-M1</version>
2527
<relativePath/>
2628
</parent>
2729

@@ -56,6 +58,7 @@
5658
</dependency>
5759
</dependencies>
5860
</dependencyManagement>
61+
5962
<dependencies>
6063
<!-- Jakarta EE dependencies -->
6164
<dependency>
@@ -116,6 +119,10 @@
116119
<requireMavenVersion>
117120
<version>3.8.6</version>
118121
</requireMavenVersion>
122+
<!-- Plugins used to build spec require Java 21 so use 21 a minimum for all modules -->
123+
<requireJavaVersion>
124+
<version>21</version>
125+
</requireJavaVersion>
119126
</rules>
120127
</configuration>
121128
</execution>
@@ -200,18 +207,4 @@
200207
</plugins>
201208
</build>
202209

203-
<!-- Required if parent is a SNAPSHOT and to pick-up API SNAPSHOTs from Central-->
204-
<repositories>
205-
<repository>
206-
<name>Central Portal Snapshots</name>
207-
<id>central-portal-snapshots</id>
208-
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
209-
<releases>
210-
<enabled>false</enabled>
211-
</releases>
212-
<snapshots>
213-
<enabled>true</enabled>
214-
</snapshots>
215-
</repository>
216-
</repositories>
217210
</project>

0 commit comments

Comments
 (0)