Skip to content

Commit

Permalink
Prepare for version 4.1.0 depending on EE 11 M1
Browse files Browse the repository at this point in the history 
Signed-off-by: Arjan Tijms <arjan.tijms@omnifish.ee>
  • Loading branch information
@arjantijms
arjantijms committed Dec 22, 2023
1 parent cc2e8b2 commit 6a0daf7
Show file tree
Hide file tree
Showing 9 changed files with 92 additions and 125 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ target/
.vscode/
.idea
nb-configuration.xml
/.flattened-pom.xml
1 change: 1 addition & 0 deletions jsft/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/.flattened-pom.xml
4 changes: 2 additions & 2 deletions jsft/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2022 Contributors to the Eclipse Foundation. All rights reserved.
Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation.
Copyright (c) 2014, 2022 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
Expand All @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.jsftemplating</groupId>
<artifactId>jsftemplating-parent</artifactId>
<version>4.0.3-SNAPSHOT</version>
<version>4.1.0-SNAPSHOT</version>
</parent>

<artifactId>jsft</artifactId>
Expand Down
1 change: 1 addition & 0 deletions jsftemplating-dt/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/.flattened-pom.xml
3 changes: 2 additions & 1 deletion jsftemplating-dt/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation.
Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
Expand All @@ -23,7 +24,7 @@
<parent>
<groupId>org.glassfish.jsftemplating</groupId>
<artifactId>jsftemplating-parent</artifactId>
<version>4.0.3-SNAPSHOT</version>
<version>4.1.0-SNAPSHOT</version>
</parent>

<artifactId>jsftemplating-dt</artifactId>
Expand Down
1 change: 1 addition & 0 deletions jsftemplating/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/.flattened-pom.xml
24 changes: 0 additions & 24 deletions jsftemplating/faces-config.NavData
View file

This file was deleted.

7 changes: 4 additions & 3 deletions jsftemplating/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation.
Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
Expand All @@ -23,7 +24,7 @@
<parent>
<groupId>org.glassfish.jsftemplating</groupId>
<artifactId>jsftemplating-parent</artifactId>
<version>4.0.3-SNAPSHOT</version>
<version>4.1.0-SNAPSHOT</version>
</parent>

<artifactId>jsftemplating</artifactId>
Expand Down Expand Up @@ -73,8 +74,8 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.9.5</version>
<artifactId>mockito-core</artifactId>
<version>5.8.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
175 changes: 80 additions & 95 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2022 Contributors to the Eclipse Foundation. All rights reserved.
Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation. All rights reserved.
Copyright (c) 2014, 2018 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
Expand All @@ -24,13 +24,13 @@
<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.6</version>
<version>1.0.9</version>
<relativePath />
</parent>

<groupId>org.glassfish.jsftemplating</groupId>
<artifactId>jsftemplating-parent</artifactId>
<version>4.0.3-SNAPSHOT</version>
<version>4.1.0-SNAPSHOT</version>
<packaging>pom</packaging>

<description>JSFTemplating is to work with Jakarta Faces technology to make building pages and components easier. It is used to define the layout of an example component.</description>
Expand Down Expand Up @@ -75,38 +75,35 @@
</issueManagement>

<properties>
<jdk.version>11.0.0</jdk.version>
<mvn.version>3.0.3</mvn.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<javadoc.options>-Xdoclint:none</javadoc.options>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>6.0.0</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.faces</artifactId>
<version>4.0.0</version>
<version>6.1.0-M1</version>
</dependency>
<dependency>
<groupId>jakarta.faces</groupId>
<artifactId>jakarta.faces-api</artifactId>
<version>4.0.1</version>
<version>4.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.faces</artifactId>
<version>4.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
<version>5.0.1</version>
<version>6.0.0-M1</version>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<version>4.0.1</version>
<version>4.1.0-M1</version>
</dependency>
<dependency>
<groupId>com.sun.woodstock.dependlibs</groupId>
Expand All @@ -116,7 +113,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -125,11 +122,9 @@
<build>
<pluginManagement>
<plugins>
<!-- Sets minimal Maven version to 3.5.4 -->
<!-- Sets minimal Maven version to 3.6.0 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M3</version>
<executions>
<execution>
<id>enforce-maven</id>
Expand All @@ -139,67 +134,19 @@
<configuration>
<rules>
<requireMavenVersion>
<version>3.5.4</version>
<version>3.6.0</version>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>

<!-- Restricts the Java version to 1.8 -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>11</source>
<target>11</target>
<compilerArgument>-Xlint:unchecked</compilerArgument>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.4.1</version>
<configuration>
<source>11</source>
<quiet>true</quiet>
<detectJavaApiLink>false</detectJavaApiLink>
<doclint>none</doclint>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<configuration>
<includePom>true</includePom>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.0.0-M1</version>
<configuration>
<retryFailedDeploymentCount>10</retryFailedDeploymentCount>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.2</version>
<configuration>
<skip>true</skip>
<skipDeploy>true</skipDeploy>
</configuration>
</plugin>

<!-- Creates the OSGi MANIFEST.MF file -->
<!-- Generate the OSGi jar Manifest. -->
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.1</version>
<version>5.1.9</version>
<configuration>
<instructions>
<!-- By default, we don't export anything. -->
Expand All @@ -208,6 +155,8 @@
<!-- Read all the configuration from osgi.bundle file, if it exists. See Felix-699 to find out
why we use ${basedir}. -->
<_include>-${basedir}/osgi.bundle</_include>
<_noimportjava>true</_noimportjava>
<_runee>JavaSE-17</_runee>
</instructions>
</configuration>
</plugin>
Expand All @@ -216,22 +165,44 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.0</version>
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>

<!--
Create Javadoc for Impl jar
-->
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<quiet>true</quiet>
<detectJavaApiLink>false</detectJavaApiLink>
<doclint>none</doclint>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<configuration>
<includePom>true</includePom>
</configuration>
</plugin>

<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.1.2</version>
<version>3.6.1</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M4</version>
<version>3.2.2</version>
<configuration>
<forkCount>0</forkCount>
<systemPropertyVariables>
Expand All @@ -244,30 +215,17 @@
</pluginManagement>

<plugins>
<!-- Restricts the Java version to 17 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-versions</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireJavaVersion>
<version>[${jdk.version},)</version>
<message>You need JDK ${jdk.version} and above!</message>
</requireJavaVersion>
<requireMavenVersion>
<version>[${mvn.version},)</version>
<message>You need Maven ${mvn.version} or above!</message>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<source>17</source>
<target>17</target>
<compilerArgument>-Xlint:unchecked</compilerArgument>
</configuration>
</plugin>

<plugin>
<groupId>org.glassfish.hk2</groupId>
<artifactId>osgiversion-maven-plugin</artifactId>
Expand All @@ -286,6 +244,33 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.5.0</version>
<configuration>
<flattenMode>ossrh</flattenMode>
</configuration>
<executions>
<!-- enable flattening -->
<execution>
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
</execution>
<!-- ensure proper cleanup -->
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

0 comments on commit 6a0daf7

Please sign in to comment.