Skip to content

Commit

Permalink
[eclipse-ee4j#620]Updated some of the Maven plugins and their corresp…
Browse files Browse the repository at this point in the history 
…onding configurations.

Signed-off-by: Anton Pinsky <anton.pinsky@ionos.com>
  • Loading branch information
@api-from-the-ion
api-from-the-ion committed Oct 23, 2023
1 parent 5703629 commit 38e4808
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 27 deletions.
4 changes: 2 additions & 2 deletions etc/checkstyle.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) 2019, 2022 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2019, 2023 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0 which is available at
Expand Down Expand Up @@ -88,7 +88,7 @@
<!-- Checks for Javadoc comments. -->
<!-- See http://checkstyle.sf.net/config_javadoc.html -->
<module name="JavadocMethod">
<property name="scope" value="protected"/>
<property name="accessModifiers" value="protected"/>
<property name="allowMissingReturnTag" value="true"/>
<property name="allowMissingParamTags" value="true"/>
</module>
Expand Down
53 changes: 28 additions & 25 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,12 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jakarta.json.version>2.1.0</jakarta.json.version>
<jakarta.json.version>2.1.2</jakarta.json.version>
<parson.version>2.1.0</parson.version>
<jakarta.json.bind.version>3.0.0</jakarta.json.bind.version>
<jakarta.enterprise.cdi-api.version>4.0.1</jakarta.enterprise.cdi-api.version>
<netbeans.hint.jdkPlatform>JDK_9</netbeans.hint.jdkPlatform>
<junit.version>5.10.0</junit.version>
</properties>

<dependencyManagement>
Expand All @@ -51,7 +52,7 @@
<dependency>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
<version>5.0.0</version>
<version>5.0.1</version>
</dependency>
<dependency>
<groupId>jakarta.interceptor</groupId>
Expand All @@ -61,7 +62,7 @@
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>2.1.0</version>
<version>2.1.1</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand All @@ -81,7 +82,7 @@
<dependency>
<groupId>org.eclipse.parsson</groupId>
<artifactId>parsson</artifactId>
<version>1.1.0</version>
<version>1.1.4</version>
</dependency>
<!-- Test/Provided dependencies -->
<dependency>
Expand All @@ -93,19 +94,19 @@
<dependency>
<groupId>org.jboss.weld.se</groupId>
<artifactId>weld-se-core</artifactId>
<version>5.0.0.Final</version>
<version>5.1.2.Final</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.8.2</version>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.8.2</version>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -262,7 +263,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.11.0</version>
<executions>
<execution>
<id>default-testCompile</id>
Expand Down Expand Up @@ -345,7 +346,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.4</version>
<version>3.0.5</version>
<configuration>
<effort>Max</effort>
<threshold>Low</threshold>
Expand All @@ -364,12 +365,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0-M3</version>
<version>3.1.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.11.0</version>
<executions>
<execution>
<id>default-compile</id>
Expand Down Expand Up @@ -413,7 +414,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
<version>3.3.0</version>
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
Expand All @@ -427,7 +428,7 @@
<!-- This plugin generates the buildNumber property used in maven-bundle-plugin -->
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>1.4</version>
<version>3.2.0</version>
<configuration>
<format>{0,date,MM/dd/yyyy hh:mm aa}</format>
<items>
Expand All @@ -446,7 +447,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.2.0</version>
<version>3.6.0</version>
<configuration>
<doctitle>Yasson</doctitle>
<sourcepath>${basedir}/src/main/java/org/eclipse/yasson</sourcepath>
Expand All @@ -468,7 +469,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
<version>3.3.0</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -481,7 +482,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.1</version>
<version>5.1.9</version>
<executions>
<execution>
<id>osgi-bundle</id>
Expand Down Expand Up @@ -514,7 +515,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M3</version>
<version>3.1.2</version>
<executions>
<execution>
<id>default-test</id>
Expand All @@ -538,6 +539,9 @@

--add-exports org.eclipse.yasson/org.eclipse.yasson.internal.cdi=java.naming
</argLine>
<!-- because of SUREFIRE-2097, jakarta.enterprise.cdi-api right now lands in module path, and is missing in class path
Could be removed as soo as this is solved and could be configured some other way. Or stay at 3.0.0-M7 -->
<useModulePath>false</useModulePath>
</configuration>
</execution>
<execution>
Expand All @@ -562,7 +566,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M2</version>
<version>3.4.1</version>
<executions>
<execution>
<id>enforce-versions</id>
Expand All @@ -577,7 +581,7 @@
<version>[11,)</version>
</requireJavaVersion>
<requireMavenVersion>
<version>[3.3.9,)</version>
<version>[3.9.4,)</version>
</requireMavenVersion>
<DependencyConvergence/>
</rules>
Expand All @@ -586,7 +590,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version>
<version>3.4.0</version>
<executions>
<execution>
<id>add-resource</id>
Expand All @@ -612,11 +616,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.1.0</version>
<version>3.3.0</version>
<configuration>
<configLocation>etc/checkstyle.xml</configLocation>
<suppressionsLocation>etc/checkstyle-suppressions.xml</suppressionsLocation>
<encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
<linkXRef>false</linkXRef>
Expand All @@ -625,7 +628,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>8.29</version>
<version>10.12.4</version>
<exclusions>
<exclusion>
<groupId>com.sun</groupId>
Expand All @@ -638,7 +641,7 @@
<plugin>
<groupId>org.glassfish.copyright</groupId>
<artifactId>glassfish-copyright-maven-plugin</artifactId>
<version>2.3</version>
<version>2.4</version>
<configuration>
<templateFile>etc/copyright.txt</templateFile>
<excludeFile>etc/copyright-exclude.txt</excludeFile>
Expand Down Expand Up @@ -697,7 +700,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.4</version>
<version>3.0.5</version>
</plugin>
</plugins>
</reporting>
Expand Down
5 changes: 5 additions & 0 deletions src/test/resources/test.policy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,9 @@ grant {
permission "java.util.PropertyPermission" "jsonb.creator-parameters-required", "read";
permission "java.util.PropertyPermission" "yasson.time-in-millis-as-a-string", "read";
permission "java.util.PropertyPermission" "jakarta.json.provider", "read";
permission "java.util.PropertyPermission" "org.eclipse.parsson.maxBigIntegerScale", "read";
permission "java.util.PropertyPermission" "org.eclipse.parsson.maxBigDecimalLength", "read";
permission "java.util.PropertyPermission" "org.eclipse.parsson.maxDepth", "read";
permission "java.util.PropertyPermission" "org.eclipse.parsson.rejectDuplicateKeys", "read";
permission "java.util.PropertyPermission" "jakarta.json.stream.JsonGenerator.prettyPrinting", "read";
};

0 comments on commit 38e4808

Please sign in to comment.