diff --git a/uportal-portlets-overlay/AnnouncementsPortlet/pom.xml b/uportal-portlets-overlay/AnnouncementsPortlet/pom.xml
index e34cfd25140..0aea3351459 100644
--- a/uportal-portlets-overlay/AnnouncementsPortlet/pom.xml
+++ b/uportal-portlets-overlay/AnnouncementsPortlet/pom.xml
@@ -38,18 +38,34 @@
         </filters>
         <resources>
             <resource>
+                <filtering>false</filtering>
                 <directory>src/main/resources</directory>
+                <excludes>
+                    <!-- This list needs to be identical to the one below...  -->
+                    <exclude>*.properties</exclude>
+                    <exclude>logback.xml</exclude>
+                </excludes>
+            </resource>
+            <resource>
                 <filtering>true</filtering>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <!-- List files or patterns to be filtered here. Restrict the list to avoid accidentally
+                         substituting maven or other environmental tokens in other files.-->
+                    <include>*.properties</include>
+                    <include>logback.xml</include>
+                </includes>
             </resource>
         </resources>
         <plugins>
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
-                    <filters>
-                        <filter>${basedir}/../../${filters.file}</filter>
-                    </filters>
-                    <!-- A side effect of this exclude is we'll retain META-INF/context.xml (META-INF is excluded by default) -->
+                    <!-- Remove the dependent war's hsqldb jar so we can use the jdbc artifact configured above as a dependency.
+                         A side effect of this exclude is we'll retain META-INF/context.xml (META-INF is excluded by default).
+                         Context.xml is important because it allows the ResourceUrl to 'see' the ResourceServingWebapp
+                         to determine if a resource is available there, which allows for browser caching of common
+                         libraries -->
                     <dependentWarExcludes>
                         WEB-INF/lib/hsqldb-*.jar
                     </dependentWarExcludes>
diff --git a/uportal-portlets-overlay/BookmarksPortlet/pom.xml b/uportal-portlets-overlay/BookmarksPortlet/pom.xml
index 28853095cab..d532353660f 100644
--- a/uportal-portlets-overlay/BookmarksPortlet/pom.xml
+++ b/uportal-portlets-overlay/BookmarksPortlet/pom.xml
@@ -37,17 +37,29 @@
         </filters>
         <resources>
             <resource>
+                <filtering>false</filtering>
                 <directory>src/main/resources</directory>
+                <excludes>
+                    <!-- This list needs to be identical to the one below...  -->
+                    <exclude>*.properties</exclude>
+                    <exclude>logback.xml</exclude>
+                </excludes>
+            </resource>
+            <resource>
                 <filtering>true</filtering>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <!-- List files or patterns to be filtered here. Restrict the list to avoid accidentally
+                         substituting maven or other environmental tokens in other files.-->
+                    <include>*.properties</include>
+                    <include>logback.xml</include>
+                </includes>
             </resource>
         </resources>
         <plugins>
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
-                    <filters>
-                        <filter>${basedir}/../../${filters.file}</filter>
-                    </filters>
                     <webResources>
                         <resource>
                             <directory>${basedir}/src/main/webapp/WEB-INF</directory>
@@ -59,6 +71,11 @@
                         <overlay>
                             <groupId>org.jasig.portlet</groupId>
                             <artifactId>BookmarksPortlet</artifactId>
+                            <!-- Remove the dependent war's hsqldb jar so we can use the jdbc artifact configured above as a dependency.
+                                 A side effect of this exclude is we'll retain META-INF/context.xml (META-INF is excluded by default).
+                                 Context.xml is important because it allows the ResourceUrl to 'see' the ResourceServingWebapp
+                                 to determine if a resource is available there, which allows for browser caching of common
+                                 libraries -->
                             <excludes>
                                 <exclude>WEB-INF/tags/uwfn.tld</exclude>
                                 <exclude>WEB-INF/lib/hsqldb-*.jar</exclude>
diff --git a/uportal-portlets-overlay/CalendarPortlet/pom.xml b/uportal-portlets-overlay/CalendarPortlet/pom.xml
index e1091bb825b..68a4a40efc5 100644
--- a/uportal-portlets-overlay/CalendarPortlet/pom.xml
+++ b/uportal-portlets-overlay/CalendarPortlet/pom.xml
@@ -55,18 +55,34 @@
         </filters>
         <resources>
             <resource>
+                <filtering>false</filtering>
                 <directory>src/main/resources</directory>
+                <excludes>
+                    <!-- This list needs to be identical to the one below...  -->
+                    <exclude>*.properties</exclude>
+                    <exclude>logback.xml</exclude>
+                </excludes>
+            </resource>
+            <resource>
                 <filtering>true</filtering>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <!-- List files or patterns to be filtered here. Restrict the list to avoid accidentally
