Skip to content

Commit 010ee07

Browse files
authored
Merge pull request #7 from adrienlauer/resource-deletion
Handle resource deletion
2 parents 9008c97 + f067120 commit 010ee07

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+248
-207
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ sudo: false
22

33
language: java
44

5-
jdk: oraclejdk9
5+
jdk: openjdk11
66

77
cache:
88
directories: "$HOME/.m2/repository"

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Version 2.7.3 (2018-12-04)
2+
3+
* [chg] Built and tested with OpenJDK 11 (minimum Java version still being 8).
4+
* [fix] Properly handle resource deletion.
5+
16
# Version 2.7.2 (2018-10-18)
27

38
* [fix] In watch goal, resources (including static resources under `META-INF/resources`) are now properly updated on change.

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
4+
Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
55
66
This Source Code Form is subject to the terms of the Mozilla Public
77
License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -14,12 +14,12 @@
1414
<parent>
1515
<groupId>org.seedstack.poms</groupId>
1616
<artifactId>parent-internal</artifactId>
17-
<version>3.1.0</version>
17+
<version>3.4.3-SNAPSHOT</version>
1818
</parent>
1919

2020
<groupId>org.seedstack</groupId>
2121
<artifactId>seedstack-maven-plugin</artifactId>
22-
<version>2.7.2-SNAPSHOT</version>
22+
<version>2.7.3-SNAPSHOT</version>
2323
<packaging>maven-plugin</packaging>
2424

2525
<properties>

src/license/THIRD-PARTY.properties

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
2-
#-------------------------------------------------------------------------------
3-
# Already used licenses in project :
4-
# - Apache 2
5-
# - BSD
6-
# - CDDL 1.0
7-
# - CPL 1.0
8-
# - EPL 1.0
9-
# - MIT
10-
# - MPL
11-
# - Public Domain
12-
#-------------------------------------------------------------------------------
13-
# Please fill the missing licenses for dependencies :
14-
#
15-
#
16-
#Wed Oct 17 15:28:47 CEST 2018
17-
classworlds--classworlds--1.1-alpha-2=
18-
org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=
19-
jdom--jdom--1.0=
20-
org.codehaus.plexus--plexus-component-api--1.0-alpha-16=
21-
org.codehaus.plexus--plexus-interactivity-api--1.0-alpha-6=
22-
oro--oro--2.0.8=
23-
dom4j--dom4j--1.6.1=
1+
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
2+
#-------------------------------------------------------------------------------
3+
# Already used licenses in project :
4+
# - Apache 2
5+
# - BSD
6+
# - CDDL 1.0
7+
# - CPL 1.0
8+
# - EPL 1.0
9+
# - MIT
10+
# - MPL
11+
# - Public Domain
12+
#-------------------------------------------------------------------------------
13+
# Please fill the missing licenses for dependencies :
14+
#
15+
#
16+
#Tue Dec 04 16:12:43 CET 2018
17+
classworlds--classworlds--1.1-alpha-2=
18+
org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=
19+
jdom--jdom--1.0=
20+
org.codehaus.plexus--plexus-component-api--1.0-alpha-16=
21+
org.codehaus.plexus--plexus-interactivity-api--1.0-alpha-6=
22+
oro--oro--2.0.8=
23+
dom4j--dom4j--1.6.1=

src/main/java/SeedStackCaplet.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
/**
2-
* Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
1+
/*
2+
* Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
33
*
44
* This Source Code Form is subject to the terms of the Mozilla Public
55
* License, v. 2.0. If a copy of the MPL was not distributed with this
66
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
77
*/
8-
98
import java.io.File;
109
import java.net.URLDecoder;
1110
import java.nio.file.Path;

src/main/java/org/seedstack/maven/AbstractExecutableMojo.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
/**
2-
* Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
1+
/*
2+
* Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
33
*
44
* This Source Code Form is subject to the terms of the Mozilla Public
55
* License, v. 2.0. If a copy of the MPL was not distributed with this
66
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
77
*/
8-
98
package org.seedstack.maven;
109

1110
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

src/main/java/org/seedstack/maven/AbstractSeedStackMojo.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
/**
2-
* Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
1+
/*
2+
* Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
33
*
44
* This Source Code Form is subject to the terms of the Mozilla Public
55
* License, v. 2.0. If a copy of the MPL was not distributed with this
66
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
77
*/
8-
98
package org.seedstack.maven;
109

1110
import java.io.File;

src/main/java/org/seedstack/maven/ConfigMojo.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
/**
2-
* Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
1+
/*
2+
* Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
33
*
44
* This Source Code Form is subject to the terms of the Mozilla Public
55
* License, v. 2.0. If a copy of the MPL was not distributed with this
66
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
77
*/
8-
98
package org.seedstack.maven;
109

1110
import org.apache.maven.plugin.MojoExecutionException;

src/main/java/org/seedstack/maven/Context.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
/**
2-
* Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
1+
/*
2+
* Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
33
*
44
* This Source Code Form is subject to the terms of the Mozilla Public
55
* License, v. 2.0. If a copy of the MPL was not distributed with this
66
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
77
*/
8-
98
package org.seedstack.maven;
109

1110
import java.io.File;

src/main/java/org/seedstack/maven/CryptMojo.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
/**
2-
* Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
1+
/*
2+
* Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
33
*
44
* This Source Code Form is subject to the terms of the Mozilla Public
55
* License, v. 2.0. If a copy of the MPL was not distributed with this
66
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
77
*/
8-
98
package org.seedstack.maven;
109

1110
import org.apache.maven.plugin.MojoExecutionException;

0 commit comments

Comments
 (0)