Repository: beam Updated Branches: refs/heads/master 3fde7b2a2 -> 11a381b23
Revert "[maven-release-plugin] prepare branch release-0.6.0" This reverts commit 1a770ef2f21b96fbdc5ff06ea8642351f136328f. Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/11a381b2 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/11a381b2 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/11a381b2 Branch: refs/heads/master Commit: 11a381b23541a305ed115a62df4794e0a1d79cbc Parents: 3fde7b2 Author: Ahmet Altay <al...@google.com> Authored: Fri Mar 3 17:22:27 2017 -0800 Committer: Ahmet Altay <al...@google.com> Committed: Fri Mar 3 17:22:27 2017 -0800 ---------------------------------------------------------------------- pom.xml | 2 +- runners/core-construction-java/pom.xml | 4 +++- sdks/common/fn-api/pom.xml | 4 +++- sdks/common/runner-api/pom.xml | 4 +++- sdks/java/extensions/jackson/pom.xml | 4 +++- sdks/java/harness/pom.xml | 4 +++- sdks/java/javadoc/pom.xml | 10 +++++----- 7 files changed, 21 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/11a381b2/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index eded684..a37f1af 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ <connection>scm:git:https://git-wip-us.apache.org/repos/asf/beam.git</connection> <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/beam.git</developerConnection> <url>https://git-wip-us.apache.org/repos/asf?p=beam.git;a=summary</url> - <tag>release-0.6.0</tag> + <tag>HEAD</tag> </scm> <issueManagement> http://git-wip-us.apache.org/repos/asf/beam/blob/11a381b2/runners/core-construction-java/pom.xml ---------------------------------------------------------------------- diff --git a/runners/core-construction-java/pom.xml b/runners/core-construction-java/pom.xml index b602f5d..868f743 100644 --- a/runners/core-construction-java/pom.xml +++ b/runners/core-construction-java/pom.xml @@ -17,7 +17,9 @@ ~ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/beam/blob/11a381b2/sdks/common/fn-api/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/common/fn-api/pom.xml b/sdks/common/fn-api/pom.xml index 5a41d9e..1f6193f 100644 --- a/sdks/common/fn-api/pom.xml +++ b/sdks/common/fn-api/pom.xml @@ -15,7 +15,9 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> http://git-wip-us.apache.org/repos/asf/beam/blob/11a381b2/sdks/common/runner-api/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/common/runner-api/pom.xml b/sdks/common/runner-api/pom.xml index 9c6de1e..8eaeb8e 100644 --- a/sdks/common/runner-api/pom.xml +++ b/sdks/common/runner-api/pom.xml @@ -15,7 +15,9 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> http://git-wip-us.apache.org/repos/asf/beam/blob/11a381b2/sdks/java/extensions/jackson/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/extensions/jackson/pom.xml b/sdks/java/extensions/jackson/pom.xml index 1dfbd72..be5c953 100644 --- a/sdks/java/extensions/jackson/pom.xml +++ b/sdks/java/extensions/jackson/pom.xml @@ -15,7 +15,9 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/beam/blob/11a381b2/sdks/java/harness/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/harness/pom.xml b/sdks/java/harness/pom.xml index 80b01ca..3abe70b 100644 --- a/sdks/java/harness/pom.xml +++ b/sdks/java/harness/pom.xml @@ -15,7 +15,9 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> http://git-wip-us.apache.org/repos/asf/beam/blob/11a381b2/sdks/java/javadoc/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/javadoc/pom.xml b/sdks/java/javadoc/pom.xml index b785c98..243dae5 100644 --- a/sdks/java/javadoc/pom.xml +++ b/sdks/java/javadoc/pom.xml @@ -254,12 +254,12 @@ <phase>package</phase> <configuration> <target> - <property name="compile_classpath" refid="maven.compile.classpath" /> - <property name="runtime_classpath" refid="maven.runtime.classpath" /> - <property name="test_classpath" refid="maven.test.classpath" /> - <property name="plugin_classpath" refid="maven.plugin.classpath" /> + <property name="compile_classpath" refid="maven.compile.classpath"/> + <property name="runtime_classpath" refid="maven.runtime.classpath"/> + <property name="test_classpath" refid="maven.test.classpath"/> + <property name="plugin_classpath" refid="maven.plugin.classpath"/> <ant antfile="${basedir}/ant.xml"> - <target name="javadoc" /> + <target name="javadoc"/> </ant> </target> </configuration>