+                         substituting maven or other environmental tokens in other files.-->
+                    <include>*.properties</include>
+                    <include>logback.xml</include>
+                </includes>
             </resource>
         </resources>
         <plugins>
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
-                    <filters>
-                        <filter>${basedir}/../../${filters.file}</filter>
-                    </filters>
-                    <!-- A side effect of this exclude is we'll retain META-INF/context.xml (META-INF is excluded by default) -->
+                    <!-- Remove the dependent war's hsqldb jar so we can use the jdbc artifact configured above as a dependency.
+                         A side effect of this exclude is we'll retain META-INF/context.xml (META-INF is excluded by default).
+                         Context.xml is important because it allows the ResourceUrl to 'see' the ResourceServingWebapp
+                         to determine if a resource is available there, which allows for browser caching of common
+                         libraries -->
                     <dependentWarExcludes>
                         WEB-INF/lib/hsqldb-*.jar
                     </dependentWarExcludes>
diff --git a/uportal-portlets-overlay/NewsReaderPortlet/pom.xml b/uportal-portlets-overlay/NewsReaderPortlet/pom.xml
index 2bbd87dac52..9c37e45d468 100644
--- a/uportal-portlets-overlay/NewsReaderPortlet/pom.xml
+++ b/uportal-portlets-overlay/NewsReaderPortlet/pom.xml
@@ -54,15 +54,34 @@
         </filters>
         <resources>
             <resource>
+                <filtering>false</filtering>
                 <directory>src/main/resources</directory>
+                <excludes>
+                    <!-- This list needs to be identical to the one below...  -->
+                    <exclude>*.properties</exclude>
+                    <exclude>logback.xml</exclude>
+                </excludes>
+            </resource>
+            <resource>
                 <filtering>true</filtering>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <!-- List files or patterns to be filtered here. Restrict the list to avoid accidentally
+                         substituting maven or other environmental tokens in other files.-->
+                    <include>*.properties</include>
+                    <include>logback.xml</include>
+                </includes>
             </resource>
         </resources>
         <plugins>
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
-                    <!-- A side effect of this exclude is we'll retain META-INF/context.xml (META-INF is excluded by default) -->
+                    <!-- Remove the dependent war's hsqldb jar so we can use the jdbc artifact configured above as a dependency.
+                         A side effect of this exclude is we'll retain META-INF/context.xml (META-INF is excluded by default).
+                         Context.xml is important because it allows the ResourceUrl to 'see' the ResourceServingWebapp
+                         to determine if a resource is available there, which allows for browser caching of common
+                         libraries -->
                     <dependentWarExcludes>
                         WEB-INF/lib/hsqldb-*.jar
                     </dependentWarExcludes>
diff --git a/uportal-portlets-overlay/NotificationPortlet/pom.xml b/uportal-portlets-overlay/NotificationPortlet/pom.xml
index 8680ad59953..f9af698d31b 100644
--- a/uportal-portlets-overlay/NotificationPortlet/pom.xml
+++ b/uportal-portlets-overlay/NotificationPortlet/pom.xml
@@ -46,14 +46,17 @@
                 <excludes>
                     <!-- This list needs to be identical to the one below...  -->
                     <exclude>*.properties</exclude>
+                    <exclude>logback.xml</exclude>
                 </excludes>
             </resource>
             <resource>
                 <filtering>true</filtering>
                 <directory>src/main/resources</directory>
                 <includes>
-                    <!-- List files or patterns to be filtered here...  -->
+                    <!-- List files or patterns to be filtered here. Restrict the list to avoid accidentally
+                         substituting maven or other environmental tokens in other files.-->
                     <include>*.properties</include>
+                    <include>logback.xml</include>
                 </includes>
             </resource>
         </resources>
@@ -62,10 +65,11 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
-                    <!-- Define an exclude to insure we retain META-INF/context.xml (META-INF is excluded by default) -->
-                    <dependentWarExcludes>
-                        WEB-INF/lib/hsqldb-*.jar
-                    </dependentWarExcludes>
+                    <!-- By specifying an exclude we'll retain META-INF/context.xml (META-INF is excluded by default).
+                         Context.xml is important because it allows the ResourceUrl to 'see' the ResourceServingWebapp
+                         to determine if a resource is available there, which allows for browser caching of common
+                         libraries -->
+                    <dependentWarExcludes>junkname.jar</dependentWarExcludes>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/uportal-portlets-overlay/SimpleContentPortlet/pom.xml b/uportal-portlets-overlay/SimpleContentPortlet/pom.xml
index fbefb246d20..4d38d5d6872 100644
--- a/uportal-portlets-overlay/SimpleContentPortlet/pom.xml
+++ b/uportal-portlets-overlay/SimpleContentPortlet/pom.xml
@@ -22,6 +22,14 @@
             <version>${SimpleContentPortlet.version}</version>
             <type>war</type>
         </dependency>
