Merge pull request #48 from CDLUC3/codebuild

mrt-core2 support CodeArtifact

.gitignore

@@ -3,3 +3,5 @@ target
 .project
 .classpath
 */.gitignore
+reflect/pom.xml.releaseBackup
+pom.xml.releaseBackup

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "java.configuration.updateBuildConfiguration": "automatic"
+}

buildspec.yml

@@ -0,0 +1,24 @@
+version: 0.2
+
+# Pre-requisites
+# - Create CodeBuild project
+#   - Provide minimal github credentials to access public repo
+
+phases:
+  pre_build:
+    on-failure: ABORT
+    commands:
+      - cp settings.xml ~/.m2/
+      - export CODEARTIFACT_AUTH_TOKEN=`aws codeartifact get-authorization-token --domain cdlib-uc3-mrt --domain-owner $AWS_ACCOUNT_ID --region $AWS_REGION --query authorizationToken --output text`
+      - aws ecr get-login-password --region $AWS_REGION | docker login --username AWS --password-stdin ${ECR_REGISTRY}
+
+  build:
+    on-failure: ABORT
+    commands:
+      - mvn -ntp -Pparent clean deploy
+      - mvn clean deploy -f reflect/pom.xml 
+      - mvn -ntp clean install 
+      - mvn deploy:deploy-file -Durl=${CODEARTIFACT_URL} -DrepositoryId=cdlib-uc3-mrt-uc3-mrt-java -Dfile=$(ls core/target/mrt-core-*.jar)
+  post_build:
+    commands:
+      #- aws s3 rm s3://${S3CFBUCKET}/api --recursive

core/pom.xml

@@ -1,19 +1,29 @@
-<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/maven-v4_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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.cdlib.mrt</groupId>
     <artifactId>mrt-core</artifactId>
     <packaging>jar</packaging>
-    <version>2.0-SNAPSHOT</version>
+    <version>3.0-SNAPSHOT</version>
     <name>UC3-mrtcore</name>
     <url>http://uc3.cdlib.org</url>
+
+    <properties>
+      <merritt-bom.version>3.0-SNAPSHOT</merritt-bom.version>
+    </properties>
 
+    <distributionManagement>
+      <repository>
+        <id>cdlib-uc3-mrt-uc3-mrt-java</id>
+        <name>cdlib-uc3-mrt-uc3-mrt-java</name>
+       <url>https://cdlib-uc3-mrt-${env.AWS_ACCOUNT_ID}.d.codeartifact.us-west-2.amazonaws.com/maven/uc3-mrt-java/</url>
+      </repository>
+    </distributionManagement>
     <dependencyManagement>
       <dependencies>
         <dependency>
           <groupId>org.cdlib.mrt</groupId>
           <artifactId>mrt-reflectoring-bom</artifactId>
-          <version>1.0.0</version>
+          <version>${merritt-bom.version}</version>
           <type>pom</type>
           <scope>import</scope>
         </dependency>
@@ -23,10 +33,10 @@
     <parent>
         <groupId>org.cdlib.mrt</groupId>
         <artifactId>mrt-parent-properties</artifactId>
-        <version>1.0.0</version>
+        <!--This version cannot be set as a property-->
+        <version>PAR-3.0-SNAPSHOT</version>
     </parent>
 
-
     <build>
         <plugins>
             <plugin>
@@ -133,6 +143,48 @@
             <artifactId>xml-apis</artifactId>
             <scope>runtime</scope>
         </dependency> 
+
+        <dependency>
+            <groupId>co.elastic.logging</groupId>
+            <artifactId>ecs-logging-core</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>co.elastic.logging</groupId>
+            <artifactId>log4j2-ecs-layout</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-databind</artifactId>
+        </dependency>
+
+        <dependency>
+             <groupId>org.apache.logging.log4j</groupId>
+             <artifactId>log4j-api</artifactId>
+           </dependency>
+
+         <dependency>
+           <groupId>org.apache.logging.log4j</groupId>
+           <artifactId>log4j-core</artifactId>
+         </dependency>
+
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-ssm</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

core/src/test/java/org/cdlib/mrt/core/ManifestRowBatchTest.java

@@ -12,6 +12,7 @@
 import org.junit.Test;
 
 import java.util.Enumeration;
+import java.util.TimeZone;
 import java.io.File;
 import java.io.FileInputStream;
 import static org.junit.Assert.*;
@@ -64,6 +65,7 @@ public ManifestRowBatchTest() {
 
     @BeforeClass
     public static void setUpClass() throws Exception {
+        TimeZone.setDefault(TimeZone.getTimeZone("America/Los_Angeles"));
     }
 
     @AfterClass

core/src/test/java/org/cdlib/mrt/core/ManifestRowSemanticTest.java

@@ -18,6 +18,7 @@
 import org.junit.Test;
 
 import java.util.Enumeration;
+import java.util.TimeZone;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
@@ -96,6 +97,7 @@ public ManifestRowSemanticTest() {
 
     @BeforeClass
     public static void setUpClass() throws Exception {
+        TimeZone.setDefault(TimeZone.getTimeZone("America/Los_Angeles"));
     }
 
     @AfterClass