You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2020/06/09 14:57:40 UTC

[airavata] 01/02: AIRAVATA-3326 migration schema logging - removed dependence on test classpath

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch AIRAVATA-3326-improved-database-migration-script-creation
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit 50ef0d720390613903aaf0ec3e468df1f549e1a8
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Tue Jun 9 09:51:17 2020 -0400

    AIRAVATA-3326 migration schema logging - removed dependence on test classpath
---
 modules/registry/registry-core/pom.xml                   | 16 ++++++++--------
 .../registry-core/src/test/resources/logback.xml         | 13 -------------
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/modules/registry/registry-core/pom.xml b/modules/registry/registry-core/pom.xml
index 4c6ce9b..33f549b 100644
--- a/modules/registry/registry-core/pom.xml
+++ b/modules/registry/registry-core/pom.xml
@@ -98,7 +98,7 @@
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
             <version>${logback.version}</version>
-            <scope>test</scope>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.airavata</groupId>
@@ -146,14 +146,14 @@
                 <version>1.6.0</version>
                 <configuration>
                     <executable>java</executable>
-                    <classpathScope>test</classpathScope>
+                    <classpathScope>runtime</classpathScope>
                     <workingDirectory>${project.build.directory}</workingDirectory>
                 </configuration>
                 <executions>
                     <execution>
-                        <!-- mvn process-classes exec:exec@generate-migrations -->
-                        <!-- TODO: remove the dependency on test classpath, etc. -->
-                        <!-- mvn clean test-compile docker-compose:up@mysql-up exec:exec@generate-migrations-mysql docker-compose:down@mysql-down -->
+                        <!-- Run with:
+                            mvn process-classes docker-compose:up@mysql-up exec:exec@generate-migrations-mysql docker-compose:down@mysql-down
+                        -->
                         <id>generate-migrations-mysql</id>
                         <goals>
                             <goal>exec</goal>
@@ -168,9 +168,9 @@
                         </configuration>
                     </execution>
                     <execution>
-                        <!-- mvn process-classes exec:exec@generate-migrations -->
-                        <!-- TODO: remove the dependency on test classpath, etc. -->
-                        <!-- mvn test-compile exec:exec@generate-migrations-derby -->
+                        <!-- Run with:
+                            mvn process-classes exec:exec@generate-migrations-derby
+                        -->
                         <id>generate-migrations-derby</id>
                         <goals>
                             <goal>exec</goal>
diff --git a/modules/registry/registry-core/src/test/resources/logback.xml b/modules/registry/registry-core/src/test/resources/logback.xml
index 520ba9a..3dd3063 100644
--- a/modules/registry/registry-core/src/test/resources/logback.xml
+++ b/modules/registry/registry-core/src/test/resources/logback.xml
@@ -24,21 +24,8 @@
             <pattern>[%p] %m%n</pattern>
         </encoder>
     </appender>
-    <appender name="LOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <File>airavata.log</File>
-        <Append>true</Append>
-        <encoder>
-            <pattern>%d [%t] %-5p %c{30} %m [%X]%n</pattern>
-        </encoder>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>airavata.log.%d{yyyy-MM-dd}</fileNamePattern>
-            <maxHistory>30</maxHistory>
-            <totalSizeCap>1GB</totalSizeCap>
-        </rollingPolicy>
-    </appender>
     <logger name="org.apache.airavata.registry" level="INFO"/>
     <root level="INFO">
         <appender-ref ref="CONSOLE"/>
-        <appender-ref ref="LOGFILE"/>
     </root>
 </configuration>