+
+        <dependency>
+            <groupId>${jdbc.groupId}</groupId>
+            <artifactId>${jdbc.artifactId}</artifactId>
+            <version>${jdbc.version}</version>
+            <scope>compile</scope>
+        </dependency>
+
     </dependencies>
     
 
@@ -30,16 +38,35 @@
             <filter>../../${filters.file}</filter>
         </filters>
         <resources>
+            <resource>
+                <filtering>false</filtering>
+                <directory>src/main/resources</directory>
+                <excludes>
+                    <!-- This list needs to be identical to the one below...  -->
+                    <exclude>*.properties</exclude>
+                    <exclude>logback.xml</exclude>
+                </excludes>
+            </resource>
             <resource>
                 <filtering>true</filtering>
                 <directory>src/main/resources</directory>
+                <includes>
+                    <!-- List files or patterns to be filtered here. Restrict the list to avoid accidentally
+                         substituting maven or other environmental tokens in other files.-->
+                    <include>*.properties</include>
+                    <include>logback.xml</include>
+                </includes>
             </resource>
         </resources>
         <plugins>
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
-                    <!-- A side effect of this exclude is we'll retain META-INF/context.xml (META-INF is excluded by default) -->
+                    <!-- Remove the dependent war's hsqldb jar so we can use the jdbc artifact configured above as a dependency.
+                         A side effect of this exclude is we'll retain META-INF/context.xml (META-INF is excluded by default).
+                         Context.xml is important because it allows the ResourceUrl to 'see' the ResourceServingWebapp
+                         to determine if a resource is available there, which allows for browser caching of common
+                         libraries -->
                     <dependentWarExcludes>
                         WEB-INF/lib/hsqldb-*.jar
                     </dependentWarExcludes>
diff --git a/uportal-portlets-overlay/WeatherPortlet/pom.xml b/uportal-portlets-overlay/WeatherPortlet/pom.xml
index 50d1ead9f29..026887db9be 100644
--- a/uportal-portlets-overlay/WeatherPortlet/pom.xml
+++ b/uportal-portlets-overlay/WeatherPortlet/pom.xml
@@ -32,8 +32,23 @@
         </filters>
         <resources>
             <resource>
+                <filtering>false</filtering>
                 <directory>src/main/resources</directory>
+                <excludes>
+                    <!-- This list needs to be identical to the one below...  -->
+                    <exclude>*.properties</exclude>
+                    <exclude>logback.xml</exclude>
+                </excludes>
+            </resource>
+            <resource>
                 <filtering>true</filtering>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <!-- List files or patterns to be filtered here. Restrict the list to avoid accidentally
+                         substituting maven or other environmental tokens in other files.-->
+                    <include>*.properties</include>
+                    <include>logback.xml</include>
+                </includes>
             </resource>
         </resources>
         <plugins>
@@ -41,10 +56,11 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
-                    <!-- Define an exclude to insure we retain META-INF/context.xml (META-INF is excluded by default) -->
-                    <dependentWarExcludes>
-                        WEB-INF/lib/hsqldb-*.jar
-                    </dependentWarExcludes>
+                    <!-- By specifying an exclude we'll retain META-INF/context.xml (META-INF is excluded by default).
+                         Context.xml is important because it allows the ResourceUrl to 'see' the ResourceServingWebapp
+                         to determine if a resource is available there, which allows for browser caching of common
+                         libraries -->
+                    <dependentWarExcludes>junkname.jar</dependentWarExcludes>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/uportal-portlets-overlay/WebProxyPortlet/pom.xml b/uportal-portlets-overlay/WebProxyPortlet/pom.xml
index 2166fcefc04..18ffdd81dd1 100644
--- a/uportal-portlets-overlay/WebProxyPortlet/pom.xml
+++ b/uportal-portlets-overlay/WebProxyPortlet/pom.xml
@@ -37,19 +37,35 @@
             <filter>../../${filters.file}</filter>
         </filters>
         <resources>
+            <resource>
+                <filtering>false</filtering>
+                <directory>src/main/resources</directory>
+                <excludes>
+                    <!-- This list needs to be identical to the one below...  -->
+                    <exclude>*.properties</exclude>
+                    <exclude>logback.xml</exclude>
+                </excludes>
+            </resource>
             <resource>
                 <filtering>true</filtering>
                 <directory>src/main/resources</directory>
