Skip to content

Commit

Permalink
revert files that're not impacted
Browse files Browse the repository at this point in the history
  • Loading branch information
mingmxu committed Apr 10, 2017
1 parent dd266b5 commit 4c2fc05
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
20 changes: 10 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
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.
--><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>

Expand Down Expand Up @@ -91,13 +92,13 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<beam.javadoc_opts/>
<beam.javadoc_opts />

<!-- Disable integration tests by default -->
<skipITs>true</skipITs>

<!-- Do not add additional surefire arguments by default -->
<beamSurefireArgline/>
<beamSurefireArgline />

<!-- If updating dependencies, please update any relevant javadoc offlineLinks -->
<apache.commons.lang.version>3.5</apache.commons.lang.version>
Expand Down Expand Up @@ -151,7 +152,6 @@
<module>sdks/java/build-tools</module>
<module>sdks</module>
<module>runners</module>
<module>dsls</module>
<module>examples</module>
<!-- sdks/java/javadoc builds project-wide Javadoc. It has to run last. -->
<module>sdks/java/javadoc</module>
Expand Down Expand Up @@ -447,12 +447,12 @@
<version>${project.version}</version>
</dependency>

<dependency>
<dependency>
<groupId>org.apache.beam</groupId>
<artifactId>beam-sdks-java-io-hadoop-input-format</artifactId>
<version>${project.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.beam</groupId>
<artifactId>beam-runners-core-construction-java</artifactId>
Expand Down Expand Up @@ -1307,7 +1307,7 @@
</goals>
</pluginExecutionFilter>
<action>
<ignore/>
<ignore />
</action>
</pluginExecution>
<pluginExecution>
Expand All @@ -1321,7 +1321,7 @@
</goals>
</pluginExecutionFilter>
<action>
<ignore/>
<ignore />
</action>
</pluginExecution>
</pluginExecutions>
Expand Down Expand Up @@ -1594,4 +1594,4 @@
<!-- Keep aligned with requireMavenVersion section above. -->
<maven>3.2</maven>
</prerequisites>
</project>
</project>
6 changes: 3 additions & 3 deletions sdks/java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
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.
--><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>

Expand Down Expand Up @@ -42,7 +43,6 @@
<!-- javadoc runs directly from the root parent as the last module
in the build to be able to capture runner-specific javadoc.
<module>javadoc</module> -->

</modules>

<profiles>
Expand All @@ -57,4 +57,4 @@
</modules>
</profile>
</profiles>
</project>
</project>

0 comments on commit 4c2fc05

Please sign in to comment.