You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2017/11/06 22:17:24 UTC
[23/35] roller git commit: Ensure that roller.properties is not
"filtered" by the Maven resources plugin,
and that the version file *is* filtered.
Ensure that roller.properties is not "filtered" by the Maven resources plugin, and that the version file *is* filtered.
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/079f76b8
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/079f76b8
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/079f76b8
Branch: refs/heads/master
Commit: 079f76b8e564c39ff776a6da92990ec413778ec5
Parents: b279f67
Author: Dave Johnson <sn...@gmail.com>
Authored: Sun Oct 8 15:19:51 2017 -0400
Committer: Dave Johnson <sn...@gmail.com>
Committed: Sun Oct 8 15:19:51 2017 -0400
----------------------------------------------------------------------
app/pom.xml | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/079f76b8/app/pom.xml
----------------------------------------------------------------------
diff --git a/app/pom.xml b/app/pom.xml
index 1875d32..1aa7903 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -359,13 +359,6 @@ limitations under the License.
<dependency>
<groupId>com.rometools</groupId>
- <artifactId>rome-fetcher</artifactId>
- <version>${rome.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>com.rometools</groupId>
<artifactId>rome-propono</artifactId>
<version>${rome.version}</version>
<scope>compile</scope>
@@ -534,7 +527,7 @@ limitations under the License.
<resources>
<resource>
<directory>src/main/resources</directory>
- <filtering>true</filtering>
+ <filtering>false</filtering>
</resource>
</resources>
</configuration>
@@ -703,7 +696,7 @@ limitations under the License.
</resource>
<resource>
<!-- ensure version gets substitution -->
- <directory>${project.basedir}/src/main/resources</directory>
+ <directory>${project.basedir}/src/main/resources-filtered</directory>
<filtering>true</filtering>
<includes>
<include>roller-version.properties</include>