You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by el...@apache.org on 2016/03/08 22:03:17 UTC

[4/7] calcite git commit: Revert "Remove remote resources plugin configuration."

Revert "Remove remote resources plugin configuration."

This reverts commit c9638d6b0b414aad092e2a40da4ab0c61b309b8e.


Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/26f56a17
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/26f56a17
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/26f56a17

Branch: refs/heads/remote-resources-fixes
Commit: 26f56a17b48bf0c3536eb2b0cfd02f3799e16ab6
Parents: 290af1c
Author: Josh Elser <el...@apache.org>
Authored: Tue Mar 8 14:06:43 2016 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Tue Mar 8 14:06:43 2016 -0500

----------------------------------------------------------------------
 avatica/pom.xml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/calcite/blob/26f56a17/avatica/pom.xml
----------------------------------------------------------------------
diff --git a/avatica/pom.xml b/avatica/pom.xml
index c245bfa..f383a35 100644
--- a/avatica/pom.xml
+++ b/avatica/pom.xml
@@ -279,6 +279,32 @@ limitations under the License.
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>root-resources</id>
+            <goals>
+              <goal>process</goal>
+            </goals>
+            <configuration>
+              <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+              <resourceBundles>
+                <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+              </resourceBundles>
+            </configuration>
+          </execution>
+          <execution>
+            <id>non-root-resources</id>
+            <configuration>
+              <resourceBundles>
+                <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+              </resourceBundles>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>