Skip to content

Commit

Permalink
HDDS-3336. Fix merge issues.
Browse files Browse the repository at this point in the history
  • Loading branch information
Aravindan Vijayan committed Apr 7, 2020
1 parent 342f9ae commit cb80b0f
Show file tree
Hide file tree
Showing 2 changed files with 77 additions and 80 deletions.
154 changes: 77 additions & 77 deletions hadoop-ozone/recon/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,83 +88,83 @@
2. to install dependencies with yarn install
3. building the frontend application
-->
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>1.6</version>
<configuration>
<installDirectory>target</installDirectory>
<workingDirectory>${basedir}/src/main/resources/webapps/recon/ozone-recon-web</workingDirectory>
</configuration>
<executions>
<execution>
<id>Install node and yarn locally to the project</id>
<goals>
<goal>install-node-and-yarn</goal>
</goals>
<configuration>
<nodeVersion>v12.1.0</nodeVersion>
<yarnVersion>v1.9.2</yarnVersion>
</configuration>
</execution>
<execution>
<id>yarn install</id>
<goals>
<goal>yarn</goal>
</goals>
<configuration>
<arguments>install</arguments>
</configuration>
</execution>
<execution>
<id>Build frontend</id>
<goals>
<goal>yarn</goal>
</goals>
<configuration>
<arguments>run build</arguments>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>Copy frontend build to target</id>
<phase>process-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.outputDirectory}/webapps/recon</outputDirectory>
<resources>
<resource>
<directory>${basedir}/src/main/resources/webapps/recon/ozone-recon-web/build</directory>
<filtering>true</filtering>
</resource>
</resources>
</configuration>
</execution>
<execution>
<id>Copy frontend static files to target</id>
<phase>process-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.outputDirectory}/webapps/static</outputDirectory>
<resources>
<resource>
<directory>${basedir}/src/main/resources/webapps/recon/ozone-recon-web/build/static</directory>
<filtering>true</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<!-- <plugin>-->
<!-- <groupId>com.github.eirslett</groupId>-->
<!-- <artifactId>frontend-maven-plugin</artifactId>-->
<!-- <version>1.6</version>-->
<!-- <configuration>-->
<!-- <installDirectory>target</installDirectory>-->
<!-- <workingDirectory>${basedir}/src/main/resources/webapps/recon/ozone-recon-web</workingDirectory>-->
<!-- </configuration>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <id>Install node and yarn locally to the project</id>-->
<!-- <goals>-->
<!-- <goal>install-node-and-yarn</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <nodeVersion>v12.1.0</nodeVersion>-->
<!-- <yarnVersion>v1.9.2</yarnVersion>-->
<!-- </configuration>-->
<!-- </execution>-->
<!-- <execution>-->
<!-- <id>yarn install</id>-->
<!-- <goals>-->
<!-- <goal>yarn</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <arguments>install</arguments>-->
<!-- </configuration>-->
<!-- </execution>-->
<!-- <execution>-->
<!-- <id>Build frontend</id>-->
<!-- <goals>-->
<!-- <goal>yarn</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <arguments>run build</arguments>-->
<!-- </configuration>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- </plugin>-->
<!-- <plugin>-->
<!-- <groupId>org.apache.maven.plugins</groupId>-->
<!-- <artifactId>maven-resources-plugin</artifactId>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <id>Copy frontend build to target</id>-->
<!-- <phase>process-resources</phase>-->
<!-- <goals>-->
<!-- <goal>copy-resources</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <outputDirectory>${project.build.outputDirectory}/webapps/recon</outputDirectory>-->
<!-- <resources>-->
<!-- <resource>-->
<!-- <directory>${basedir}/src/main/resources/webapps/recon/ozone-recon-web/build</directory>-->
<!-- <filtering>true</filtering>-->
<!-- </resource>-->
<!-- </resources>-->
<!-- </configuration>-->
<!-- </execution>-->
<!-- <execution>-->
<!-- <id>Copy frontend static files to target</id>-->
<!-- <phase>process-resources</phase>-->
<!-- <goals>-->
<!-- <goal>copy-resources</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <outputDirectory>${project.build.outputDirectory}/webapps/static</outputDirectory>-->
<!-- <resources>-->
<!-- <resource>-->
<!-- <directory>${basedir}/src/main/resources/webapps/recon/ozone-recon-web/build/static</directory>-->
<!-- <filtering>true</filtering>-->
<!-- </resource>-->
<!-- </resources>-->
<!-- </configuration>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- </plugin>-->
</plugins>
</build>
<dependencies>
Expand Down
3 changes: 0 additions & 3 deletions ...src/main/java/org/apache/hadoop/ozone/recon/spi/impl/OzoneManagerServiceProviderImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,7 @@
import org.apache.hadoop.ozone.recon.tasks.OMDBUpdatesHandler;
import org.apache.hadoop.ozone.recon.tasks.OMUpdateEventBatch;
import org.apache.hadoop.ozone.recon.tasks.ReconTaskController;
<<<<<<< HEAD
import org.apache.hadoop.util.Time;
=======

import com.google.common.annotations.VisibleForTesting;
import org.apache.commons.io.FileUtils;
Expand All @@ -71,7 +69,6 @@
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.RECON_OM_SNAPSHOT_TASK_INTERVAL_DEFAULT;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.RECON_OM_SOCKET_TIMEOUT;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.RECON_OM_SOCKET_TIMEOUT_DEFAULT;
>>>>>>> upstream/master
import org.apache.http.client.config.RequestConfig;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
Expand Down

0 comments on commit cb80b0f

Please sign in to comment.