From f8b83c2898356826836a18cef09eeb65ebae084f Mon Sep 17 00:00:00 2001
From: Kalin Chan <kalin.chan@payara.fish>
Date: Thu, 7 Dec 2023 11:40:35 +0000
Subject: [PATCH 1/2] FISH-8085 Do not export java modules

(cherry picked from commit 7aadaf0a1d47ffb24a6f21a5f38aa3b9ffdb910c)
---
 api/pom.xml |  1 +
 pom.xml     | 46 +++++++++++++++++++++++-----------------------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/api/pom.xml b/api/pom.xml
index 682a46c..e0f44c0 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -244,6 +244,7 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
                                         cardinality:=multiple;resolution:=optional
                                   ]]>
                                 </Require-Capability>
+                                <_noimportjava>true</_noimportjava>
                             </instructions>
                         </configuration>
                     </execution>
diff --git a/pom.xml b/pom.xml
index 3fe4ba9..645469f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,29 +185,29 @@
                     </compilerArgs>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.glassfish.copyright</groupId>
-                <artifactId>glassfish-copyright-maven-plugin</artifactId>
-                <configuration>
-                    <templateFile>${copyright.templatefile}</templateFile>
-                    <excludeFile>${copyright.exclude}</excludeFile>
-                    <!-- skip files not under SCM-->
-                    <scmOnly>${copyright.scmonly}</scmOnly>
-                    <!-- for use with repair -->
-                    <update>${copyright.update}</update>
-                    <!-- check that year is correct -->
-                    <ignoreYear>${copyright.ignoreyear}</ignoreYear>
-                    <quiet>false</quiet>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
+<!--            <plugin>-->
+<!--                <groupId>org.glassfish.copyright</groupId>-->
+<!--                <artifactId>glassfish-copyright-maven-plugin</artifactId>-->
+<!--                <configuration>-->
+<!--                    <templateFile>${copyright.templatefile}</templateFile>-->
+<!--                    <excludeFile>${copyright.exclude}</excludeFile>-->
+<!--                    &lt;!&ndash; skip files not under SCM&ndash;&gt;-->
+<!--                    <scmOnly>${copyright.scmonly}</scmOnly>-->
+<!--                    &lt;!&ndash; for use with repair &ndash;&gt;-->
+<!--                    <update>${copyright.update}</update>-->
+<!--                    &lt;!&ndash; check that year is correct &ndash;&gt;-->
+<!--                    <ignoreYear>${copyright.ignoreyear}</ignoreYear>-->
+<!--                    <quiet>true</quiet>-->
+<!--                </configuration>-->
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <phase>validate</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>check</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--            </plugin>-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>

From c15431ae346d5146bc3f6a4dda5a8c62b7836b58 Mon Sep 17 00:00:00 2001
From: luiseufrasio <luis.eufrasio@gmail.com>
Date: Tue, 19 Nov 2024 15:42:30 -0300
Subject: [PATCH 2/2] FISH-9165 : Release 4.0.2.payara-p1

---
 api/pom.xml           | 2 +-
 jaxb-api-test/pom.xml | 2 +-
 pom.xml               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/api/pom.xml b/api/pom.xml
index e0f44c0..30cc7f4 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <artifactId>jakarta.xml.bind-api-parent</artifactId>
         <groupId>jakarta.xml.bind</groupId>
-        <version>4.0.2.payara-p1-SNAPSHOT</version>
+        <version>4.0.2.payara-p1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/jaxb-api-test/pom.xml b/jaxb-api-test/pom.xml
index 6e61773..841f500 100644
--- a/jaxb-api-test/pom.xml
+++ b/jaxb-api-test/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <artifactId>jakarta.xml.bind-api-parent</artifactId>
         <groupId>jakarta.xml.bind</groupId>
-        <version>4.0.2.payara-p1-SNAPSHOT</version>
+        <version>4.0.2.payara-p1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
index 645469f..aa4bde2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
 
     <groupId>jakarta.xml.bind</groupId>
     <artifactId>jakarta.xml.bind-api-parent</artifactId>
-    <version>4.0.2.payara-p1-SNAPSHOT</version>
+    <version>4.0.2.payara-p1</version>
     <packaging>pom</packaging>
     <name>Jakarta XML Binding</name>
     <description>Jakarta XML Binding API</description>