You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by dh...@apache.org on 2016/12/01 21:11:05 UTC
[1/3] incubator-beam git commit: Add a test of ReleaseInfo
Repository: incubator-beam
Updated Branches:
refs/heads/master 48130f718 -> fd4b631f1
Add a test of ReleaseInfo
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/1094fa6a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/1094fa6a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/1094fa6a
Branch: refs/heads/master
Commit: 1094fa6ac32046b4c092294b3cee046c91aea5a1
Parents: 48130f7
Author: Dan Halperin <dh...@google.com>
Authored: Thu Dec 1 09:15:28 2016 -0800
Committer: Dan Halperin <dh...@google.com>
Committed: Thu Dec 1 13:10:55 2016 -0800
----------------------------------------------------------------------
.../apache/beam/sdk/util/ReleaseInfoTest.java | 45 ++++++++++++++++++++
1 file changed, 45 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/1094fa6a/sdks/java/core/src/test/java/org/apache/beam/sdk/util/ReleaseInfoTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/util/ReleaseInfoTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/util/ReleaseInfoTest.java
new file mode 100644
index 0000000..fabb7e2
--- /dev/null
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/util/ReleaseInfoTest.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.beam.sdk.util;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+/**
+ * Tests for {@link ReleaseInfo}.
+ */
+public class ReleaseInfoTest {
+
+ @Test
+ public void getReleaseInfo() throws Exception {
+ ReleaseInfo info = ReleaseInfo.getReleaseInfo();
+
+ // Validate name
+ assertThat(info.getName(), containsString("Beam"));
+
+ // Validate semantic version
+ String version = info.getVersion();
+ String pattern = "\\d+\\.\\d+\\.\\d+.*";
+ assertTrue(
+ String.format("%s does not match pattern %s", version, pattern),
+ version.matches(pattern));
+ }
+}
[2/3] incubator-beam git commit: Revert "Move resource filtering
later to avoid spurious rebuilds"
Posted by dh...@apache.org.
Revert "Move resource filtering later to avoid spurious rebuilds"
This reverts commit 2422365719c71cade97e1e74f1fb7f42b264244f.
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/b36048bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/b36048bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/b36048bd
Branch: refs/heads/master
Commit: b36048bd0e558fea281a1ec42aa8435db09dbe64
Parents: 1094fa6
Author: Dan Halperin <dh...@google.com>
Authored: Thu Dec 1 10:22:15 2016 -0800
Committer: Dan Halperin <dh...@google.com>
Committed: Thu Dec 1 13:10:56 2016 -0800
----------------------------------------------------------------------
sdks/java/core/pom.xml | 29 +++++++----------------------
1 file changed, 7 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b36048bd/sdks/java/core/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/core/pom.xml b/sdks/java/core/pom.xml
index f842be7..ad84846 100644
--- a/sdks/java/core/pom.xml
+++ b/sdks/java/core/pom.xml
@@ -40,6 +40,13 @@
</properties>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
<pluginManagement>
<plugins>
<plugin>
@@ -74,28 +81,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>resources</id>
- <phase>compile</phase>
- <goals>
- <goal>resources</goal>
- </goals>
- <configuration>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
</plugin>
[3/3] incubator-beam git commit: Closes #1480
Posted by dh...@apache.org.
Closes #1480
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/fd4b631f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/fd4b631f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/fd4b631f
Branch: refs/heads/master
Commit: fd4b631f1b4aa1538b779c4de591bd9b18526cd6
Parents: 48130f7 b36048b
Author: Dan Halperin <dh...@google.com>
Authored: Thu Dec 1 13:10:56 2016 -0800
Committer: Dan Halperin <dh...@google.com>
Committed: Thu Dec 1 13:10:56 2016 -0800
----------------------------------------------------------------------
sdks/java/core/pom.xml | 29 +++----------
.../apache/beam/sdk/util/ReleaseInfoTest.java | 45 ++++++++++++++++++++
2 files changed, 52 insertions(+), 22 deletions(-)
----------------------------------------------------------------------