Skip to content
Snippets Groups Projects
Commit 6add3ce9 authored by MIchael Nguyen's avatar MIchael Nguyen
Browse files

updating wip.

parent 530d5c87
No related branches found
No related tags found
1 merge request!6Trusted ibm
Hide whitespace changes
Inline Side-by-side
Showing
with 135 additions and 101 deletions
indexer-service-aws/pom.xml
+ 20
− 20
View file @ 6add3ce9
...@@ -6,12 +6,12 @@ ...@@ -6,12 +6,12 @@
<groupId>org.opengroup.osdu.indexer</groupId> <groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-service</artifactId> <artifactId>indexer-service</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent> </parent>
<groupId>org.opengroup.osdu.indexer.aws</groupId> <groupId>org.opengroup.osdu.indexer.aws</groupId>
<artifactId>indexer-service-aws</artifactId> <artifactId>indexer-service-aws</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<name>indexer-service-aws</name> <name>indexer-service-aws</name>
<url>http://maven.apache.org</url>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.opengroup.osdu.indexer</groupId> <groupId>org.opengroup.osdu.indexer</groupId>
...@@ -119,23 +119,23 @@ ...@@ -119,23 +119,23 @@
<version>6.6.2</version> <version>6.6.2</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<goals> <goals>
<goal>repackage</goal> <goal>repackage</goal>
</goals> </goals>
<configuration> <configuration>
<classifier>spring-boot</classifier> <classifier>spring-boot</classifier>
<mainClass>org.opengroup.osdu.indexer.IndexerApplication</mainClass> <mainClass>org.opengroup.osdu.indexer.aws.IndexerAwsApplication</mainClass>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
indexer-service-aws/src/main/java/org/opengroup/osdu/indexer/aws/IndexerAwsApplication.java 0 → 100644
+ 14
− 0
View file @ 6add3ce9
package org.opengroup.osdu.indexer.aws;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.ComponentScan;
@SpringBootApplication
@ComponentScan({"org.opengroup.osdu.is.core", "org.opengroup.osdu.indexer"})
public class IndexerAwsApplication {
public static void main( String[] args )
{
SpringApplication.run(IndexerAwsApplication.class, args);
}
}
indexer-service-aws/src/main/java/org/opengroup/osdu/indexer/aws/ServerletInitializer.java 0 → 100644
+ 11
− 0
View file @ 6add3ce9
package org.opengroup.osdu.indexer.aws;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
public class ServerletInitializer extends SpringBootServletInitializer {
@Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
return application.sources(IndexerAwsApplication.class);
}
}
indexer-service-root/pom.xml
+ 22
− 2
View file @ 6add3ce9
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
<groupId>org.opengroup.osdu.indexer</groupId> <groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-service</artifactId> <artifactId>indexer-service</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>indexer-service-root</artifactId> <artifactId>indexer-service-root</artifactId>
...@@ -68,7 +69,8 @@ ...@@ -68,7 +69,8 @@
<dependency> <dependency>
<groupId>org.opengroup.osdu</groupId> <groupId>org.opengroup.osdu</groupId>
<artifactId>indexer-search-core-lib</artifactId> <artifactId>indexer-search-core-lib</artifactId>
<version>1.0.7</version> <version>1.0.9</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
...@@ -198,5 +200,23 @@ ...@@ -198,5 +200,23 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
<configuration>
<classifier>spring-boot</classifier>
<mainClass>org.opengroup.osdu.indexer.IndexerApplication</mainClass>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project> </project>
indexer-service-root/src/main/java/org/opengroup/osdu/indexer/IndexerApplication.java
+ 7
− 1
View file @ 6add3ce9
package org.opengroup.osdu.indexer; package org.opengroup.osdu.indexer;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@SpringBootApplication @Configuration
@SpringBootApplication(exclude = { SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class })
@ComponentScan({"org.opengroup.osdu.is.core"})
public class IndexerApplication { public class IndexerApplication {
public static void main( String[] args ) public static void main( String[] args )
{ {
......
pom.xml
+ 61
− 78
View file @ 6add3ce9
...@@ -14,11 +14,12 @@ ...@@ -14,11 +14,12 @@
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<description>Indexer Service</description> <description>Indexer Service</description>
<!-- <modules>--> <modules>
<!-- <module>indexer-service-root</module>--> <module>indexer-service-aws</module>
<module>indexer-service-root</module>
<!-- <module>indexer-service-gcp</module>--> <!-- <module>indexer-service-gcp</module>-->
<!-- <module>indexer-service-azure</module>--> <!-- <module>indexer-service-azure</module>-->
<!-- </modules>--> </modules>
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
...@@ -48,61 +49,61 @@ ...@@ -48,61 +49,61 @@
</repository> </repository>
</repositories> </repositories>
<profiles> <!-- <profiles>-->
<profile> <!-- <profile>-->
<id>root</id> <!-- <id>root</id>-->
<activation> <!-- <activation>-->
<!-- this profile is active by default --> <!-- &lt;!&ndash; this profile is active by default &ndash;&gt;-->
<activeByDefault>true</activeByDefault> <!-- <activeByDefault>true</activeByDefault>-->
</activation> <!-- </activation>-->
<modules> <!-- <modules>-->
<module>indexer-service-root</module> <!-- <module>indexer-service-root</module>-->
</modules> <!-- </modules>-->
</profile> <!-- </profile>-->
<profile> <!-- <profile>-->
<id>aws</id> <!-- <id>aws</id>-->
<activation> <!-- <activation>-->
<property> <!-- <property>-->
<name>vendor</name> <!-- <name>vendor</name>-->
<value>aws</value> <!-- <value>aws</value>-->
</property> <!-- </property>-->
</activation> <!-- </activation>-->
<modules> <!-- <modules>-->
<module>indexer-service-aws</module> <!-- <module>indexer-service-aws</module>-->
</modules> <!-- </modules>-->
</profile> <!-- </profile>-->
<profile> <!-- <profile>-->
<id>gcp</id> <!-- <id>gcp</id>-->
<activation> <!-- <activation>-->
<property> <!-- <property>-->
<name>vendor</name> <!-- <name>vendor</name>-->
<value>gcp</value> <!-- <value>gcp</value>-->
</property> <!-- </property>-->
</activation> <!-- </activation>-->
<modules> <!-- <modules>-->
<module>indexer-service-gcp</module> <!-- <module>indexer-service-gcp</module>-->
</modules> <!-- </modules>-->
</profile> <!-- </profile>-->
<profile> <!-- <profile>-->
<id>azure</id> <!-- <id>azure</id>-->
<activation> <!-- <activation>-->
<property> <!-- <property>-->
<name>vendor</name> <!-- <name>vendor</name>-->
<value>azure</value> <!-- <value>azure</value>-->
</property> <!-- </property>-->
</activation> <!-- </activation>-->
<modules> <!-- <modules>-->
<module>indexer-service-azure</module> <!-- <module>indexer-service-azure</module>-->
</modules> <!-- </modules>-->
</profile> <!-- </profile>-->
<!-- &lt;!&ndash; Unit test only &ndash;&gt;--> <!-- &lt;!&ndash; Unit test only &ndash;&gt;-->
<!-- <profile>--> <!-- <profile>-->
...@@ -128,7 +129,7 @@ ...@@ -128,7 +129,7 @@
<!-- <skip.unit.tests>false</skip.unit.tests>--> <!-- <skip.unit.tests>false</skip.unit.tests>-->
<!-- </properties>--> <!-- </properties>-->
<!-- </profile>--> <!-- </profile>-->
</profiles> <!-- </profiles>-->
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
...@@ -150,23 +151,5 @@ ...@@ -150,23 +151,5 @@
<artifactId>spring-boot-starter-validation</artifactId> <artifactId>spring-boot-starter-validation</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
<configuration>
<classifier>spring-boot</classifier>
<mainClass>org.opengroup.osdu.indexer.IndexerApplication</mainClass>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project> </project>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment