Skip to content

Commit 266542a

Browse files
authored
Merge pull request #3337 from hazendaz/pom-cleanup
Various cleanup to help with maintenance / release process
2 parents d20ac1d + 551ba16 commit 266542a

File tree

1 file changed

+18
-102
lines changed

1 file changed

+18
-102
lines changed

pom.xml

Lines changed: 18 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
1818
-->
1919
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
20+
2021
<modelVersion>4.0.0</modelVersion>
2122

2223
<parent>
@@ -39,73 +40,6 @@
3940

4041
<inceptionYear>2009</inceptionYear>
4142

42-
<contributors>
43-
<contributor>
44-
<name>Adam Gent</name>
45-
<email>[email protected]</email>
46-
</contributor>
47-
<contributor>
48-
<name>Andrea Selva</name>
49-
<email>[email protected]</email>
50-
</contributor>
51-
<contributor>
52-
<name>Antonio Sánchez</name>
53-
<email>[email protected]</email>
54-
</contributor>
55-
<contributor>
56-
<name>Arkadi Shishlov</name>
57-
<email>[email protected]</email>
58-
</contributor>
59-
<contributor>
60-
<name>Axel Doerfler</name>
61-
<email>[email protected]</email>
62-
</contributor>
63-
<contributor>
64-
<name>Chris Dadej</name>
65-
<email>[email protected]</email>
66-
</contributor>
67-
<contributor>
68-
<name>Denis Vygovskiy</name>
69-
<email>[email protected]</email>
70-
</contributor>
71-
<contributor>
72-
<name>Franta Mejta</name>
73-
<email>[email protected]</email>
74-
</contributor>
75-
<contributor>
76-
<name>Jurriaan Pruys</name>
77-
<email>[email protected]</email>
78-
</contributor>
79-
<contributor>
80-
<name>Keith Wong</name>
81-
<email>[email protected]</email>
82-
</contributor>
83-
<contributor>
84-
<name>Lasse Voss</name>
85-
<email>[email protected]</email>
86-
</contributor>
87-
<contributor>
88-
<name>Luke Stevens</name>
89-
<email>[email protected]</email>
90-
</contributor>
91-
<contributor>
92-
<name>Paul Krause</name>
93-
<email>[email protected]</email>
94-
</contributor>
95-
<contributor>
96-
<name>Peter Leibiger</name>
97-
<email>[email protected]</email>
98-
</contributor>
99-
<contributor>
100-
<name>Riccardo Cossu</name>
101-
<email>[email protected]</email>
102-
</contributor>
103-
<contributor>
104-
<name>Tomáš Neuberg</name>
105-
<email>[email protected]</email>
106-
</contributor>
107-
</contributors>
108-
10943
<scm>
11044
<connection>scm:git:ssh://[email protected]/mybatis/mybatis-3.git</connection>
11145
<developerConnection>scm:git:ssh://[email protected]/mybatis/mybatis-3.git</developerConnection>
@@ -133,6 +67,9 @@
13367
<java.version>8</java.version>
13468
<java.release.version>8</java.release.version>
13569

70+
<!-- Override impsort comliance to 17 (remove after parent 49 release) -->
71+
<impsort.compliance>17</impsort.compliance>
72+
13673
<clirr.comparisonVersion>3.4.6</clirr.comparisonVersion>
13774

13875
<byte-buddy.version>1.15.11</byte-buddy.version>
@@ -459,51 +396,30 @@
459396
</excludes>
460397
</configuration>
461398
</plugin>
399+
400+
<!-- Remove enforcer entirely after parent 49 release -->
401+
<plugin>
402+
<groupId>org.apache.maven.plugins</groupId>
403+
<artifactId>maven-enforcer-plugin</artifactId>
404+
<configuration>
405+
<rules>
406+
<enforceBytecodeVersion>
407+
<maxJdkVersion>${java.version}</maxJdkVersion>
408+
<ignoredScopes>provided,test</ignoredScopes>
409+
</enforceBytecodeVersion>
410+
</rules>
411+
</configuration>
412+
</plugin>
462413
</plugins>
463414
</build>
464415

465416
<profiles>
466-
<profile>
467-
<id>pre16</id>
468-
<activation>
469-
<jdk>(,16)</jdk>
470-
</activation>
471-
<properties>
472-
<derby.version>10.15.2.0</derby.version>
473-
<mssql-jdbc.version>12.4.2.jre8</mssql-jdbc.version>
474-
</properties>
475-
<build>
476-
<pluginManagement>
477-
<plugins>
478-
<plugin>
479-
<groupId>org.apache.maven.plugins</groupId>
480-
<artifactId>maven-compiler-plugin</artifactId>
481-
<configuration>
482-
<testExcludes>
483-
<testExclude>**/record_type/*.java</testExclude>
484-
</testExcludes>
485-
</configuration>
486-
</plugin>
487-
<plugin>
488-
<groupId>net.revelc.code</groupId>
489-
<artifactId>impsort-maven-plugin</artifactId>
490-
<configuration>
491-
<skip>true</skip>
492-
</configuration>
493-
</plugin>
494-
</plugins>
495-
</pluginManagement>
496-
</build>
497-
</profile>
498417
<profile>
499418
<id>16</id>
500419
<activation>
501420
<jdk>[16,)</jdk>
502421
</activation>
503422
<properties>
504-
<derby.version>10.15.2.0</derby.version>
505-
<java.version>16</java.version>
506-
<java.release.version>16</java.release.version>
507423
<excludedGroups>TestcontainersTests,RequireIllegalAccess</excludedGroups>
508424
</properties>
509425
</profile>

0 commit comments

Comments
 (0)