Skip to content

Commit 1072d61

Browse files
slawekjaranowskislawekjaranowski
committed
Project cleanups
- use https in links - use plugins version from parent - use reporting configuration from parent - use release profile from parent - fix site build, use site configuration from parent
1 parent 3c05d7a commit 1072d61

File tree

24 files changed

+71
-312
lines changed

24 files changed

+71
-312
lines changed

‎modello-core/src/site/site.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0"?>
22

3-
<project xmlns="http://maven.apache.org/DECORATION/1.3.0"
3+
<project xmlns="http://maven.apache.org/DECORATION/1.8.1"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
5+
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd">
66
<bannerLeft>
77
<name>Modello</name>
88
</bannerLeft>

‎modello-maven-plugin/pom.xml

Lines changed: 5 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,14 @@
1515
<description>Modello Maven Plugin enables the use of Modello in Maven builds.</description>
1616

1717
<prerequisites>
18-
<maven>${maven.version}</maven>
18+
<maven>${mavenVersion}</maven>
1919
</prerequisites>
2020

21-
<properties>
22-
<mavenPluginTools>3.11.0</mavenPluginTools>
23-
</properties>
24-
2521
<dependencies>
2622
<dependency>
2723
<groupId>org.apache.maven</groupId>
2824
<artifactId>maven-plugin-api</artifactId>
29-
<version>${maven.version}</version>
25+
<version>${mavenVersion}</version>
3026
<scope>provided</scope>
3127
</dependency>
3228
<dependency>
@@ -36,13 +32,13 @@
3632
<dependency>
3733
<groupId>org.apache.maven</groupId>
3834
<artifactId>maven-model</artifactId>
39-
<version>${maven.version}</version>
35+
<version>${mavenVersion}</version>
4036
<scope>provided</scope>
4137
</dependency>
4238
<dependency>
4339
<groupId>org.apache.maven</groupId>
4440
<artifactId>maven-core</artifactId>
45-
<version>${maven.version}</version>
41+
<version>${mavenVersion}</version>
4642
<scope>provided</scope>
4743
</dependency>
4844
<dependency>
@@ -52,7 +48,6 @@
5248
<dependency>
5349
<groupId>org.apache.maven.plugin-tools</groupId>
5450
<artifactId>maven-plugin-annotations</artifactId>
55-
<version>${mavenPluginTools}</version>
5651
<scope>provided</scope>
5752
</dependency>
5853

@@ -126,46 +121,11 @@
126121
</dependency>
127122
</dependencies>
128123

129-
<build>
130-
<pluginManagement>
131-
<plugins>
132-
<plugin>
133-
<groupId>org.apache.maven.plugins</groupId>
134-
<artifactId>maven-plugin-plugin</artifactId>
135-
<version>${mavenPluginTools}</version>
136-
<configuration>
137-
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
138-
</configuration>
139-
</plugin>
140-
</plugins>
141-
</pluginManagement>
142-
<plugins>
143-
<plugin>
144-
<groupId>org.apache.maven.plugins</groupId>
145-
<artifactId>maven-plugin-plugin</artifactId>
146-
<executions>
147-
<execution>
148-
<id>mojo-descriptor</id>
149-
<goals>
150-
<goal>descriptor</goal>
151-
</goals>
152-
</execution>
153-
<execution>
154-
<id>generated-helpmojo</id>
155-
<goals>
156-
<goal>helpmojo</goal>
157-
</goals>
158-
</execution>
159-
</executions>
160-
</plugin>
161-
</plugins>
162-
</build>
163-
164124
<reporting>
165125
<plugins>
166126
<plugin>
167127
<groupId>org.apache.maven.plugins</groupId>
168-
<artifactId>maven-plugin-plugin</artifactId>
128+
<artifactId>maven-plugin-report-plugin</artifactId>
169129
</plugin>
170130
</plugins>
171131
</reporting>

‎modello-maven-plugin/src/it/features/src/site/site.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0"?>
22

