Modernizing poms Assisted-by: IBM Bob 2.0.2
diff --git a/.gitignore b/.gitignore index 998689f..5a92901 100644 --- a/.gitignore +++ b/.gitignore
@@ -1,5 +1,6 @@ # Maven noise target/ +.flattened-pom.xml # OSX noise .DS_Store
diff --git a/api/pom.xml b/api/pom.xml index 6f6496e..14f5725 100644 --- a/api/pom.xml +++ b/api/pom.xml
@@ -23,7 +23,7 @@ <parent> <groupId>org.eclipse.ee4j</groupId> <artifactId>project</artifactId> - <version>1.0.8</version> + <version>1.0.9</version> <relativePath/> </parent> @@ -103,7 +103,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>3.4.0</version> + <version>3.6.0</version> </plugin> <plugin> <groupId>org.glassfish.copyright</groupId> @@ -113,12 +113,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.11.0</version> + <version>3.13.0</version> </plugin> <plugin> <groupId>org.glassfish.build</groupId> <artifactId>spec-version-maven-plugin</artifactId> - <version>2.1</version> + <version>2.2</version> </plugin> <plugin> <groupId>org.apache.felix</groupId> @@ -133,22 +133,22 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>3.3.0</version> + <version>3.4.2</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> - <version>3.3.0</version> + <version>3.3.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>3.5.0</version> + <version>3.7.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>3.4.0</version> + <version>3.5.0</version> </plugin> <plugin> <groupId>com.github.spotbugs</groupId> @@ -159,6 +159,11 @@ <threshold>${spotbugs.threshold}</threshold> </configuration> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>flatten-maven-plugin</artifactId> + <version>1.6.0</version> + </plugin> </plugins> </pluginManagement> @@ -289,11 +294,7 @@ <execution> <goals> <goal>set-spec-properties</goal> - <!-- TODO: - glassfish-spec-version-maven-plugin needs to be updated - in order to check 'jakarta.' prefixed values in manifest entries - --> - <!--<goal>check-module</goal>--> + <goal>check-module</goal> </goals> </execution> </executions> @@ -397,6 +398,29 @@ <failThreshold>High</failThreshold> </configuration> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>flatten-maven-plugin</artifactId> + <executions> + <execution> + <id>flatten</id> + <phase>process-resources</phase> + <goals> + <goal>flatten</goal> + </goals> + <configuration> + <flattenMode>ossrh</flattenMode> + </configuration> + </execution> + <execution> + <id>flatten.clean</id> + <phase>clean</phase> + <goals> + <goal>clean</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build>
diff --git a/spec/pom.xml b/spec/pom.xml index 6b6c3b7..6f2f171 100644 --- a/spec/pom.xml +++ b/spec/pom.xml
@@ -20,7 +20,7 @@ <parent> <groupId>org.eclipse.ee4j</groupId> <artifactId>project</artifactId> - <version>1.0.6</version> + <version>1.0.9</version> <relativePath/> </parent> <modelVersion>4.0.0</modelVersion>
diff --git a/tck/pom.xml b/tck/pom.xml index faa26c0..02147de 100644 --- a/tck/pom.xml +++ b/tck/pom.xml
@@ -22,7 +22,7 @@ <parent> <groupId>org.eclipse.ee4j</groupId> <artifactId>project</artifactId> - <version>1.0.7</version> + <version>1.0.9</version> <relativePath/> </parent> @@ -57,9 +57,8 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <maven.compiler.target>17</maven.compiler.target> - <maven.compiler.source>17</maven.compiler.source> - <junit.jupiter.version>5.7.2</junit.jupiter.version> + <maven.compiler.release>17</maven.compiler.release> + <junit.jupiter.version>5.14.4</junit.jupiter.version> <jakarta.json-api.version>2.2.0</jakarta.json-api.version> @@ -102,14 +101,11 @@ <version>${jakarta.json-api.version}</version> </dependency> <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-api</artifactId> + <groupId>org.junit</groupId> + <artifactId>junit-bom</artifactId> <version>${junit.jupiter.version}</version> - </dependency> - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-engine</artifactId> - <version>${junit.jupiter.version}</version> + <type>pom</type> + <scope>import</scope> </dependency> </dependencies> </dependencyManagement> @@ -136,17 +132,22 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>3.3.0</version> + <version>3.7.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>3.3.1</version> + <version>3.7.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>3.4.0</version> + <version>3.5.0</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>3.7.0</version> </plugin> </plugins> </pluginManagement> @@ -214,8 +215,6 @@ <includes>**/*.class,**/*.xml</includes> </artifactItem> </artifactItems> - <includes>**/*.java</includes> - <excludes>**/*.properties</excludes> </configuration> </execution> </executions>