Skip to content

Commit b8add33

Browse files
authored
Align archetype plugin versions with project (#1580)
1 parent 548b6a6 commit b8add33

3 files changed

Lines changed: 46 additions & 13 deletions

File tree

archetypes/java/src/main/resources/META-INF/maven/archetype-metadata.xml

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,36 @@
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
55
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.1.0 https://maven.apache.org/xsd/archetype-descriptor-1.1.0.xsd">
66
<requiredProperties>
7-
<requiredProperty key="junit-version">
8-
<defaultValue>${junit.version}</defaultValue>
7+
<requiredProperty key="java-version">
8+
<defaultValue>${maven.compiler.release}</defaultValue>
99
</requiredProperty>
1010
<requiredProperty key="inrupt-client-version">
1111
<defaultValue>${project.version}</defaultValue>
1212
</requiredProperty>
13+
<requiredProperty key="junit-version">
14+
<defaultValue>${junit.version}</defaultValue>
15+
</requiredProperty>
16+
<requiredProperty key="maven-clean-plugin">
17+
<defaultValue>${clean.plugin.version}</defaultValue>
18+
</requiredProperty>
19+
<requiredProperty key="maven-antrun-plugin">
20+
<defaultValue>${antrun.plugin.version}</defaultValue>
21+
</requiredProperty>
22+
<requiredProperty key="maven-assembly-plugin">
23+
<defaultValue>${assembly.plugin.version}</defaultValue>
24+
</requiredProperty>
25+
<requiredProperty key="maven-dependency-plugin">
26+
<defaultValue>${dependency.plugin.version}</defaultValue>
27+
</requiredProperty>
28+
<requiredProperty key="maven-install-plugin">
29+
<defaultValue>${install.plugin.version}</defaultValue>
30+
</requiredProperty>
31+
<requiredProperty key="maven-jar-plugin">
32+
<defaultValue>${jar.plugin.version}</defaultValue>
33+
</requiredProperty>
34+
<requiredProperty key="maven-resources-plugin">
35+
<defaultValue>${resources.plugin.version}</defaultValue>
36+
</requiredProperty>
1337
</requiredProperties>
1438
<fileSets>
1539
<fileSet filtered="true" packaged="true">

archetypes/java/src/main/resources/archetype-resources/pom.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1414
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1515
<!-- Java version -->
16-
<maven.compiler.source>11</maven.compiler.source>
17-
<maven.compiler.target>11</maven.compiler.target>
18-
<java.version>11</java.version>
16+
<maven.compiler.parameters>true</maven.compiler.parameters>
17+
<maven.compiler.release>${java-version}</maven.compiler.release>
1918
</properties>
2019

2120
<dependencyManagement>
@@ -102,41 +101,42 @@
102101
<plugin>
103102
<groupId>org.apache.maven.plugins</groupId>
104103
<artifactId>maven-clean-plugin</artifactId>
105-
<version>3.2.0</version>
104+
<version>${maven-clean-plugin}</version>
106105
</plugin>
107106
<plugin>
108107
<groupId>org.apache.maven.plugins</groupId>
109108
<artifactId>maven-antrun-plugin</artifactId>
110-
<version>3.1.0</version>
109+
<version>${maven-antrun-plugin}</version>
111110
</plugin>
112111
<plugin>
113112
<groupId>org.apache.maven.plugins</groupId>
114113
<artifactId>maven-assembly-plugin</artifactId>
115-
<version>3.6.0</version>
114+
<version>${maven-assembly-plugin}</version>
116115
</plugin>
117116
<plugin>
118117
<groupId>org.apache.maven.plugins</groupId>
119118
<artifactId>maven-dependency-plugin</artifactId>
120-
<version>3.6.0</version>
119+
<version>${maven-dependency-plugin}</version>
121120
</plugin>
122121
<plugin>
123122
<groupId>org.apache.maven.plugins</groupId>
124123
<artifactId>maven-install-plugin</artifactId>
125-
<version>3.1.1</version>
124+
<version>${maven-install-plugin}</version>
126125
</plugin>
127126
<plugin>
128127
<groupId>org.apache.maven.plugins</groupId>
129128
<artifactId>maven-jar-plugin</artifactId>
130-
<version>3.3.0</version>
129+
<version>${maven-jar-plugin}</version>
131130
</plugin>
132131
<plugin>
132+
<groupId>org.apache.maven.plugins</groupId>
133133
<artifactId>maven-compiler-plugin</artifactId>
134-
<version>3.11.0</version>
134+
<version>${maven-compiler-plugin}</version>
135135
</plugin>
136136
<plugin>
137137
<groupId>org.apache.maven.plugins</groupId>
138138
<artifactId>maven-resources-plugin</artifactId>
139-
<version>3.3.1</version>
139+
<version>${maven-resources-plugin}</version>
140140
<configuration>
141141
<propertiesEncoding>UTF-8</propertiesEncoding>
142142
<encoding>UTF-8</encoding>

archetypes/java/src/test/resources/projects/test/archetype.properties

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,14 @@ artifactId=inrupt-client-test
33
version=1.0-SNAPSHOT
44
package=com.inrupt.test
55

6+
java-version=${maven.compiler.release}
67
inrupt-client-version=${project.version}
78
junit-version=${junit.version}
9+
maven-antrun-plugin=${antrun.plugin.version}
10+
maven-assembly-plugin=${assembly.plugin.version}
11+
maven-clean-plugin=${clean.plugin.version}
12+
maven-compiler-plugin=${compiler.plugin.version}
13+
maven-dependency-plugin=${dependency.plugin.version}
14+
maven-install-plugin=${install.plugin.version}
15+
maven-jar-plugin=${jar.plugin.version}
16+
maven-resources-plugin=${resources.plugin.version}

0 commit comments

Comments
 (0)