From cb4bb41b0cc74da1cc1d43fcdac18c265db96558 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Wed, 25 Dec 2024 14:55:27 -0500 Subject: [PATCH 1/7] Remove developer list This data can be primarily retrieved from git history which mybatis has been in for significant number of years. Its further a maintenance concern as large number of developers here are no longer working with the project and uncertain if data is accurate any longer. In order to make this more support friendly, this data should generally be removed in light of commit data providing enough information on its own. As this commit will also remain in history, data is not actually lost by makign this action. This is similar to removing the author tags from files. --- pom.xml | 162 -------------------------------------------------------- 1 file changed, 162 deletions(-) diff --git a/pom.xml b/pom.xml index d9f1cc161..621c2602e 100644 --- a/pom.xml +++ b/pom.xml @@ -41,168 +41,6 @@ - - - - cbegin - Clinton Begin - clinton.begin@gmail.com - - Owner - Founder - Committer - - - - - agustafson - Andrew Gustafson - gus4000@gmail.com - - Committer - - - - - brandon.goodin - Brandon Goodin - brandon.goodin@gmail.com - - Committer - - - - - christianpoitras - Christian Poitras - christian.poitras@ircm.qc.ca - - Committer - - -5 - - - - emacarron - Eduardo Macarron - eduardo.macarron@gmail.com - - Committer - - - - - mnesarco - Frank Martinez - mnesarco@gmail.com - - Committer - - - - - hpresnall - Hunter Presnall - hpresnall@gmail.com - - Committer - - - - - harawata - Iwao Ave - harawata@gmail.com - - Committer - - - - - jeffgbutler - Jeff Butler - jeffgbutler@gmail.com - - Committer - - - - - hazendaz - Jeremy Landis - jeremylandis@hotmail.com - - Committer - - -5 - - - - nospam@kaigrabfelder.de - Kai Grabfelder - nospam@kaigrabfelder.de - - Committer - - - - - lmeadors - Larry Meadors - larry.meadors@gmail.com - - Committer - - - - - marcosperanza - Marco Speranza - marco.speranza79@gmail.com - - Committer - - +1 - - - - nmaves - Nathan Maves - nathan.maves@gmail.com - - Committer - - - - - pboonphong - Putthiphong Boonphong - putthiphong.boonphong@gmail.com - - Committer - - - - - simonetripodi - Simone Tripodi - simone.tripodi@gmail.com - - Committer - - +1 - - - - h3adache - Tim Chen - chengt@gmail.com - - Committer - - - - mybatis-dev From 340590ca813feaab639fa3d250e018b1aed07b26 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Wed, 25 Dec 2024 15:01:42 -0500 Subject: [PATCH 2/7] Drop jdk 22 and add jdk 25 to allowed build jdks with comment as to content comment is for clarity. Basically ant of each version is allowed. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 621c2602e..3dc9ebb32 100644 --- a/pom.xml +++ b/pom.xml @@ -102,7 +102,7 @@ 2024 - [17,18),[21,22),[22,23),[23,24),[24,25) + [17,18),[21,22),[23,24),[24,25),[25,26) checkstyle.xml 44 eclipse-formatter-config-2space.xml From 02ee576eaa244e8f74ae16fb7407ef9312fa07cb Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Wed, 25 Dec 2024 15:02:00 -0500 Subject: [PATCH 3/7] [pom] Move project to jdk 17 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 3dc9ebb32..1fde909aa 100644 --- a/pom.xml +++ b/pom.xml @@ -116,10 +116,10 @@ yyyy-MM-dd HH:mm:ssZ - 11 - 11 - 11 - 11 + 17 + 17 + 17 + 17 ${java.version} From 35fc5b560d70f4a6da0388a4cf10e940e23697d7 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Wed, 25 Dec 2024 15:02:18 -0500 Subject: [PATCH 4/7] [pom] Set bcel version via property --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1fde909aa..16b218193 100644 --- a/pom.xml +++ b/pom.xml @@ -147,6 +147,7 @@ 9.7.1 12 + 6.10.0 7.1.0 1.4.0 10.21.0 @@ -709,7 +710,7 @@ org.apache.bcel bcel - 6.10.0 + ${bcel.version} From 0abc4d8c7eff8bf8e7bb66d6850b97dba56ddcfa Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Wed, 25 Dec 2024 15:02:26 -0500 Subject: [PATCH 5/7] [pom] Require maven 3.9.9 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 16b218193..7039fb81d 100644 --- a/pom.xml +++ b/pom.xml @@ -131,7 +131,7 @@ ${java.test.release.version} - 3.9.8 + 3.9.9 UTF-8 From 0488083405f90bdfa404fc7176359df42d2b6d21 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Wed, 25 Dec 2024 15:02:41 -0500 Subject: [PATCH 6/7] [pom] Set clirr to 46 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7039fb81d..8a8b38ecf 100644 --- a/pom.xml +++ b/pom.xml @@ -104,7 +104,7 @@ [17,18),[21,22),[23,24),[24,25),[25,26) checkstyle.xml - 44 + 46 eclipse-formatter-config-2space.xml ${project.name} -html5 From e3fb96c36b4ba9234081472b2325b61fe4ad41b2 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Wed, 25 Dec 2024 15:02:54 -0500 Subject: [PATCH 7/7] [osgi] Drop jdk 11/22 and add jdk 25 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8a8b38ecf..b10b370f8 100644 --- a/pom.xml +++ b/pom.xml @@ -364,7 +364,7 @@ // 'nouses' stops the "uses" clauses being added to "Export-Package" manifest entry -nouses: true // 'removeheaders' Stop the JAVA_n_HOME variables from being treated as headers by Bnd if found in settings.xml (obsolete versions removed, if found, cleanup settings.xml) - -removeheaders: JAVA_11_HOME,JAVA_17_HOME,JAVA_21_HOME,JAVA_22_HOME,JAVA_23_HOME,JAVA_24_HOME + -removeheaders: JAVA_17_HOME,JAVA_21_HOME,JAVA_23_HOME,JAVA_24_HOME,JAVA_25_HOME Bundle-Developers: Bundle-DocURL: ${project.url} Bundle-SymbolicName: ${osgi.symbolicName}