You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by ja...@apache.org on 2015/08/23 21:37:40 UTC
[1/2] incubator-calcite git commit: [CALCITE-743] Ensure only a
single source assembly is executed.
Repository: incubator-calcite
Updated Branches:
refs/heads/master 9f1f73d39 -> f8a542740
[CALCITE-743] Ensure only a single source assembly is executed.
Since Calcite has its own assembly, we need to disable the Apache Parent POM assembly since they conflicting instructions.
Project: http://git-wip-us.apache.org/repos/asf/incubator-calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-calcite/commit/c09a872f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-calcite/tree/c09a872f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-calcite/diff/c09a872f
Branch: refs/heads/master
Commit: c09a872fd481082af1d7f3bb760c68c2c91ff145
Parents: 9f1f73d
Author: Jacques Nadeau <ja...@apache.org>
Authored: Sun Aug 23 12:31:03 2015 -0700
Committer: Jacques Nadeau <ja...@apache.org>
Committed: Sun Aug 23 12:31:03 2015 -0700
----------------------------------------------------------------------
pom.xml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/c09a872f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c48cc52..c9d1e99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -670,6 +670,10 @@ limitations under the License.
<executions>
<execution>
<id>source-release-assembly</id>
+ <phase>none</phase>
+ </execution>
+ <execution>
+ <id>source-release-assembly-calcite</id>
<phase>package</phase>
<goals>
<goal>single</goal>
[2/2] incubator-calcite git commit: [CALCITE-741] Ensure that the
source release's DEPENDENCIES file includes all module dependencies.
Posted by ja...@apache.org.
[CALCITE-741] Ensure that the source release's DEPENDENCIES file includes all module dependencies.
Create new separate remote resources instantiations. The first will be used only on the root module (and thus include all module dependencies). The second will be executed on all the non-root modules.
Project: http://git-wip-us.apache.org/repos/asf/incubator-calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-calcite/commit/f8a54274
Tree: http://git-wip-us.apache.org/repos/asf/incubator-calcite/tree/f8a54274
Diff: http://git-wip-us.apache.org/repos/asf/incubator-calcite/diff/f8a54274
Branch: refs/heads/master
Commit: f8a542740733070a3be2ef3c4346816ab7eeaa6c
Parents: c09a872
Author: Jacques Nadeau <ja...@apache.org>
Authored: Sun Aug 23 12:32:30 2015 -0700
Committer: Jacques Nadeau <ja...@apache.org>
Committed: Sun Aug 23 12:36:34 2015 -0700
----------------------------------------------------------------------
avatica-server/pom.xml | 11 +++++++++++
avatica/pom.xml | 11 +++++++++++
core/pom.xml | 11 +++++++++++
example/csv/pom.xml | 11 +++++++++++
linq4j/pom.xml | 11 +++++++++++
mongodb/pom.xml | 11 +++++++++++
plus/pom.xml | 11 +++++++++++
pom.xml | 26 ++++++++++++++++++++++++++
spark/pom.xml | 11 +++++++++++
splunk/pom.xml | 11 +++++++++++
ubenchmark/pom.xml | 11 +++++++++++
11 files changed, 136 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/f8a54274/avatica-server/pom.xml
----------------------------------------------------------------------
diff --git a/avatica-server/pom.xml b/avatica-server/pom.xml
index c1413b8..c8b9ba3 100644
--- a/avatica-server/pom.xml
+++ b/avatica-server/pom.xml
@@ -135,6 +135,17 @@ limitations under the License.
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>non-root-resources</id>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/f8a54274/avatica/pom.xml
----------------------------------------------------------------------
diff --git a/avatica/pom.xml b/avatica/pom.xml
index 50b80c7..7d017d2 100644
--- a/avatica/pom.xml
+++ b/avatica/pom.xml
@@ -94,6 +94,17 @@ limitations under the License.
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>non-root-resources</id>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/f8a54274/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index f863efc..e7ee9f5 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -254,6 +254,17 @@ limitations under the License.
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>non-root-resources</id>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<resources>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/f8a54274/example/csv/pom.xml
----------------------------------------------------------------------
diff --git a/example/csv/pom.xml b/example/csv/pom.xml
index a8f93e7..20ea2b3 100644
--- a/example/csv/pom.xml
+++ b/example/csv/pom.xml
@@ -100,6 +100,17 @@ limitations under the License.
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>non-root-resources</id>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/f8a54274/linq4j/pom.xml
----------------------------------------------------------------------
diff --git a/linq4j/pom.xml b/linq4j/pom.xml
index 508006a..9da6c24 100644
--- a/linq4j/pom.xml
+++ b/linq4j/pom.xml
@@ -80,6 +80,17 @@ limitations under the License.
</includes>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>non-root-resources</id>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/f8a54274/mongodb/pom.xml
----------------------------------------------------------------------
diff --git a/mongodb/pom.xml b/mongodb/pom.xml
index bc1ac3d..e459803 100644
--- a/mongodb/pom.xml
+++ b/mongodb/pom.xml
@@ -117,6 +117,17 @@ limitations under the License.
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>non-root-resources</id>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/f8a54274/plus/pom.xml
----------------------------------------------------------------------
diff --git a/plus/pom.xml b/plus/pom.xml
index 57dfcbb..9119709 100644
--- a/plus/pom.xml
+++ b/plus/pom.xml
@@ -134,6 +134,17 @@ limitations under the License.
</includes>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>non-root-resources</id>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/f8a54274/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c9d1e99..eab243c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -329,6 +329,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>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/f8a54274/spark/pom.xml
----------------------------------------------------------------------
diff --git a/spark/pom.xml b/spark/pom.xml
index ff3e745..6d664f3 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -162,6 +162,17 @@ limitations under the License.
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>non-root-resources</id>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/f8a54274/splunk/pom.xml
----------------------------------------------------------------------
diff --git a/splunk/pom.xml b/splunk/pom.xml
index bf890e3..307aa8e 100644
--- a/splunk/pom.xml
+++ b/splunk/pom.xml
@@ -104,6 +104,17 @@ limitations under the License.
</includes>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>non-root-resources</id>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/f8a54274/ubenchmark/pom.xml
----------------------------------------------------------------------
diff --git a/ubenchmark/pom.xml b/ubenchmark/pom.xml
index cbb4413..022d096 100644
--- a/ubenchmark/pom.xml
+++ b/ubenchmark/pom.xml
@@ -125,6 +125,17 @@ limitations under the License.
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>non-root-resources</id>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>