Skip to content

Commit 26c4d96

Browse files
arjantijmsarjantijms
authored
Merge pull request #4973 from arjantijms/update_poms
Update poms
2 parents 08501ae + 1a3e6c9 commit 26c4d96

File tree

8 files changed

+196
-110
lines changed

8 files changed

+196
-110
lines changed

‎action/pom.xml

+21-1
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,41 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
23
4+
Copyright (c) 2021 Contributors to Eclipse Foundation.
5+
6+
This program and the accompanying materials are made available under the
7+
terms of the Eclipse Public License v. 2.0, which is available at
8+
http://www.eclipse.org/legal/epl-2.0.
9+
10+
This Source Code may also be made available under the following Secondary
11+
Licenses when the conditions for such availability set forth in the
12+
Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
13+
version 2 with the GNU Classpath Exception, which is available at
14+
https://www.gnu.org/software/classpath/license.html.
15+
16+
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
17+
18+
-->
319
<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">
420
<modelVersion>4.0.0</modelVersion>
21+
522
<parent>
623
<groupId>org.glassfish</groupId>
724
<artifactId>mojarra-parent</artifactId>
825
<version>4.0.0-SNAPSHOT</version>
926
</parent>
27+
1028
<groupId>org.eclipse.mojarra</groupId>
1129
<artifactId>mojarra-action</artifactId>
1230
<packaging>jar</packaging>
31+
1332
<name>Mojarra ${project.version} - Action</name>
33+
1434
<dependencies>
1535
<dependency>
1636
<groupId>jakarta.enterprise</groupId>
1737
<artifactId>jakarta.enterprise.cdi-api</artifactId>
18-
<version>3.0.0</version>
38+
<version>4.0.0.Alpha2</version>
1939
<scope>provided</scope>
2040
</dependency>
2141
<dependency>

‎cdi/pom.xml

+21-1
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,41 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
23
4+
Copyright (c) 2021 Contributors to Eclipse Foundation.
5+
6+
This program and the accompanying materials are made available under the
7+
terms of the Eclipse Public License v. 2.0, which is available at
8+
http://www.eclipse.org/legal/epl-2.0.
9+
10+
This Source Code may also be made available under the following Secondary
11+
Licenses when the conditions for such availability set forth in the
12+
Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
13+
version 2 with the GNU Classpath Exception, which is available at
14+
https://www.gnu.org/software/classpath/license.html.
15+
16+
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
17+
18+
-->
319
<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">
420
<modelVersion>4.0.0</modelVersion>
21+
522
<parent>
623
<groupId>org.glassfish</groupId>
724
<artifactId>mojarra-parent</artifactId>
825
<version>4.0.0-SNAPSHOT</version>
926
</parent>
27+
1028
<groupId>org.eclipse.mojarra</groupId>
1129
<artifactId>mojarra-cdi</artifactId>
1230
<packaging>jar</packaging>
31+
1332
<name>Mojarra ${project.version} - CDI</name>
33+
1434
<dependencies>
1535
<dependency>
1636
<groupId>jakarta.enterprise</groupId>
1737
<artifactId>jakarta.enterprise.cdi-api</artifactId>
18-
<version>3.0.0</version>
38+
<version>4.0.0.Alpha2</version>
1939
<scope>provided</scope>
2040
</dependency>
2141
<dependency>

‎impl/pom.xml

+57-65
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) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2017, 2021 Oracle and/or its affiliates. All rights reserved.
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
@@ -22,30 +22,29 @@
2222
Project to create the Mojarra implementation jar.
2323
2424
-->
25-
<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>
26-
27-
<parent>
25+
<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">
26+
<modelVersion>4.0.0</modelVersion>
27+
28+
<parent>
2829
<groupId>org.glassfish</groupId>
2930
<artifactId>mojarra-parent</artifactId>
3031
<version>4.0.0-SNAPSHOT</version>
3132
</parent>
32-
33-
<artifactId>jakarta.faces</artifactId>
34-
<packaging>jar</packaging>
35-
36-
<name>Mojarra ${project.version}</name>
37-
<description>EE4J Compatible Implementation for Jakarta Faces API</description>
38-
39-
<properties>
33+
34+
<artifactId>jakarta.faces</artifactId>
35+
<packaging>jar</packaging>
36+
37+
<name>Mojarra ${project.version}</name>
38+
<description>EE4J Compatible Implementation for Jakarta Faces API</description>
39+
40+
<properties>
4041
<maven.compiler.source>11</maven.compiler.source>
4142
<maven.compiler.target>11</maven.compiler.target>
4243
<mojarra.logstrings.version>${project.version}</mojarra.logstrings.version>
4344
</properties>
44-
45-
46-
<!-- ### D E P E N D E N C I E S ### -->
47-
48-
<dependencies>
45+
46+
<!-- ### D E P E N D E N C I E S ### -->
47+
<dependencies>
4948
<!-- Jakarta EE Dependencies -->
5049

5150
<dependency>
@@ -55,7 +54,7 @@
5554
<scope>provided</scope>
5655
</dependency>
5756