3-
<project xmlns="http://maven.apache.org/DECORATION/1.3.0"
3+
<project xmlns="http://maven.apache.org/DECORATION/1.8.1"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
5+
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd">
66
<bannerLeft>
77
<name>Modello</name>
88
</bannerLeft>

‎modello-maven-plugin/src/site/site.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<project xmlns="http://maven.apache.org/DECORATION/1.3.0"
3+
<project xmlns="http://maven.apache.org/DECORATION/1.8.1"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
5+
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd">
66
<bannerLeft>
77
<name>Modello</name>
88
</bannerLeft>

‎modello-plugins/modello-plugin-converters/src/site/site.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0"?>
22

3-
<project xmlns="http://maven.apache.org/DECORATION/1.3.0"
3+
<project xmlns="http://maven.apache.org/DECORATION/1.8.1"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
5+
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd">
66
<bannerLeft>
77
<name>Modello</name>
88
</bannerLeft>

‎modello-plugins/modello-plugin-dom4j/src/site/site.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0"?>
22

3-
<project xmlns="http://maven.apache.org/DECORATION/1.3.0"
3+
<project xmlns="http://maven.apache.org/DECORATION/1.8.1"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
5+
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd">
66
<bannerLeft>
77
<name>Modello</name>
88
</bannerLeft>

‎modello-plugins/modello-plugin-jackson/src/site/site.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0"?>
22

3-
<project xmlns="http://maven.apache.org/DECORATION/1.3.0"
3+
<project xmlns="http://maven.apache.org/DECORATION/1.8.1"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
5+
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd">
66
<bannerLeft>
77
<name>Modello</name>
88
</bannerLeft>

‎modello-plugins/modello-plugin-java/pom.xml

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -33,43 +33,6 @@
3333
<version>2.3.1</version>
3434
<scope>test</scope>
3535
</dependency>
36-
37-
<!-- Castor's component containing org.exolab.javasource -->
38-
<!--dependency>
39-
<groupId>org.codehaus.castor</groupId>
40-
<artifactId>castor-codegen</artifactId>
41-
<version>1.3rc1</version>
42-
<exclusions>
43-
<exclusion>
44-
<artifactId>castor-core</artifactId>
45-
<groupId>org.codehaus.castor</groupId>
46-
</exclusion>
47-
<exclusion>
48-
<artifactId>castor-jdo</artifactId>
49-
<groupId>org.codehaus.castor</groupId>
50-
</exclusion>
51-
<exclusion>
52-
<artifactId>castor-xml</artifactId>
53-
<groupId>org.codehaus.castor</groupId>
54-
</exclusion>
55-
<exclusion>
56-
<artifactId>castor-xml-schema</artifactId>
57-
<groupId>org.codehaus.castor</groupId>
58-
</exclusion>
59-
<exclusion>
60-
<artifactId>velocity</artifactId>
61-
<groupId>velocity</groupId>
62-
</exclusion>
63-
<exclusion>
64-
<artifactId>log4j</artifactId>
65-
<groupId>log4j</groupId>
66-
</exclusion>
67-
<exclusion>
68-
<artifactId>commons-logging</artifactId>
69-
<groupId>commons-logging</groupId>
70-
</exclusion>
71-
</exclusions>
72-
</dependency -->
7336
</dependencies>
7437

7538
<build>

‎modello-plugins/modello-plugin-java/src/site/site.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0"?>
22

3-
<project xmlns="http://maven.apache.org/DECORATION/1.3.0"
3+
<project xmlns="http://maven.apache.org/DECORATION/1.8.1"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
5+
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd">
66
<bannerLeft>
77
<name>Modello</name>
88
</bannerLeft>

‎modello-plugins/modello-plugin-jdom/src/site/site.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0"?>
22

3-
<project xmlns="http://maven.apache.org/DECORATION/1.3.0"
3+
<project xmlns="http://maven.apache.org/DECORATION/1.8.1"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
5+
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd">
66
<bannerLeft>
77
<name>Modello</name>
88
</bannerLeft>

0 commit comments

Comments
 (0)