Skip to content
This repository was archived by the owner on May 28, 2018. It is now read-only.

Commit da15f3a

Browse files
author
Petr Bouda
committed
Update to maven-archetype as packaging in archetypes
Change-Id: I47a93cd8732f8dcdd481fdfeeb7d5cc0ec0cb954
1 parent da866f0 commit da15f3a

File tree

6 files changed

+36
-20
lines changed

6 files changed

+36
-20
lines changed

‎archetypes/jersey-example-java8-webapp/pom.xml

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
55
6-
Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
6+
Copyright (c) 2015-2016 Oracle and/or its affiliates. All rights reserved.
77
88
The contents of this file are subject to the terms of either the GNU
99
General Public License Version 2 only ("GPL") or the Common Development
@@ -55,20 +55,11 @@
5555
<description>Jersey (Java8) WebApp Example Archetype.</description>
5656

5757
<build>
58-
<extensions>
59-
<extension>
60-
<groupId>org.apache.maven.archetype</groupId>
61-
<artifactId>archetype-packaging</artifactId>
62-
<version>2.3</version>
63-
</extension>
64-
</extensions>
65-
66-
<plugins>
67-
<plugin>
68-
<groupId>org.apache.maven.plugins</groupId>
69-
<artifactId>maven-archetype-plugin</artifactId>
70-
<version>2.3</version>
71-
</plugin>
72-
</plugins>
58+
<resources>
59+
<resource>
60+
<directory>${basedir}/src/main/resources</directory>
61+
<filtering>true</filtering>
62+
</resource>
63+
</resources>
7364
</build>
7465
</project>

‎archetypes/jersey-heroku-webapp/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
55
6-
Copyright (c) 2013-2015 Oracle and/or its affiliates. All rights reserved.
6+
Copyright (c) 2013-2016 Oracle and/or its affiliates. All rights reserved.
77
88
The contents of this file are subject to the terms of either the GNU
99
General Public License Version 2 only ("GPL") or the Common Development
@@ -47,6 +47,7 @@
4747
<artifactId>project</artifactId>
4848
<version>3.0-SNAPSHOT</version>
4949
</parent>
50+
<packaging>maven-archetype</packaging>
5051

5152
<artifactId>jersey-heroku-webapp</artifactId>
5253
<name>jersey-archetype-heroku-webapp</name>

‎archetypes/jersey-quickstart-grizzly2/pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
55
6-
Copyright (c) 2010-2015 Oracle and/or its affiliates. All rights reserved.
6+
Copyright (c) 2010-2016 Oracle and/or its affiliates. All rights reserved.
77
88
The contents of this file are subject to the terms of either the GNU
99
General Public License Version 2 only ("GPL") or the Common Development
@@ -47,11 +47,13 @@
4747
<version>3.0-SNAPSHOT</version>
4848
</parent>
4949
<artifactId>jersey-quickstart-grizzly2</artifactId>
50+
<packaging>maven-archetype</packaging>
5051
<modelVersion>4.0.0</modelVersion>
5152
<description>
5253
An archetype which contains a quick start Jersey project based on Grizzly container.
5354
</description>
5455
<name>jersey-archetype-grizzly2</name>
56+
5557
<build>
5658
<resources>
5759
<resource>

‎archetypes/jersey-quickstart-webapp/pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
55
6-
Copyright (c) 2010-2015 Oracle and/or its affiliates. All rights reserved.
6+
Copyright (c) 2010-2016 Oracle and/or its affiliates. All rights reserved.
77
88
The contents of this file are subject to the terms of either the GNU
99
General Public License Version 2 only ("GPL") or the Common Development
@@ -47,11 +47,13 @@
4747
<version>3.0-SNAPSHOT</version>
4848
</parent>
4949
<modelVersion>4.0.0</modelVersion>
50+
<packaging>maven-archetype</packaging>
5051
<description>
5152
An archetype which contains a quick start Jersey-based web application project.
5253
</description>
5354
<artifactId>jersey-quickstart-webapp</artifactId>
5455
<name>jersey-archetype-webapp</name>
56+
5557
<build>
5658
<plugins>
5759
<plugin>

‎archetypes/pom.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,24 @@
6363
<module>jersey-example-java8-webapp</module>
6464
</modules>
6565

66+
<build>
67+
<extensions>
68+
<extension>
69+
<groupId>org.apache.maven.archetype</groupId>
70+
<artifactId>archetype-packaging</artifactId>
71+
<version>${archetype.mvn.plugin.version}</version>
72+
</extension>
73+
</extensions>
74+
75+
<plugins>
76+
<plugin>
77+
<groupId>org.apache.maven.plugins</groupId>
78+
<artifactId>maven-archetype-plugin</artifactId>
79+
<version>${archetype.mvn.plugin.version}</version>
80+
</plugin>
81+
</plugins>
82+
</build>
83+
6684
<profiles>
6785
<profile>
6886
<id>release</id>

‎pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
55
6-
Copyright (c) 2010-2015 Oracle and/or its affiliates. All rights reserved.
6+
Copyright (c) 2010-2016 Oracle and/or its affiliates. All rights reserved.
77
88
The contents of this file are subject to the terms of either the GNU
99
General Public License Version 2 only ("GPL") or the Common Development
@@ -1803,6 +1803,8 @@
18031803
</dependencyManagement>
18041804

18051805
<properties>
1806+
<archetype.mvn.plugin.version>2.4</archetype.mvn.plugin.version>
1807+
18061808
<findbugs.skip>false</findbugs.skip>
18071809
<findbugs.threshold>Low</findbugs.threshold>
18081810
<!-- the exclude file cannot be here directly, as FindBugs would interpret the path as relative to

0 commit comments

Comments
 (0)