58-
<dependency>
57+
<dependency>
5958
<groupId>jakarta.websocket</groupId>
6059
<artifactId>jakarta.websocket-api</artifactId>
6160
<version>2.0.0</version>
@@ -97,7 +96,7 @@
9796
<dependency>
9897
<groupId>jakarta.json</groupId>
9998
<artifactId>jakarta.json-api</artifactId>
100-
<version>2.0.0</version>
99+
<version>2.0.1</version>
101100
<scope>provided</scope>
102101
<optional>true</optional>
103102
</dependency>
@@ -138,7 +137,7 @@
138137
<dependency>
139138
<groupId>org.glassfish</groupId>
140139
<artifactId>jakarta.el</artifactId>
141-
<version>4.0.0</version>
140+
<version>4.0.2</version>
142141
<scope>test</scope>
143142
</dependency>
144143

@@ -177,10 +176,8 @@
177176
<scope>test</scope>
178177
</dependency>
179178
</dependencies>
180-
181-
182-
183-
<build>
179+
180+
<build>
184181
<resources>
185182
<resource>
186183
<directory>src/main/resources</directory>
@@ -201,8 +198,37 @@
201198
</includes>
202199
</resource>
203200
</resources>
204-
205-
201+
<pluginManagement>
202+
<plugins>
203+
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
204+
<plugin>
205+
<groupId>org.eclipse.m2e</groupId>
206+
<artifactId>lifecycle-mapping</artifactId>
207+
<version>1.0.0</version>
208+
<configuration>
209+
<lifecycleMappingMetadata>
210+
<pluginExecutions>
211+
<pluginExecution>
212+
<pluginExecutionFilter>
213+
<groupId>net.alchim31.maven</groupId>
214+
<artifactId>yuicompressor-maven-plugin</artifactId>
215+
<versionRange>[1.5,)</versionRange>
216+
<goals>
217+
<goal>compress</goal>
218+
</goals>
219+
</pluginExecutionFilter>
220+
<action>
221+
<execute>
222+
<runOnIncremental>false</runOnIncremental>
223+
</execute>
224+
</action>
225+
</pluginExecution>
226+
</pluginExecutions>
227+
</lifecycleMappingMetadata>
228+
</configuration>
229+
</plugin>
230+
</plugins>
231+
</pluginManagement>
206232
<plugins>
207233

208234
<!-- ### C O M P R E S S / M I N I F Y faces.js ### -->
@@ -243,7 +269,7 @@
243269
<plugin>
244270
<groupId>org.codehaus.mojo</groupId>
245271
<artifactId>build-helper-maven-plugin</artifactId>
246-
<version>3.0.0</version>
272+
<version>3.1.0</version>
247273
<executions>
248274
<execution>
249275
<id>generate-resources</id>
@@ -277,7 +303,7 @@
277303
<plugin>
278304
<groupId>org.apache.felix</groupId>
279305
<artifactId>maven-bundle-plugin</artifactId>
280-
<version>5.1.1</version>
306+
<version>5.1.2</version>
281307
<extensions>true</extensions>
282308
<executions>
283309
<execution>
@@ -293,10 +319,10 @@
293319
<Bundle-SymbolicName>org.glassfish.jakarta.faces</Bundle-SymbolicName>
294320
<Bundle-Version>${project.version}</Bundle-Version>
295321
<Bundle-Name>Mojarra Faces Implementation ${project.version}</Bundle-Name>
296-
<Bundle-Description>Eclipse Faces Implementation (jakarta.faces/3.0) ${project.version}</Bundle-Description>
322+
<Bundle-Description>Eclipse Faces Implementation (jakarta.faces/4.0) ${project.version}</Bundle-Description>
297323

298324
<Specification-Title>Jakarta Server Faces</Specification-Title>
299-
<Specification-Version>3.0</Specification-Version>
325+
<Specification-Version>4.0</Specification-Version>
300326

301327
<Implementation-Title>Mojarra</Implementation-Title>
302328
<Implementation-Version>${project.version}</Implementation-Version>
@@ -361,7 +387,7 @@
361387
<plugin>
362388
<groupId>org.apache.maven.plugins</groupId>
363389
<artifactId>maven-jar-plugin</artifactId>
364-
<version>2.4</version>
390+
<version>3.2.0</version>
365391
<configuration>
366392
<archive>
367393
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
@@ -408,39 +434,5 @@
408434
</executions>
409435
</plugin>
410436
</plugins>
411-
412-
413-
<pluginManagement>
414-
<plugins>
415-
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
416-
<plugin>
417-
<groupId>org.eclipse.m2e</groupId>
418-
<artifactId>lifecycle-mapping</artifactId>
419-
<version>1.0.0</version>
420-
<configuration>
421-
<lifecycleMappingMetadata>
422-
<pluginExecutions>
423-
<pluginExecution>
424-
<pluginExecutionFilter>
425-
<groupId>net.alchim31.maven</groupId>
426-
<artifactId>yuicompressor-maven-plugin</artifactId>
427-
<versionRange>[1.5,)</versionRange>
428-
<goals>
429-
<goal>compress</goal>
430-
</goals>
431-
</pluginExecutionFilter>
432-
<action>
433-
<execute>
434-
<runOnIncremental>false</runOnIncremental>
435-
</execute>
436-
</action>
437-
</pluginExecution>
438-
</pluginExecutions>
439-
</lifecycleMappingMetadata>
440-
</configuration>
441-
</plugin>
442-
</plugins>
443-
</pluginManagement>
444437
</build>
445-
446438
</project>

0 commit comments

Comments
 (0)