From c6b9c7cd438fa7b41e55f9f2160c8428aa2807b5 Mon Sep 17 00:00:00 2001
From: Stephen Connolly <stephen.alan.connolly@gmail.com>
Date: Mon, 4 Jul 2011 22:18:18 +0100
Subject: [PATCH] faster resource handling

---
 core/pom.xml                                   | 18 ------------------
 .../hudson/model/hudson-version.properties     |  0
 .../jenkins/model/jenkins-version.properties   |  0
 pom.xml                                        | 10 ++++++++++
 remoting/pom.xml                               | 18 ------------------
 .../hudson/remoting/hudson-version.properties  |  0
 .../remoting/jenkins-version.properties        |  0
 7 files changed, 10 insertions(+), 36 deletions(-)
 rename core/src/{main => filter}/resources/hudson/model/hudson-version.properties (100%)
 rename core/src/{main => filter}/resources/jenkins/model/jenkins-version.properties (100%)
 rename remoting/src/{main => filter}/resources/hudson/remoting/hudson-version.properties (100%)
 rename remoting/src/{main => filter}/resources/jenkins/remoting/jenkins-version.properties (100%)

diff --git a/core/pom.xml b/core/pom.xml
index e94000b7a5..fc28c1ab80 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -510,24 +510,6 @@ THE SOFTWARE.
   </dependencies>
 
   <build>
-    <resources>
-      <resource>
-        <directory>${basedir}/src/main/resources</directory>
-        <filtering>false</filtering>
-        <excludes>
-          <exclude>hudson/model/hudson-version.properties</exclude>
-          <exclude>jenkins/model/jenkins-version.properties</exclude>
-        </excludes>
-      </resource>
-      <resource>
-        <directory>${basedir}/src/main/resources</directory>
-        <filtering>true</filtering>
-        <includes>
-          <include>hudson/model/hudson-version.properties</include>
-          <include>jenkins/model/jenkins-version.properties</include>
-        </includes>
-      </resource>
-    </resources>
     <plugins>
       <plugin>
         <groupId>org.jenkins-ci.tools</groupId>
diff --git a/core/src/main/resources/hudson/model/hudson-version.properties b/core/src/filter/resources/hudson/model/hudson-version.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/hudson-version.properties
rename to core/src/filter/resources/hudson/model/hudson-version.properties
diff --git a/core/src/main/resources/jenkins/model/jenkins-version.properties b/core/src/filter/resources/jenkins/model/jenkins-version.properties
similarity index 100%
rename from core/src/main/resources/jenkins/model/jenkins-version.properties
rename to core/src/filter/resources/jenkins/model/jenkins-version.properties
diff --git a/pom.xml b/pom.xml
index bbebbb3748..55ab22183f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,6 +150,16 @@ THE SOFTWARE.
 
   <build>
     <defaultGoal>install</defaultGoal>
+    <resources>
+      <resource>
+        <directory>${basedir}/src/main/resources</directory>
+        <filtering>false</filtering>
+      </resource>
+      <resource>
+        <directory>${basedir}/src/filter/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
     <pluginManagement>
       <plugins>
         <plugin>
diff --git a/remoting/pom.xml b/remoting/pom.xml
index 4cd57582e1..5d24b110ea 100644
--- a/remoting/pom.xml
+++ b/remoting/pom.xml
@@ -75,24 +75,6 @@ THE SOFTWARE.
   </dependencies>
 
   <build>
-    <resources>
-      <resource>
-        <directory>${basedir}/src/main/resources</directory>
-        <filtering>false</filtering>
-        <excludes>
-          <exclude>hudson/remoting/hudson-version.properties</exclude>
-          <exclude>jenkins/remoting/jenkins-version.properties</exclude>
-        </excludes>
-      </resource>
-      <resource>
-        <directory>${basedir}/src/main/resources</directory>
-        <filtering>true</filtering>
-        <includes>
-          <include>hudson/remoting/hudson-version.properties</include>
-          <include>jenkins/remoting/jenkins-version.properties</include>
-        </includes>
-      </resource>
-    </resources>
     <plugins>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
diff --git a/remoting/src/main/resources/hudson/remoting/hudson-version.properties b/remoting/src/filter/resources/hudson/remoting/hudson-version.properties
similarity index 100%
rename from remoting/src/main/resources/hudson/remoting/hudson-version.properties
rename to remoting/src/filter/resources/hudson/remoting/hudson-version.properties
diff --git a/remoting/src/main/resources/jenkins/remoting/jenkins-version.properties b/remoting/src/filter/resources/jenkins/remoting/jenkins-version.properties
similarity index 100%
rename from remoting/src/main/resources/jenkins/remoting/jenkins-version.properties
rename to remoting/src/filter/resources/jenkins/remoting/jenkins-version.properties
-- 
GitLab