Merge pull request eclipse-ee4j#5367 from senivam/30_merged

merge of the actual 2.x into the 3.0 branch
senivam · Jul 18, 2023 · d06b586 · d06b586
2 parents 672cbec + 9977a25
commit d06b586
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 23 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022 Contributors to the Eclipse Foundation
+# Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,11 +29,11 @@ jobs:
 
     steps:
     - name: Checkout for build
-      uses: actions/checkout@v2.3.4
+      uses: actions/checkout@v3
       with:
         fetch-depth: 0
     - name: Set up JDK
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         distribution: 'zulu'
         java-version: ${{ matrix.java_version }}
@@ -42,4 +42,9 @@ jobs:
         secLoc=`find $JAVA_HOME -name java.security`
         sed -i 's/jdk.tls.disabledAlgorithms/# jdk.tls.disabledAlgorithms/g' -i $secLoc
     - name: Build
-      run: mvn -V -U -B ${{matrix.verify_profiles}} org.eclipse.dash:license-tool-plugin:license-check -DexcludeArtifactIds=bsh,jmh-core,jmh-generator-annprocess,swing-layout
+      run: mvn -V -U -B ${{matrix.verify_profiles}} org.eclipse.dash:license-tool-plugin:license-check -DexcludeArtifactIds=bsh,jmh-core,jmh-generator-annprocess,swing-layout
+    - name: Upload license-check info
+      uses: actions/upload-artifact@v3
+      with:
+        name: license-summary.txt
+        path: target/dash/summary
diff --git a/archetypes/jersey-example-java8-webapp/src/main/resources/archetype-resources/pom.xml b/archetypes/jersey-example-java8-webapp/src/main/resources/archetype-resources/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2015, 2022 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2015, 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
@@ -98,6 +98,11 @@
                     <war>${project.build.directory}/${project.build.finalName}.war</war>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>${war.mvn.plugin.version}</version>
+            </plugin>
         </plugins>
     </build>
 
@@ -122,5 +127,6 @@
     <properties>
         <java.version>1.8</java.version>
         <jersey.config.test.container.port>8080</jersey.config.test.container.port>
+        <war.mvn.plugin.version>3.4.0</war.mvn.plugin.version>
     </properties>
 </project>
diff --git a/archetypes/jersey-heroku-webapp/src/main/resources/archetype-resources/pom.xml b/archetypes/jersey-heroku-webapp/src/main/resources/archetype-resources/pom.xml
@@ -107,6 +107,11 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${surefire.mvn.plugin.version}</version>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>${war.mvn.plugin.version}</version>
+            </plugin>
         </plugins>
     </build>
 
@@ -115,5 +120,6 @@
         <jetty.version>11.0.15</jetty.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <surefire.mvn.plugin.version>3.1.2</surefire.mvn.plugin.version>
+        <war.mvn.plugin.version>3.4.0</war.mvn.plugin.version>
     </properties>
 </project>
diff --git a/archetypes/jersey-quickstart-webapp/src/main/resources/archetype-resources/pom.xml b/archetypes/jersey-quickstart-webapp/src/main/resources/archetype-resources/pom.xml
@@ -22,6 +22,11 @@
                     <target>1.8</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>${war.mvn.plugin.version}</version>
+            </plugin>
         </plugins>
     </build>
 
@@ -58,5 +63,6 @@
     <properties>
         <jersey.version>${project.version}</jersey.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <war.mvn.plugin.version>3.4.0</war.mvn.plugin.version>
     </properties>
 </project>
diff --git a/core-common/src/main/java/org/glassfish/jersey/internal/PropertiesResolver.java b/core-common/src/main/java/org/glassfish/jersey/internal/PropertiesResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 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
@@ -84,16 +84,15 @@ public <T> T resolveProperty(String name, T defaultValue) {
             }
 
             private <T> T resolveProperty(final String name, Object defaultValue, final Class<T> type) {
-                // Check runtime configuration first
-                Object result = configuration.getProperty(name);
-                if (result != null) {
-                    defaultValue = result;
-                }
-
-                // Check request properties next
-                result = delegate.getProperty(name);
+                // Check request properties property
+                Object result = delegate.getProperty(name);
                 if (result == null) {
-                    result = defaultValue;
+
+                    // Check runtime configuration next
+                    result = configuration.getProperty(name);
+                    if (result == null) {
+                        result = defaultValue;
+                    }
                 }
 
                 return (result == null) ? null : PropertiesHelper.convertValue(result, type);

diff --git a/etc/jenkins/Jenkinsfile_ci_build b/etc/jenkins/Jenkinsfile_ci_build
@@ -8,41 +8,41 @@ pipeline {
     stages {
         stage('Jersey build') {
             parallel {
-                stage('JDK 8 ') {
+                stage('JDK 8') {
                     agent {
                         label 'centos-7'
                     }
                     tools {
                         jdk 'oracle-jdk8-latest'
-                        maven 'apache-maven-3.9.2'
+                        maven 'apache-maven-latest'
                     }
                     steps {
                         sh '''
                                 bash ${WORKSPACE}/etc/jenkins/jenkins_build.sh
                             '''
                     }
                 }
-                stage('JDK 11 ') {
+                stage('JDK 11') {
                     agent {
                         label 'centos-7'
                     }
                     tools {
                         jdk 'openjdk-jdk11-latest'
-                        maven 'apache-maven-3.9.2'
+                        maven 'apache-maven-latest'
                     }
                     steps {
                         sh '''
                                 bash ${WORKSPACE}/etc/jenkins/jenkins_build.sh
                             '''
                     }
                 }
-                stage('JDK 19 ') {
+                stage('JDK 21') {
                     agent {
                         label 'centos-7'
                     }
                     tools {
-                        jdk 'openjdk-jdk19-latest'
-                        maven 'apache-maven-3.9.2'
+                        jdk 'openjdk-jdk21-latest'
+                        maven 'apache-maven-latest'
                     }
                     steps {
                         sh '''

diff --git a/pom.xml b/pom.xml
@@ -2223,7 +2223,7 @@
         <site.mvn.plugin.version>3.9.1</site.mvn.plugin.version>
         <source.mvn.plugin.version>3.3.0</source.mvn.plugin.version>
         <surefire.mvn.plugin.version>3.1.2</surefire.mvn.plugin.version>
-        <war.mvn.plugin.version>3.3.2</war.mvn.plugin.version>
+        <war.mvn.plugin.version>3.4.0</war.mvn.plugin.version>
         <wiremock.mvn.plugin.version>2.11.0</wiremock.mvn.plugin.version>
         <xml.mvn.plugin.version>1.0.2</xml.mvn.plugin.version>
         <!-- END of Versions of Maven plugins -->