+                <includes>
+                    <!-- List files or patterns to be filtered here. Restrict the list to avoid accidentally
+                         substituting maven or other environmental tokens in other files.-->
+                    <include>*.properties</include>
+                    <include>logback.xml</include>
+                </includes>
             </resource>
         </resources>
         <plugins>
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
-                    <filters>
-                        <filter>${basedir}/../../${filters.file}</filter>
-                    </filters>
-                    <!-- A side effect of this exclude is we'll retain META-INF/context.xml (META-INF is excluded by default) -->
+                    <!-- Remove the dependent war's hsqldb jar so we can use the jdbc artifact configured above as a dependency.
+                         A side effect of this exclude is we'll retain META-INF/context.xml (META-INF is excluded by default).
+                         Context.xml is important because it allows the ResourceUrl to 'see' the ResourceServingWebapp
+                         to determine if a resource is available there, which allows for browser caching of common
+                         libraries -->
                     <dependentWarExcludes>
                         WEB-INF/lib/hsqldb-*.jar
                     </dependentWarExcludes>
diff --git a/uportal-portlets-overlay/email-preview/pom.xml b/uportal-portlets-overlay/email-preview/pom.xml
index cf690f58c76..d3c156b538a 100644
--- a/uportal-portlets-overlay/email-preview/pom.xml
+++ b/uportal-portlets-overlay/email-preview/pom.xml
@@ -31,16 +31,35 @@
             <filter>../../${filters.file}</filter>
         </filters>
         <resources>
+            <resource>
+                <filtering>false</filtering>
+                <directory>src/main/resources</directory>
+                <excludes>
+                    <!-- This list needs to be identical to the one below...  -->
+                    <exclude>*.properties</exclude>
+                    <exclude>logback.xml</exclude>
+                </excludes>
+            </resource>
             <resource>
                 <filtering>true</filtering>
                 <directory>src/main/resources</directory>
+                <includes>
+                    <!-- List files or patterns to be filtered here. Restrict the list to avoid accidentally
+                         substituting maven or other environmental tokens in other files.-->
+                    <include>*.properties</include>
+                    <include>logback.xml</include>
+                </includes>
             </resource>
         </resources>
         <plugins>
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
-                    <!-- A side effect of this exclude is we'll retain META-INF/context.xml (META-INF is excluded by default) -->
+                    <!-- Remove the dependent war's hsqldb jar so we can use the jdbc artifact configured above as a dependency.
+                         A side effect of this exclude is we'll retain META-INF/context.xml (META-INF is excluded by default).
+                         Context.xml is important because it allows the ResourceUrl to 'see' the ResourceServingWebapp
+                         to determine if a resource is available there, which allows for browser caching of common
+                         libraries -->
                     <dependentWarExcludes>
                         WEB-INF/lib/hsqldb-*.jar
                     </dependentWarExcludes>
diff --git a/uportal-portlets-overlay/jasig-widget-portlets/pom.xml b/uportal-portlets-overlay/jasig-widget-portlets/pom.xml
index 61969cff64d..a0517f9c164 100644
--- a/uportal-portlets-overlay/jasig-widget-portlets/pom.xml
+++ b/uportal-portlets-overlay/jasig-widget-portlets/pom.xml
@@ -39,22 +39,35 @@
             <filter>../../${filters.file}</filter>
         </filters>
         <resources>
+            <resource>
+                <filtering>false</filtering>
+                <directory>src/main/resources</directory>
+                <excludes>
+                    <!-- This list needs to be identical to the one below...  -->
+                    <exclude>*.properties</exclude>
+                    <exclude>logback.xml</exclude>
+                </excludes>
+            </resource>
             <resource>
                 <filtering>true</filtering>
                 <directory>src/main/resources</directory>
+                <includes>
+                    <!-- List files or patterns to be filtered here. Restrict the list to avoid accidentally
+                         substituting maven or other environmental tokens in other files.-->
+                    <include>*.properties</include>
+                    <include>logback.xml</include>
+                </includes>
             </resource>
         </resources>
         <plugins>
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
-                    <filters>
-                        <filter>${basedir}/../../${filters.file}</filter>
-                    </filters>
-                    <!-- Define an exclude to insure we retain META-INF/context.xml (META-INF is excluded by default) -->
-                    <dependentWarExcludes>
-                        WEB-INF/lib/hsqldb-*.jar
-                    </dependentWarExcludes>
+                    <!-- By specifying an exclude we'll retain META-INF/context.xml (META-INF is excluded by default).
+                         Context.xml is important because it allows the ResourceUrl to 'see' the ResourceServingWebapp
+                         to determine if a resource is available there, which allows for browser caching of common
+                         libraries -->
+                    <dependentWarExcludes>junkname.jar</dependentWarExcludes>
                 </configuration>
             </plugin>
             <plugin>