roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject roller git commit: Ensure that roller.properties is not "filtered" by the Maven resources plugin, and that the version file *is* filtered.
Date Sun, 08 Oct 2017 19:19:53 GMT
Repository: roller
Updated Branches:
  refs/heads/roller-5.2.0 b279f6703 -> 079f76b8e


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/roller-5.2.0
Commit: 079f76b8e564c39ff776a6da92990ec413778ec5
Parents: b279f67
Author: Dave Johnson <snoopdave@gmail.com>
Authored: Sun Oct 8 15:19:51 2017 -0400
Committer: Dave Johnson <snoopdave@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>


Mime
View raw message