[maven-resources-plugin] branch master updated (8687df9 -> aeaff27)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Jul 18 07:21:58 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a change to branch master
in repository maven-resources-plugin.
from 8687df9 Upload to unstable
new 1f0d53d Standards-Version updated to 4.0.0
new 366638e Switch to debhelper level 10
new df07cca Use secure Vcs-* URLs
adds ac25cb6 New upstream version 2.7
new 4c91148 Updated version 2.7 from 'upstream/2.7'
new fdbeb70 Refreshed the patch
adds 929e807 New upstream version 3.0.0
new f55bb9b Updated version 3.0.0 from 'upstream/3.0.0'
new e423aad Depend on libmaven3-core-java instead of libmaven2-core-java
new 89563ac New build dependency on junit4
new cf7ddb9 Relocate the version 2.6 used by Maven 3.1.1+ to the current one
new 1b2ae89 Depend on libmaven-filtering-java (>= 3.1.0)
new 4ad136a Depend on libmaven-plugin-testing-java (>= 2.1)
new e364c45 Removed 01-ignore-failing-tests.patch (fixed upstream)
new aeaff27 Upload to unstable
The 13 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
debian/changelog | 16 ++
debian/compat | 2 +-
debian/control | 17 +-
debian/libmaven-resources-plugin-java.poms | 2 +-
debian/maven.rules | 10 +
debian/patches/01-ignore-failing-tests.patch | 15 --
debian/patches/02-aether-compatibility.patch | 14 +
debian/patches/series | 3 +-
debian/rules | 4 +-
deploySite.sh | 23 ++
pom.xml | 120 ++++-----
.../src/main/resources/test.properties | 17 ++
src/it/MRESOURCES-105/my.properties | 17 ++
.../src/main/resources/test.properties | 17 ++
src/it/MRESOURCES-106/pom.xml | 2 +-
src/it/MRESOURCES-106/src/main/resources/file.txt | 17 ++
.../src/main/resources/filter.properties | 17 ++
.../src/main/resources/mresources-110.xml | 20 ++
src/it/MRESOURCES-131/pom.xml | 2 +-
.../MRESOURCES-131/src/test/resources/skipped.txt | 17 ++
src/it/MRESOURCES-166/pom.xml | 2 +-
.../MRESOURCES-166/src/main/resources/resource.txt | 17 ++
src/it/MRESOURCES-18/invoker.properties | 17 ++
.../src/main/resources/test.properties | 17 ++
.../java/org/apache/maven/it0105/FilterTest.java | 20 ++
src/it/MRESOURCES-18/test.properties | 17 ++
src/it/MRESOURCES-20/pom.xml | 2 +-
.../MRESOURCES-20/src/main/resources/resource.txt | 17 ++
src/it/MRESOURCES-77/pom.xml | 2 +-
.../src/main/filters/custom-filters.properties | 17 ++
.../src/main/filters/filter2.properties | 17 ++
.../src/main/filters/filter3.properties | 17 ++
src/it/MRESOURCES-77/src/main/filters/my.filter | 16 ++
.../src/main/resources/SomeResource.txt | 16 ++
src/it/MRESOURCES-78/pom.xml | 2 +-
.../src/main/filtered/filtered.properties | 17 ++
.../src/main/resources/unfiltered.properties | 17 ++
src/it/{MRESOURCES-20 => MRESOURCES-99}/pom.xml | 8 +-
.../src/main/resources/SomeResource.txt | 28 ++
src/it/MRESOURCES-99/verify.groovy | 147 ++++++++++
src/it/binaries-filtering/pom.xml | 4 +-
.../binaries-filtering/src/main/resources/file.txt | 17 ++
src/it/copy-resources-it/pom.xml | 2 +-
.../configuration.properties | 17 ++
.../src/main/filters/filter2.properties | 17 ++
src/it/custom-delimiter/src/main/filters/my.filter | 16 ++
.../src/main/resources/SomeResource.txt | 16 ++
src/it/escapeInterpolation/pom.xml | 2 +-
.../escapeInterpolation/src/main/filters/my.filter | 16 ++
.../src/main/resources/SomeResource.txt | 16 ++
.../escapeInterpolation/src/test/filters/my.filter | 16 ++
.../src/test/resources/SomeResource.txt | 16 ++
src/it/{MRESOURCES-20 => filter-filenames}/pom.xml | 7 +-
.../src/main/resources/${project.artifactId}.txt | 19 ++
.../src/main/resources/${project.version}.txt | 19 ++
.../verify.groovy} | 49 +---
src/it/filter-test-resources/pom.xml | 2 +-
.../src/test/filters/my.filter | 16 ++
.../src/test/resources/SomeResource.txt | 16 ++
src/it/filter/pom.xml | 2 +-
src/it/filter/src/main/filters/filter2.properties | 17 ++
src/it/filter/src/main/filters/filter3.properties | 17 ++
src/it/filter/src/main/filters/my.filter | 16 ++
src/it/filter/src/main/resources/SomeResource.txt | 16 ++
.../{MRESOURCES-166 => include-git-ignore}/pom.xml | 18 +-
src/it/include-git-ignore/setup.bsh | 88 ++++++
.../verify.bsh | 34 ++-
src/it/includeEmptyDirs/pom.xml | 4 +-
src/it/includeEmptyDirs/src/main/filters/my.filter | 16 ++
.../src/main/resources/SomeResource.txt | 16 ++
src/it/profile-override/invoker.properties | 17 ++
src/it/profile-override/pom.xml | 2 +-
.../main/resources/production/config.properties | 17 ++
.../src/main/resources/test/config.properties | 17 ++
src/it/{MRESOURCES-20 => skip-yes}/pom.xml | 7 +-
.../skip-yes/src/main/resources/test-resource.txt | 17 ++
src/it/{MRESOURCES-131 => skip-yes}/verify.groovy | 6 +-
src/it/user-filters/invoker.properties | 17 ++
src/it/user-filters/pom.xml | 4 +-
.../src/main/filtered/filtered.properties | 17 ++
.../src/main/resources/unfiltered.properties | 17 ++
src/it/user-filters/test.properties | 17 ++
.../maven/plugin/resources/PropertyUtils.java | 202 --------------
.../plugin/resources/ReflectionProperties.java | 76 ------
.../resources/CopyResourcesMojo.java | 28 +-
.../plugins/resources/MavenBuildTimestamp.java | 113 ++++++++
.../{plugin => plugins}/resources/Resource.java | 2 +-
.../resources/ResourcesMojo.java | 300 +++++++++++++++------
.../resources/TestResourcesMojo.java | 12 +-
src/site/apt/examples/binaries-filtering.apt.vm | 11 +-
.../apt/examples/custom-resource-filters.apt.vm | 23 +-
src/site/apt/examples/encoding.apt.vm | 29 +-
src/site/apt/examples/filter.apt | 30 +--
src/site/apt/{index.apt => index.apt.vm} | 14 +-
src/site/resources/download.cgi | 22 ++
src/site/site.xml | 6 +-
src/site/xdoc/download.xml.vm | 126 +++++++++
.../plugin/resources/AdvancePropertyUtilsTest.java | 119 --------
.../resources/EnhancedPropertyUtilsTest.java | 118 --------
.../plugin/resources/ReflectionPropertiesTest.java | 80 ------
.../resources/AbstractPropertyUtilsTest.java | 22 +-
.../resources/BasicPropertyUtilsTest.java | 38 +--
.../resources/CopyResourcesMojoTest.java | 9 +-
.../resources/PropertyUtilsExceptionTest.java} | 43 +--
.../resources/ResourcesMojoTest.java | 212 ++++++++++-----
.../resources/TestResourcesTest.java | 16 +-
.../resources/filters/ItFilter.java | 43 +--
.../resources/stub/MavenProjectBasicStub.java | 2 +-
.../resources/stub/MavenProjectBuildStub.java | 36 +--
.../resources/stub/MavenProjectResourcesStub.java | 2 +-
.../unit/propertiesutils-test/advance.properties | 17 ++
.../advance_validation.properties | 17 ++
.../unit/propertiesutils-test/basic.properties | 17 ++
.../basic_validation.properties | 17 ++
.../unit/propertiesutils-test/enhanced.properties | 17 ++
.../enhanced_validation.properties | 17 ++
.../validation.properties | 17 ++
.../validation_escapebackslashinpath.properties | 17 ++
.../unit/resources-test/validation.properties | 17 ++
.../copy-resources-test/filter-files/filter.txt | 17 ++
.../no-filter/config.properties | 17 ++
121 files changed, 2230 insertions(+), 1138 deletions(-)
delete mode 100644 debian/patches/01-ignore-failing-tests.patch
create mode 100644 debian/patches/02-aether-compatibility.patch
create mode 100755 deploySite.sh
copy src/it/{MRESOURCES-20 => MRESOURCES-99}/pom.xml (88%)
create mode 100644 src/it/MRESOURCES-99/src/main/resources/SomeResource.txt
create mode 100644 src/it/MRESOURCES-99/verify.groovy
copy src/it/{MRESOURCES-20 => filter-filenames}/pom.xml (87%)
create mode 100644 src/it/filter-filenames/src/main/resources/${project.artifactId}.txt
create mode 100644 src/it/filter-filenames/src/main/resources/${project.version}.txt
copy src/it/{MRESOURCES-131/src/test/java/org/apache/maven/plugins/resources/it/AppTest.java => filter-filenames/verify.groovy} (52%)
copy src/it/{MRESOURCES-166 => include-git-ignore}/pom.xml (81%)
create mode 100644 src/it/include-git-ignore/setup.bsh
copy src/it/{copy-resources-it => include-git-ignore}/verify.bsh (52%)
copy src/it/{MRESOURCES-20 => skip-yes}/pom.xml (88%)
create mode 100644 src/it/skip-yes/src/main/resources/test-resource.txt
copy src/it/{MRESOURCES-131 => skip-yes}/verify.groovy (86%)
delete mode 100644 src/main/java/org/apache/maven/plugin/resources/PropertyUtils.java
delete mode 100644 src/main/java/org/apache/maven/plugin/resources/ReflectionProperties.java
rename src/main/java/org/apache/maven/{plugin => plugins}/resources/CopyResourcesMojo.java (75%)
create mode 100644 src/main/java/org/apache/maven/plugins/resources/MavenBuildTimestamp.java
rename src/main/java/org/apache/maven/{plugin => plugins}/resources/Resource.java (95%)
rename src/main/java/org/apache/maven/{plugin => plugins}/resources/ResourcesMojo.java (54%)
rename src/main/java/org/apache/maven/{plugin => plugins}/resources/TestResourcesMojo.java (90%)
rename src/site/apt/{index.apt => index.apt.vm} (94%)
create mode 100644 src/site/resources/download.cgi
create mode 100644 src/site/xdoc/download.xml.vm
delete mode 100644 src/test/java/org/apache/maven/plugin/resources/AdvancePropertyUtilsTest.java
delete mode 100644 src/test/java/org/apache/maven/plugin/resources/EnhancedPropertyUtilsTest.java
delete mode 100644 src/test/java/org/apache/maven/plugin/resources/ReflectionPropertiesTest.java
rename src/test/java/org/apache/maven/{plugin => plugins}/resources/AbstractPropertyUtilsTest.java (86%)
rename src/test/java/org/apache/maven/{plugin => plugins}/resources/BasicPropertyUtilsTest.java (80%)
rename src/test/java/org/apache/maven/{plugin => plugins}/resources/CopyResourcesMojoTest.java (89%)
copy src/{it/MRESOURCES-131/src/test/java/org/apache/maven/plugins/resources/it/AppTest.java => test/java/org/apache/maven/plugins/resources/PropertyUtilsExceptionTest.java} (57%)
rename src/test/java/org/apache/maven/{plugin => plugins}/resources/ResourcesMojoTest.java (78%)
rename src/test/java/org/apache/maven/{plugin => plugins}/resources/TestResourcesTest.java (90%)
rename src/test/java/org/apache/maven/{plugin => plugins}/resources/filters/ItFilter.java (57%)
rename src/test/java/org/apache/maven/{plugin => plugins}/resources/stub/MavenProjectBasicStub.java (98%)
rename src/test/java/org/apache/maven/{plugin => plugins}/resources/stub/MavenProjectBuildStub.java (89%)
rename src/test/java/org/apache/maven/{plugin => plugins}/resources/stub/MavenProjectResourcesStub.java (98%)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-resources-plugin.git
More information about the pkg-java-commits
mailing list