Skip to content

Commit 0a7a790

Browse files
koentsjekoentsje
committed
HBX-3112: Add the dependencies of the Maven plugin build to the dependency management section in the parent pom
Signed-off-by: Koen Aers <[email protected]>
1 parent 5c583a1 commit 0a7a790

File tree

2 files changed

+113
-94
lines changed

2 files changed

+113
-94
lines changed

‎maven-plugin/pom.xml‎

Lines changed: 1 addition & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -14,56 +14,11 @@
1414

1515
<name>Hibernate Tools Maven Plugin</name>
1616
<description>Maven plugin to provide hibernate-tools reverse engineering and code/schema generation abilities.</description>
17-
<url>https://hibernate.github.io/hibernate-tools/</url>
18-
19-
<issueManagement>
20-
<system>JIRA</system>
21-
<url>http://hibernate.onjira.com/browse/HBX</url>
22-
</issueManagement>
23-
24-
<scm>
25-
<connection>scm:git:git://github.com/hibernate/hibernate-tools.git</connection>
26-
<developerConnection>scm:git:[email protected]:hibernate/hibernate-tools.git</developerConnection>
27-
<url>http://github.com/hibernate/hibernate-tools</url>
28-
</scm>
29-
30-
<organization>
31-
<name>Hibernate</name>
32-
<url>http://www.hibernate.org</url>
33-
</organization>
34-
35-
<licenses>
36-
<license>
37-
<name>GNU Lesser General Public License</name>
38-
<url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
39-
</license>
40-
</licenses>
41-
42-
<developers>
43-
<developer>
44-
<id>stadler</id>
45-
<name>Jacques Stadler</name>
46-
<email>[email protected]</email>
47-
</developer>
48-
</developers>
49-
50-
<prerequisites>
51-
<maven>3.0</maven>
52-
</prerequisites>
5317

5418
<properties>
5519
<!-- This is a publicly distributed module that should be published: -->
5620
<deploy.skip>false</deploy.skip>
5721
<maven.install.skip>false</maven.install.skip>
58-
59-
<maven-plugin-annotations.version>3.5</maven-plugin-annotations.version>
60-
<maven-plugin-api.version>3.5.2</maven-plugin-api.version>
61-
<maven-core.version>3.9.9</maven-core.version>
62-
63-
<!-- Plugin versions -->
64-
<maven-project-info-reports-plugin.version>2.9</maven-project-info-reports-plugin.version>
65-
<maven-site-plugin.version>3.7</maven-site-plugin.version>
66-
<site-maven-plugin.version>0.12</site-maven-plugin.version>
6722
</properties>
6823

6924
<dependencies>
@@ -76,19 +31,14 @@
7631
<dependency>
7732
<groupId>org.apache.maven</groupId>
7833
<artifactId>maven-plugin-api</artifactId>
79-
<version>${maven-plugin-api.version}</version>
80-
<scope>provided</scope>
8134
</dependency>
8235
<dependency>
8336
<groupId>org.apache.maven</groupId>
8437
<artifactId>maven-core</artifactId>
85-
<version>${maven-core.version}</version>
86-
<scope>provided</scope>
8738
</dependency>
8839
<dependency>
8940
<groupId>org.apache.maven.plugin-tools</groupId>
9041
<artifactId>maven-plugin-annotations</artifactId>
91-
<version>${maven-plugin-annotations.version}</version>
9242
<scope>provided</scope>
9343
</dependency>
9444
</dependencies>
@@ -129,7 +79,7 @@
12979
<plugin>
13080
<groupId>com.github.github</groupId>
13181
<artifactId>site-maven-plugin</artifactId>
132-
<version>${site-maven-plugin.version}</version>
82+
<version>${github-site-maven-plugin.version}</version>
13383
<executions>
13484
<execution>
13585
<goals>

‎pom.xml‎

Lines changed: 112 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.jboss</groupId>
99
<artifactId>jboss-parent</artifactId>
10-
<version>48</version>
10+
<version>49</version>
1111
</parent>
1212

1313
<groupId>org.hibernate</groupId>
@@ -18,22 +18,76 @@
1818

1919
<name>Hibernate Tools Parent Project</name>
2020

