Updated formatting

This commit is contained in:
Josephine Barboza 2018-10-10 19:12:51 +05:30
parent 20f2d3a923
commit e83b767054
2 changed files with 65 additions and 79 deletions

View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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"> 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> <modelVersion>4.0.0</modelVersion>
<artifactId>libraries-data</artifactId> <artifactId>libraries-data</artifactId>
@ -14,7 +13,6 @@
</parent> </parent>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.esotericsoftware</groupId> <groupId>com.esotericsoftware</groupId>
<artifactId>kryo</artifactId> <artifactId>kryo</artifactId>
@ -101,49 +99,36 @@
<groupId>org.datanucleus</groupId> <groupId>org.datanucleus</groupId>
<artifactId>javax.jdo</artifactId> <artifactId>javax.jdo</artifactId>
<version>${javax.jdo.version}</version> <version>${javax.jdo.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.datanucleus</groupId> <groupId>org.datanucleus</groupId>
<artifactId>datanucleus-core</artifactId> <artifactId>datanucleus-core</artifactId>
<version>${datanucleus.version}</version> <version>${datanucleus.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.datanucleus</groupId> <groupId>org.datanucleus</groupId>
<artifactId>datanucleus-api-jdo</artifactId> <artifactId>datanucleus-api-jdo</artifactId>
<version>${datanucleus.version}</version> <version>${datanucleus.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.datanucleus</groupId> <groupId>org.datanucleus</groupId>
<artifactId>datanucleus-rdbms</artifactId> <artifactId>datanucleus-rdbms</artifactId>
<version>${datanucleus.version}</version> <version>${datanucleus.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.datanucleus</groupId> <groupId>org.datanucleus</groupId>
<artifactId>datanucleus-maven-plugin</artifactId> <artifactId>datanucleus-maven-plugin</artifactId>
<version>${datanucleus-maven-plugin.version}</version> <version>${datanucleus-maven-plugin.version}</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.datanucleus</groupId> <groupId>org.datanucleus</groupId>
<artifactId>datanucleus-xml</artifactId> <artifactId>datanucleus-xml</artifactId>
<version>${datanucleus-xml.version}</version> <version>${datanucleus-xml.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.datanucleus</groupId> <groupId>org.datanucleus</groupId>
<artifactId>datanucleus-jdo-query</artifactId> <artifactId>datanucleus-jdo-query</artifactId>
<version>${datanucleus-jdo-query.version}</version> <version>${datanucleus-jdo-query.version}</version>
</dependency> </dependency>
<!-- Jcache --> <!-- Jcache -->
<dependency> <dependency>
@ -156,13 +141,13 @@
<artifactId>hazelcast</artifactId> <artifactId>hazelcast</artifactId>
<version>${hazelcast.version}</version> <version>${hazelcast.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.googlecode.jmapper-framework</groupId> <groupId>com.googlecode.jmapper-framework</groupId>
<artifactId>jmapper-core</artifactId> <artifactId>jmapper-core</artifactId>
<version>${jmapper.version}</version> <version>${jmapper.version}</version>
</dependency> </dependency>
<!-- crunch project --> <!-- crunch project -->
<dependency> <dependency>
<groupId>org.apache.crunch</groupId> <groupId>org.apache.crunch</groupId>
<artifactId>crunch-core</artifactId> <artifactId>crunch-core</artifactId>
@ -173,12 +158,6 @@
<artifactId>hadoop-client</artifactId> <artifactId>hadoop-client</artifactId>
<version>${org.apache.hadoop.hadoop-client}</version> <version>${org.apache.hadoop.hadoop-client}</version>
<scope>provided</scope> <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
@ -314,28 +293,16 @@
</goals> </goals>
<configuration> <configuration>
<tasks> <tasks>
<property <property name="plugin_classpath" refid="maven.plugin.classpath" />
name="plugin_classpath" <taskdef name="gen-reladomo" classpath="plugin_classpath" classname="com.gs.fw.common.mithra.generator.MithraGenerator" />
refid="maven.plugin.classpath" /> <gen-reladomo xml="${project.basedir}/src/main/resources/reladomo/ReladomoClassList.xml" generateGscListMethod="true"
<taskdef name="gen-reladomo" generatedDir="${project.build.directory}/generated-sources/reladomo" nonGeneratedDir="${project.basedir}/src/main/java" />
classpath="plugin_classpath"
classname="com.gs.fw.common.mithra.generator.MithraGenerator" />
<gen-reladomo
xml="${project.basedir}/src/main/resources/reladomo/ReladomoClassList.xml"
generateGscListMethod="true"
generatedDir="${project.build.directory}/generated-sources/reladomo"
nonGeneratedDir="${project.basedir}/src/main/java" />
<taskdef name="gen-ddl" <taskdef name="gen-ddl" classname="com.gs.fw.common.mithra.generator.dbgenerator.MithraDbDefinitionGenerator" loaderRef="reladomoGenerator">
classname="com.gs.fw.common.mithra.generator.dbgenerator.MithraDbDefinitionGenerator" <classpath refid="maven.plugin.classpath" />
loaderRef="reladomoGenerator">
<classpath
refid="maven.plugin.classpath" />
</taskdef> </taskdef>
<gen-ddl <gen-ddl xml="${project.basedir}/src/main/resources/reladomo/ReladomoClassList.xml"
xml="${project.basedir}/src/main/resources/reladomo/ReladomoClassList.xml" generatedDir="${project.build.directory}/generated-db/sql" databaseType="postgres" />
generatedDir="${project.build.directory}/generated-db/sql"
databaseType="postgres" />
</tasks> </tasks>
</configuration> </configuration>
</execution> </execution>
@ -390,7 +357,27 @@
<!-- /Reladomo --> <!-- /Reladomo -->
<!-- JDO Plugin --> <!-- JDO Plugin -->
<plugin>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-maven-plugin</artifactId>
<version>${datanucleus-maven-plugin.version}</version>
<configuration>
<api>JDO</api>
<props>${basedir}/datanucleus.properties</props>
<log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
<verbose>true</verbose>
<fork>false</fork>
<!-- Solve windows line too long error -->
</configuration>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>enhance</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -416,25 +403,25 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-maven-plugin</artifactId> <artifactId>ebean-maven-plugin</artifactId>
<version>11.11.2</version> <version>11.11.2</version>
<executions> <executions>
<!-- enhance main classes --> <!-- enhance main classes -->
<execution> <execution>
<id>main</id> <id>main</id>
<phase>process-classes</phase> <phase>process-classes</phase>
<configuration> <configuration>
<transformArgs>debug=1</transformArgs> <transformArgs>debug=1</transformArgs>
</configuration> </configuration>
<goals> <goals>
<goal>enhance</goal> <goal>enhance</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<repositories> <repositories>
@ -473,7 +460,7 @@
<org.apache.hadoop.hadoop-client>2.2.0</org.apache.hadoop.hadoop-client> <org.apache.hadoop.hadoop-client>2.2.0</org.apache.hadoop.hadoop-client>
<ebean.version>11.22.4</ebean.version> <ebean.version>11.22.4</ebean.version>
<slf4j.version>1.7.25</slf4j.version> <slf4j.version>1.7.25</slf4j.version>
<logback.version>1.0.1</logback.version> <logback.version>1.0.1</logback.version>
</properties> </properties>
</project> </project>

View File

@ -1,16 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration> <configuration>
<appender name="STDOUT" <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
class="ch.qos.logback.core.ConsoleAppender"> <encoder>
<encoder> <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n </pattern>
</pattern> </encoder>
</encoder> </appender>
</appender> <logger name="io.ebean.DDL" level="TRACE"/>
<logger name="io.ebean.DDL" level="TRACE"/> <logger name="io.ebean.SQL" level="TRACE"/>
<logger name="io.ebean.SQL" level="TRACE"/> <logger name="io.ebean.TXN" level="TRACE"/>
<logger name="io.ebean.TXN" level="TRACE"/> <root level="INFO">
<root level="INFO"> <appender-ref ref="STDOUT" />
<appender-ref ref="STDOUT" /> </root>
</root>
</configuration> </configuration>