21+
<url>http://hibernate.org/tools/</url>
22+
23+
<issueManagement>
24+
<system>JIRA</system>
25+
<url>http://hibernate.atlassian.net/projects/HBX</url>
26+
</issueManagement>
27+
28+
<scm>
29+
<connection>scm:git:git://github.com/hibernate/hibernate-tools.git</connection>
30+
<developerConnection>scm:git:[email protected]:hibernate/hibernate-tools.git</developerConnection>
31+
<url>http://github.com/hibernate/hibernate-tools</url>
32+
</scm>
33+
34+
<organization>
35+
<name>Hibernate</name>
36+
<url>http://www.hibernate.org</url>
37+
</organization>
38+
39+
<licenses>
40+
<license>
41+
<name>GNU Lesser General Public License</name>
42+
<url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
43+
</license>
44+
</licenses>
45+
46+
<developers>
47+
<developer>
48+
<id>maxandersen</id>
49+
<name>Max Andersen</name>
50+
<email>[email protected]</email>
51+
<url>http://in.relation.to/Bloggers/Max</url>
52+
</developer>
53+
<developer>
54+
<id>koentsje</id>
55+
<name>Koen Aers</name>
56+
<email>[email protected]</email>
57+
<url>http://koentsje.blogspot.be</url>
58+
</developer>
59+
<developer>
60+
<id>stadler</id>
61+
<name>Jacques Stadler</name>
62+
<email>[email protected]</email>
63+
</developer>
64+
<developer>
65+
<id>marko.bekhta</id>
66+
<name>Marko Bekhta</name>
67+
<email>[email protected]</email>
68+
<url>http://in.relation.to/marko-bekhta/</url>
69+
</developer>
70+
</developers>
71+
2172
<modules>
2273
<module>main</module>
2374
<module>maven-plugin</module>
2475
<module>test</module>
2576
</modules>
2677

2778
<properties>
28-
<ant.version>1.10.15</ant.version>
29-
<commons-collections.version>4.4</commons-collections.version>
30-
<freemarker.version>2.3.34</freemarker.version>
79+
80+
<maven.version>3.9.11</maven.version>
81+
82+
<ant.version>1.10.15</ant.version>
83+
<commons-collections.version>4.5.0</commons-collections.version>
84+
<freemarker.version>2.3.34</freemarker.version>
3185
<!-- 1.7 is the last google-java-format version that is compiled against Java 1.8 -->
3286
<google-java-format.version>1.7</google-java-format.version>
3387
<h2.version>1.4.199</h2.version>
34-
<hibernate-commons-annotations.version>5.1.2.Final</hibernate-commons-annotations.version>
88+
<hibernate-commons-annotations.version>5.1.2.Final</hibernate-commons-annotations.version>
3589
<hibernate-core.version>5.3.37.Final</hibernate-core.version>
36-
<hsqldb.version>2.5.2</hsqldb.version>
90+
<hsqldb.version>2.6.1</hsqldb.version>
3791
<javaee-api.version>8.0.1</javaee-api.version>
3892
<javax.activation-api.version>1.2.0</javax.activation-api.version>
3993
<javax.persistence-api.version>2.2</javax.persistence-api.version>
@@ -45,8 +99,14 @@
4599
<sqlserver.version>9.2.1.jre8</sqlserver.version>
46100

47101
<!-- Plugins not managed by the JBoss parent POM: -->
102+
<maven-plugin-api.version>3.9.11</maven-plugin-api.version>
103+
<maven-plugin-annotations.version>3.15.1</maven-plugin-annotations.version>
48104
<maven-wrapper-plugin.version>3.3.3</maven-wrapper-plugin.version>
49-
<flatten-maven-plugin.version>1.7.0</flatten-maven-plugin.version>
105+
<flatten-maven-plugin.version>1.7.2</flatten-maven-plugin.version>
106+
<maven-invoker-plugin.version>3.9.1</maven-invoker-plugin.version>
107+
<github-site-maven-plugin.version>0.12</github-site-maven-plugin.version>
108+
<maven-project-info-reports-plugin.version>3.9.0</maven-project-info-reports-plugin.version>
109+
<maven-site-plugin.version>3.21.0</maven-site-plugin.version>
50110

51111
<!--
52112
We don't want to publish or sign any modules by default.
@@ -67,10 +127,10 @@
67127
<central.snapshots.repo.name>Maven Central Snapshots Repository</central.snapshots.repo.name>
68128
<central.snapshots.repo.url>https://central.sonatype.com/repository/maven-snapshots/</central.snapshots.repo.url>
69129

70-
71130
<maven.compiler.target>1.8</maven.compiler.target>
72131
<maven.compiler.source>1.8</maven.compiler.source>
73-
<maven.min.version>3.9.11</maven.min.version>
132+
<maven.min.version>${maven.version}</maven.min.version>
133+
<maven-core.version>${maven.version}</maven-core.version>
74134

75135
</properties>
76136

@@ -87,40 +147,49 @@
87147
<version>${h2.version}</version>
88148
<scope>test</scope>
89149
</dependency>
90-
<dependency>
91-
<groupId>com.microsoft.sqlserver</groupId>
92-
<artifactId>mssql-jdbc</artifactId>
93-
<version>${sqlserver.version}</version>
94-
<scope>test</scope>
95-
</dependency>
96-
<dependency>
97-
<groupId>com.oracle.ojdbc</groupId>
98-
<artifactId>ojdbc8</artifactId>
99-
<version>${oracle.version}</version>
100-
<scope>test</scope>
101-
</dependency>
102-
<dependency>
103-
<groupId>org.apache.commons</groupId>
104-
<artifactId>commons-collections4</artifactId>
105-
<version>${commons-collections.version}</version>
106-
</dependency>
107-
<dependency>
108-
<groupId>javax</groupId>
109-
<artifactId>javaee-api</artifactId>
110-
<version>${javaee-api.version}</version>
111-
<scope>test</scope>
112-
</dependency>
113-
<dependency>
114-
<groupId>javax.persistence</groupId>
115-
<artifactId>javax.persistence-api</artifactId>
116-
<version>${javax.persistence-api.version}</version>
117-
</dependency>
118-
<dependency>
119-
<groupId>javax.xml.bind</groupId>
120-
<artifactId>jaxb-api</artifactId>
121-
<version>${jaxb-api.version}</version>
122-
<scope>runtime</scope>
123-
</dependency>
150+
<dependency>
151+
<groupId>org.apache.maven</groupId>
152+
<artifactId>maven-core</artifactId>
153+
<version>${maven-core.version}</version>
154+
</dependency>
155+
<dependency>
156+
<groupId>org.apache.maven</groupId>
157+
<artifactId>maven-plugin-api</artifactId>
158+
<version>${maven-plugin-api.version}</version>
159+
</dependency>
160+
<dependency>
161+
<groupId>org.apache.maven.plugin-tools</groupId>
162+
<artifactId>maven-plugin-annotations</artifactId>
163+
<version>${maven-plugin-annotations.version}</version>
164+
</dependency>
165+
<dependency>
166+
<groupId>com.microsoft.sqlserver</groupId>
167+
<artifactId>mssql-jdbc</artifactId>
168+
<version>${sqlserver.version}</version>
169+
<scope>test</scope>
170+
</dependency>
171+
<dependency>
172+
<groupId>com.oracle.ojdbc</groupId>
173+
<artifactId>ojdbc8</artifactId>
174+
<version>${oracle.version}</version>
175+
<scope>test</scope>
176+
</dependency>
177+
<dependency>
178+
<groupId>org.apache.commons</groupId>
179+
<artifactId>commons-collections4</artifactId>
180+
<version>${commons-collections.version}</version>
181+
</dependency>
182+
<dependency>
183+
<groupId>javax</groupId>
184+
<artifactId>javaee-api</artifactId>
185+
<version>${javaee-api.version}</version>
186+
<scope>test</scope>
187+
</dependency>
188+
<dependency>
189+
<groupId>javax.persistence</groupId>
190+
<artifactId>javax.persistence-api</artifactId>
191+
<version>${javax.persistence-api.version}</version>
192+
</dependency>
124193
<dependency>
125194
<groupId>mysql</groupId>
126195
<artifactId>mysql-connector-java</artifactId>

0 commit comments

Comments
 (0)