From 804779ef6f886d2d1a4e2843a19cec25adf1bdbd Mon Sep 17 00:00:00 2001 From: Srihari K Date: Tue, 2 Sep 2025 22:36:49 +0530 Subject: [PATCH 1/6] fixes for PostgreSQL error and spring initialization in Staging --- .github/workflows/Docker.build.yaml | 37 +++++++++++++++++ adapters/dynamoDB_adapters/pom.xml | 2 +- .../dynamodb/adapter/DynamoDBFeedSource.java | 14 +++++++ adapters/hibernate/pom.xml | 2 +- adapters/jdbc/pom.xml | 2 +- .../jdbc/adapter/JdbcFeedSource.java | 18 ++++++++- adapters/migration/pom.xml | 2 +- adapters/mongodb/pom.xml | 2 +- adapters/postgres-adapter/pom.xml | 2 +- atomhopper/pom.xml | 9 +---- .../resources/META-INF/atom-server.cfg.xml | 2 +- .../webapp/META-INF/application-context.xml | 6 +-- docker/Dockerfile | 40 ++++++++++++++----- documentation/pom.xml | 2 +- hopper/pom.xml | 2 +- pom.xml | 8 +++- server/pom.xml | 2 +- test-suite/pom.xml | 2 +- test-util/pom.xml | 2 +- 19 files changed, 122 insertions(+), 34 deletions(-) create mode 100644 .github/workflows/Docker.build.yaml diff --git a/.github/workflows/Docker.build.yaml b/.github/workflows/Docker.build.yaml new file mode 100644 index 00000000..015a982e --- /dev/null +++ b/.github/workflows/Docker.build.yaml @@ -0,0 +1,37 @@ +name: Docker Build and Deploy + +on: + push: + branches: + - staging-error-fixes #branch name which is used for image building + +jobs: + build: + runs-on: self-hosted + permissions: + contents: read + packages: read + + env: + ECR_REPOSITORY: atomhopper + AWS_REGION: us-east-1 + + steps: + - name: checkout code + uses: actions/checkout@v3 + + - name: Set Short commit SHA as image tag + run: echo "IMAGE_TAG=$(echo $GITHUB_SHA | cut -c1-7)" >> $GITHUB_ENV + + - name: AWS ECR login + run: | + aws ecr get-login-password --region ${{ env.AWS_REGION }} | docker login --username AWS --password-stdin ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com + - name: Build docker image + run: | + docker build -f docker/Dockerfile \ + --build-arg GITHUB_TOKEN=${{ secrets.PAT_FOR_DOCKER }} \ + --build-arg GITHUB_ACTOR=${{ secrets.USER_ID }} \ + -t ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com/${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }} . + - name: Push docker image to registry + run: | + docker push ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com/${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }} \ No newline at end of file diff --git a/adapters/dynamoDB_adapters/pom.xml b/adapters/dynamoDB_adapters/pom.xml index af7b89b4..8bd636f1 100644 --- a/adapters/dynamoDB_adapters/pom.xml +++ b/adapters/dynamoDB_adapters/pom.xml @@ -5,7 +5,7 @@ parent org.atomhopper - 1.2.35-SNAPSHOT + 1.2.35 ../../pom.xml 4.0.0 diff --git a/adapters/dynamoDB_adapters/src/main/java/org/atomhopper/dynamodb/adapter/DynamoDBFeedSource.java b/adapters/dynamoDB_adapters/src/main/java/org/atomhopper/dynamodb/adapter/DynamoDBFeedSource.java index 359bcd86..1cbef8e2 100644 --- a/adapters/dynamoDB_adapters/src/main/java/org/atomhopper/dynamodb/adapter/DynamoDBFeedSource.java +++ b/adapters/dynamoDB_adapters/src/main/java/org/atomhopper/dynamodb/adapter/DynamoDBFeedSource.java @@ -121,6 +121,11 @@ public void afterPropertiesSet() { } + // Default constructor for Spring instantiation + public DynamoDBFeedSource() { + // Spring will inject dependencies via setters + } + public DynamoDBFeedSource(AmazonDynamoDBClient amazonDynamoDBClient) { this.amazonDynamoDBClient = amazonDynamoDBClient; this.dynamoDB = new DynamoDB(this.amazonDynamoDBClient); @@ -132,6 +137,15 @@ public void setDynamoDB(DynamoDB dynamoDB) { this.dynamoDB = dynamoDB; } + // Setter for Spring dependency injection + public void setAmazonDynamoDBClient(AmazonDynamoDBClient amazonDynamoDBClient) { + this.amazonDynamoDBClient = amazonDynamoDBClient; + if (amazonDynamoDBClient != null) { + this.dynamoDB = new DynamoDB(amazonDynamoDBClient); + this.mapper = new DynamoDBMapper(amazonDynamoDBClient); + } + } + /** * This method is used to return the categories based search with the help of feed and entryId and search type is backward * whch means it will search for date less the markerDate along with other params. diff --git a/adapters/hibernate/pom.xml b/adapters/hibernate/pom.xml index eaf139ca..c272806e 100644 --- a/adapters/hibernate/pom.xml +++ b/adapters/hibernate/pom.xml @@ -5,7 +5,7 @@ org.atomhopper parent - 1.2.35-SNAPSHOT + 1.2.35 ./../../pom.xml diff --git a/adapters/jdbc/pom.xml b/adapters/jdbc/pom.xml index 3c00eb0e..dc04674b 100644 --- a/adapters/jdbc/pom.xml +++ b/adapters/jdbc/pom.xml @@ -5,7 +5,7 @@ org.atomhopper parent - 1.2.35-SNAPSHOT + 1.2.35 ./../../pom.xml diff --git a/adapters/jdbc/src/main/java/org/atomhopper/jdbc/adapter/JdbcFeedSource.java b/adapters/jdbc/src/main/java/org/atomhopper/jdbc/adapter/JdbcFeedSource.java index 12fd785f..a3c9b0db 100644 --- a/adapters/jdbc/src/main/java/org/atomhopper/jdbc/adapter/JdbcFeedSource.java +++ b/adapters/jdbc/src/main/java/org/atomhopper/jdbc/adapter/JdbcFeedSource.java @@ -28,6 +28,9 @@ import org.springframework.dao.DataAccessException; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.ResultSetExtractor; + +import java.sql.Array; +import java.sql.SQLException; import org.springframework.jdbc.core.RowMapper; import java.io.StringReader; @@ -794,7 +797,20 @@ public Object extractData( ResultSet rs ) throws SQLException, DataAccessExcepti entry.setEntryId(rs.getString("entryid")); - List cats = new ArrayList( Arrays.asList( (String[])rs.getArray( "categories" ).getArray() ) ); + List cats = new ArrayList(); + try { + Array categoriesArray = rs.getArray("categories"); + if (categoriesArray != null) { + String[] categoryArray = (String[]) categoriesArray.getArray(); + if (categoryArray != null) { + cats.addAll(Arrays.asList(categoryArray)); + } + } + } catch (SQLException e) { + LOG.warn("Failed to process categories array: {}", e.getMessage(), e); + } catch (NullPointerException e) { + LOG.warn("Null pointer encountered while processing categories: {}", e.getMessage(), e); + } for( String column : mapColumn.keySet() ) { diff --git a/adapters/migration/pom.xml b/adapters/migration/pom.xml index 83e2f4fd..291e1350 100644 --- a/adapters/migration/pom.xml +++ b/adapters/migration/pom.xml @@ -5,7 +5,7 @@ org.atomhopper parent - 1.2.35-SNAPSHOT + 1.2.35 ./../../pom.xml diff --git a/adapters/mongodb/pom.xml b/adapters/mongodb/pom.xml index 35436835..2eebe3f8 100644 --- a/adapters/mongodb/pom.xml +++ b/adapters/mongodb/pom.xml @@ -5,7 +5,7 @@ org.atomhopper parent - 1.2.35-SNAPSHOT + 1.2.35 ./../../pom.xml diff --git a/adapters/postgres-adapter/pom.xml b/adapters/postgres-adapter/pom.xml index a62cf3d2..b36a0f78 100644 --- a/adapters/postgres-adapter/pom.xml +++ b/adapters/postgres-adapter/pom.xml @@ -5,7 +5,7 @@ org.atomhopper parent - 1.2.35-SNAPSHOT + 1.2.35 ./../../pom.xml diff --git a/atomhopper/pom.xml b/atomhopper/pom.xml index d8cf695f..6bec2e20 100644 --- a/atomhopper/pom.xml +++ b/atomhopper/pom.xml @@ -5,7 +5,7 @@ org.atomhopper parent - 1.2.35-SNAPSHOT + 1.2.35 org.atomhopper @@ -65,7 +65,6 @@ org.atomhopper.adapter dynamoDB_adapters - 1.2.35-SNAPSHOT @@ -104,11 +103,7 @@ 4.2.5.RELEASE - - org.atomhopper.adapter - dynamoDB_adapters - 1.2.35-SNAPSHOT - + jakarta.xml.bind diff --git a/atomhopper/src/main/resources/META-INF/atom-server.cfg.xml b/atomhopper/src/main/resources/META-INF/atom-server.cfg.xml index 49b014bc..3142b8ac 100644 --- a/atomhopper/src/main/resources/META-INF/atom-server.cfg.xml +++ b/atomhopper/src/main/resources/META-INF/atom-server.cfg.xml @@ -28,7 +28,7 @@ NOTE: Place this file in the following folder: /etc/atomhopper/atom-server.cfg.x - + diff --git a/atomhopper/src/main/webapp/META-INF/application-context.xml b/atomhopper/src/main/webapp/META-INF/application-context.xml index 67d402a3..861d6274 100644 --- a/atomhopper/src/main/webapp/META-INF/application-context.xml +++ b/atomhopper/src/main/webapp/META-INF/application-context.xml @@ -221,8 +221,8 @@ - - - + + + \ No newline at end of file diff --git a/docker/Dockerfile b/docker/Dockerfile index dfee6f62..b738b603 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -3,9 +3,19 @@ FROM tomcat:9.0.41-jdk8 as tomcat FROM adoptopenjdk/openjdk8:alpine-slim +# Build arguments for GitHub authentication +ARG GITHUB_TOKEN +ARG GITHUB_ACTOR + +# Validate that authentication arguments are provided +RUN if [ -z "$GITHUB_TOKEN" ] || [ -z "$GITHUB_ACTOR" ]; then \ + echo "ERROR: GITHUB_TOKEN and GITHUB_ACTOR build arguments are required for GitHub Packages authentication"; \ + exit 1; \ + fi + LABEL maintainer="AtomHopperTeam@rackspace.com" \ #Atom Hopper version - version="1.2.33" \ + version="1.2.35" \ description="Docker image for Atom Hopper" #The database type @@ -16,28 +26,38 @@ ENV DB_TYPE=H2 \ DB_PASSWORD= \ #Database Host:Port DB_HOST=h2 \ - AH_VERSION=1.2.33 \ + AH_VERSION=1.2.35 \ CATALINA_HOME=/opt/tomcat \ AH_HOME=/opt/atomhopper \ PATH=${PATH}:${CATALINA_HOME}/bin:${AH_HOME} -RUN mkdir -p "${CATALINA_HOME}" "${AH_HOME}" /etc/atomhopper/ /var/log/atomhopper/ +RUN mkdir -p "${CATALINA_HOME}" "${AH_HOME}" /etc/atomhopper/ /var/log/atomhopper/ WORKDIR ${AH_HOME} COPY --from=tomcat /usr/local/tomcat ${CATALINA_HOME} -COPY start.sh . - -RUN apk --no-cache add curl \ - && curl -o atomhopper.war https://maven.research.rackspacecloud.com/content/repositories/releases/org/atomhopper/atomhopper/${AH_VERSION}/atomhopper-${AH_VERSION}.war \ +COPY docker/start.sh . + +RUN apk --no-cache add curl unzip file \ + && echo "Downloading AtomHopper ${AH_VERSION} from GitHub Packages..." \ + && echo "URL: https://maven.pkg.github.com/rackerlabs/atom-hopper/org/atomhopper/atomhopper/${AH_VERSION}/atomhopper-${AH_VERSION}.war" \ + && curl -L -v -u ${GITHUB_ACTOR}:${GITHUB_TOKEN} -o atomhopper.war \ + "https://maven.pkg.github.com/rackerlabs/atom-hopper/org/atomhopper/atomhopper/${AH_VERSION}/atomhopper-${AH_VERSION}.war" \ + && echo "Download completed. Verifying WAR file..." \ + && ls -la atomhopper.war \ + && file atomhopper.war \ + && unzip -t atomhopper.war > /dev/null \ + && echo "Extracting configuration files..." \ && unzip atomhopper.war META-INF/application-context.xml META-INF/template-logback.xml WEB-INF/classes/META-INF/atom-server.cfg.xml -d . \ && mv META-INF/application-context.xml WEB-INF/classes/META-INF/atom-server.cfg.xml /etc/atomhopper/ \ && mv META-INF/template-logback.xml /etc/atomhopper/logback.xml \ && mv atomhopper.war ${CATALINA_HOME}/webapps/ROOT.war \ && rm -rf META-INF WEB-INF \ - && chmod +x ${AH_HOME}/start.sh + && chmod +x ${AH_HOME}/start.sh \ + && echo "Verifying start.sh file..." \ + && ls -la ${AH_HOME}/start.sh \ + && echo "AtomHopper ${AH_VERSION} setup completed successfully" EXPOSE 8080 -CMD ["start.sh"] - +CMD ["/opt/atomhopper/start.sh"] \ No newline at end of file diff --git a/documentation/pom.xml b/documentation/pom.xml index 9a9da839..863fd974 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -5,7 +5,7 @@ org.atomhopper parent - 1.2.35-SNAPSHOT + 1.2.35 org.atomhopper diff --git a/hopper/pom.xml b/hopper/pom.xml index d17f416b..c65076ba 100644 --- a/hopper/pom.xml +++ b/hopper/pom.xml @@ -5,7 +5,7 @@ org.atomhopper parent - 1.2.35-SNAPSHOT + 1.2.35 org.atomhopper diff --git a/pom.xml b/pom.xml index 27971d4b..c43a5f82 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.atomhopper parent pom - 1.2.35-SNAPSHOT + 1.2.35 ATOM Hopper - ATOMpub Server Collection http://atomhopper.org/ @@ -102,6 +102,12 @@ ${project.version} + + org.atomhopper.adapter + dynamoDB_adapters + ${project.version} + + org.hibernate hibernate-core diff --git a/server/pom.xml b/server/pom.xml index 5d19438e..87d4e58e 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -5,7 +5,7 @@ org.atomhopper parent - 1.2.35-SNAPSHOT + 1.2.35 org.atomhopper diff --git a/test-suite/pom.xml b/test-suite/pom.xml index 0576600f..47fc67dd 100644 --- a/test-suite/pom.xml +++ b/test-suite/pom.xml @@ -5,7 +5,7 @@ org.atomhopper parent - 1.2.35-SNAPSHOT + 1.2.35 org.atomhopper diff --git a/test-util/pom.xml b/test-util/pom.xml index 4526ead6..65fb42eb 100644 --- a/test-util/pom.xml +++ b/test-util/pom.xml @@ -5,7 +5,7 @@ org.atomhopper parent - 1.2.35-SNAPSHOT + 1.2.35 org.atomhopper From 19feb33937a980b1579df4fcd89a13fe164ba118 Mon Sep 17 00:00:00 2001 From: Srihari K Date: Thu, 4 Sep 2025 18:09:50 +0530 Subject: [PATCH 2/6] fixes for PostgreSQL error and spring initialization in Staging --- .../jdbc/adapter/JdbcFeedSource.java | 22 ++++++++++--------- docker/Dockerfile | 16 +++----------- 2 files changed, 15 insertions(+), 23 deletions(-) diff --git a/adapters/jdbc/src/main/java/org/atomhopper/jdbc/adapter/JdbcFeedSource.java b/adapters/jdbc/src/main/java/org/atomhopper/jdbc/adapter/JdbcFeedSource.java index a3c9b0db..34bc50be 100644 --- a/adapters/jdbc/src/main/java/org/atomhopper/jdbc/adapter/JdbcFeedSource.java +++ b/adapters/jdbc/src/main/java/org/atomhopper/jdbc/adapter/JdbcFeedSource.java @@ -29,7 +29,6 @@ import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.ResultSetExtractor; -import java.sql.Array; import java.sql.SQLException; import org.springframework.jdbc.core.RowMapper; @@ -38,8 +37,15 @@ import java.net.URL; import java.net.URLEncoder; import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.HashMap; +import java.util.Date; +import java.util.UUID; +import java.util.LinkedList; +import java.util.Collections; import java.util.concurrent.TimeUnit; import static org.apache.abdera.i18n.text.UrlEncoding.decode; @@ -799,16 +805,12 @@ public Object extractData( ResultSet rs ) throws SQLException, DataAccessExcepti List cats = new ArrayList(); try { - Array categoriesArray = rs.getArray("categories"); - if (categoriesArray != null) { - String[] categoryArray = (String[]) categoriesArray.getArray(); - if (categoryArray != null) { - cats.addAll(Arrays.asList(categoryArray)); - } - } + cats.addAll(Arrays.asList((String[]) rs.getArray("categories").getArray())); } catch (SQLException e) { + // Handle PostgreSQL-specific array processing errors LOG.warn("Failed to process categories array: {}", e.getMessage(), e); } catch (NullPointerException e) { + // Handle cases where array or its elements are null LOG.warn("Null pointer encountered while processing categories: {}", e.getMessage(), e); } diff --git a/docker/Dockerfile b/docker/Dockerfile index b738b603..fd2152f2 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -38,25 +38,15 @@ WORKDIR ${AH_HOME} COPY --from=tomcat /usr/local/tomcat ${CATALINA_HOME} COPY docker/start.sh . -RUN apk --no-cache add curl unzip file \ - && echo "Downloading AtomHopper ${AH_VERSION} from GitHub Packages..." \ - && echo "URL: https://maven.pkg.github.com/rackerlabs/atom-hopper/org/atomhopper/atomhopper/${AH_VERSION}/atomhopper-${AH_VERSION}.war" \ - && curl -L -v -u ${GITHUB_ACTOR}:${GITHUB_TOKEN} -o atomhopper.war \ +RUN apk --no-cache add curl unzip \ + && curl -L -u ${GITHUB_ACTOR}:${GITHUB_TOKEN} -o atomhopper.war \ "https://maven.pkg.github.com/rackerlabs/atom-hopper/org/atomhopper/atomhopper/${AH_VERSION}/atomhopper-${AH_VERSION}.war" \ - && echo "Download completed. Verifying WAR file..." \ - && ls -la atomhopper.war \ - && file atomhopper.war \ - && unzip -t atomhopper.war > /dev/null \ - && echo "Extracting configuration files..." \ && unzip atomhopper.war META-INF/application-context.xml META-INF/template-logback.xml WEB-INF/classes/META-INF/atom-server.cfg.xml -d . \ && mv META-INF/application-context.xml WEB-INF/classes/META-INF/atom-server.cfg.xml /etc/atomhopper/ \ && mv META-INF/template-logback.xml /etc/atomhopper/logback.xml \ && mv atomhopper.war ${CATALINA_HOME}/webapps/ROOT.war \ && rm -rf META-INF WEB-INF \ - && chmod +x ${AH_HOME}/start.sh \ - && echo "Verifying start.sh file..." \ - && ls -la ${AH_HOME}/start.sh \ - && echo "AtomHopper ${AH_VERSION} setup completed successfully" + && chmod +x ${AH_HOME}/start.sh EXPOSE 8080 From e2f1d269de25bb9c5af9ab90565cd986ac14b144 Mon Sep 17 00:00:00 2001 From: Srihari K Date: Thu, 4 Sep 2025 21:19:20 +0530 Subject: [PATCH 3/6] fixes for PostgreSQL error and spring initialization in Staging --- adapters/dynamoDB_adapters/pom.xml | 6 +++++- .../dynamodb/adapter/DynamoDBFeedSource.java | 14 -------------- adapters/hibernate/pom.xml | 2 +- adapters/jdbc/pom.xml | 2 +- adapters/migration/pom.xml | 2 +- adapters/mongodb/pom.xml | 2 +- adapters/postgres-adapter/pom.xml | 2 +- atomhopper/pom.xml | 2 +- .../main/resources/META-INF/atom-server.cfg.xml | 2 +- .../main/webapp/META-INF/application-context.xml | 6 +++--- docker/Dockerfile | 4 ++-- documentation/pom.xml | 2 +- hopper/pom.xml | 2 +- pom.xml | 2 +- server/pom.xml | 2 +- test-suite/pom.xml | 2 +- test-util/pom.xml | 2 +- 17 files changed, 23 insertions(+), 33 deletions(-) diff --git a/adapters/dynamoDB_adapters/pom.xml b/adapters/dynamoDB_adapters/pom.xml index 8bd636f1..19a7f748 100644 --- a/adapters/dynamoDB_adapters/pom.xml +++ b/adapters/dynamoDB_adapters/pom.xml @@ -5,7 +5,7 @@ parent org.atomhopper - 1.2.35 + 1.2.35-SNAPSHOT ../../pom.xml 4.0.0 @@ -81,6 +81,10 @@ commons-text 1.9 + + commons-lang + commons-lang + diff --git a/adapters/dynamoDB_adapters/src/main/java/org/atomhopper/dynamodb/adapter/DynamoDBFeedSource.java b/adapters/dynamoDB_adapters/src/main/java/org/atomhopper/dynamodb/adapter/DynamoDBFeedSource.java index 1cbef8e2..359bcd86 100644 --- a/adapters/dynamoDB_adapters/src/main/java/org/atomhopper/dynamodb/adapter/DynamoDBFeedSource.java +++ b/adapters/dynamoDB_adapters/src/main/java/org/atomhopper/dynamodb/adapter/DynamoDBFeedSource.java @@ -121,11 +121,6 @@ public void afterPropertiesSet() { } - // Default constructor for Spring instantiation - public DynamoDBFeedSource() { - // Spring will inject dependencies via setters - } - public DynamoDBFeedSource(AmazonDynamoDBClient amazonDynamoDBClient) { this.amazonDynamoDBClient = amazonDynamoDBClient; this.dynamoDB = new DynamoDB(this.amazonDynamoDBClient); @@ -137,15 +132,6 @@ public void setDynamoDB(DynamoDB dynamoDB) { this.dynamoDB = dynamoDB; } - // Setter for Spring dependency injection - public void setAmazonDynamoDBClient(AmazonDynamoDBClient amazonDynamoDBClient) { - this.amazonDynamoDBClient = amazonDynamoDBClient; - if (amazonDynamoDBClient != null) { - this.dynamoDB = new DynamoDB(amazonDynamoDBClient); - this.mapper = new DynamoDBMapper(amazonDynamoDBClient); - } - } - /** * This method is used to return the categories based search with the help of feed and entryId and search type is backward * whch means it will search for date less the markerDate along with other params. diff --git a/adapters/hibernate/pom.xml b/adapters/hibernate/pom.xml index c272806e..eaf139ca 100644 --- a/adapters/hibernate/pom.xml +++ b/adapters/hibernate/pom.xml @@ -5,7 +5,7 @@ org.atomhopper parent - 1.2.35 + 1.2.35-SNAPSHOT ./../../pom.xml diff --git a/adapters/jdbc/pom.xml b/adapters/jdbc/pom.xml index dc04674b..3c00eb0e 100644 --- a/adapters/jdbc/pom.xml +++ b/adapters/jdbc/pom.xml @@ -5,7 +5,7 @@ org.atomhopper parent - 1.2.35 + 1.2.35-SNAPSHOT ./../../pom.xml diff --git a/adapters/migration/pom.xml b/adapters/migration/pom.xml index 291e1350..83e2f4fd 100644 --- a/adapters/migration/pom.xml +++ b/adapters/migration/pom.xml @@ -5,7 +5,7 @@ org.atomhopper parent - 1.2.35 + 1.2.35-SNAPSHOT ./../../pom.xml diff --git a/adapters/mongodb/pom.xml b/adapters/mongodb/pom.xml index 2eebe3f8..35436835 100644 --- a/adapters/mongodb/pom.xml +++ b/adapters/mongodb/pom.xml @@ -5,7 +5,7 @@ org.atomhopper parent - 1.2.35 + 1.2.35-SNAPSHOT ./../../pom.xml diff --git a/adapters/postgres-adapter/pom.xml b/adapters/postgres-adapter/pom.xml index b36a0f78..a62cf3d2 100644 --- a/adapters/postgres-adapter/pom.xml +++ b/adapters/postgres-adapter/pom.xml @@ -5,7 +5,7 @@ org.atomhopper parent - 1.2.35 + 1.2.35-SNAPSHOT ./../../pom.xml diff --git a/atomhopper/pom.xml b/atomhopper/pom.xml index 6bec2e20..8c3d386e 100644 --- a/atomhopper/pom.xml +++ b/atomhopper/pom.xml @@ -5,7 +5,7 @@ org.atomhopper parent - 1.2.35 + 1.2.35-SNAPSHOT org.atomhopper diff --git a/atomhopper/src/main/resources/META-INF/atom-server.cfg.xml b/atomhopper/src/main/resources/META-INF/atom-server.cfg.xml index 3142b8ac..9cab7710 100644 --- a/atomhopper/src/main/resources/META-INF/atom-server.cfg.xml +++ b/atomhopper/src/main/resources/META-INF/atom-server.cfg.xml @@ -28,7 +28,7 @@ NOTE: Place this file in the following folder: /etc/atomhopper/atom-server.cfg.x - + diff --git a/atomhopper/src/main/webapp/META-INF/application-context.xml b/atomhopper/src/main/webapp/META-INF/application-context.xml index 861d6274..67d402a3 100644 --- a/atomhopper/src/main/webapp/META-INF/application-context.xml +++ b/atomhopper/src/main/webapp/META-INF/application-context.xml @@ -221,8 +221,8 @@ - - - + + + \ No newline at end of file diff --git a/docker/Dockerfile b/docker/Dockerfile index fd2152f2..4b733d90 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -15,7 +15,7 @@ RUN if [ -z "$GITHUB_TOKEN" ] || [ -z "$GITHUB_ACTOR" ]; then \ LABEL maintainer="AtomHopperTeam@rackspace.com" \ #Atom Hopper version - version="1.2.35" \ + version="1.2.33" \ description="Docker image for Atom Hopper" #The database type @@ -26,7 +26,7 @@ ENV DB_TYPE=H2 \ DB_PASSWORD= \ #Database Host:Port DB_HOST=h2 \ - AH_VERSION=1.2.35 \ + AH_VERSION=1.2.33 \ CATALINA_HOME=/opt/tomcat \ AH_HOME=/opt/atomhopper \ PATH=${PATH}:${CATALINA_HOME}/bin:${AH_HOME} diff --git a/documentation/pom.xml b/documentation/pom.xml index 863fd974..dfe59e01 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -5,7 +5,7 @@ org.atomhopper parent - 1.2.35 + 1.2.35-SNAPSHOT org.atomhopper diff --git a/hopper/pom.xml b/hopper/pom.xml index c65076ba..d17f416b 100644 --- a/hopper/pom.xml +++ b/hopper/pom.xml @@ -5,7 +5,7 @@ org.atomhopper parent - 1.2.35 + 1.2.35-SNAPSHOT org.atomhopper diff --git a/pom.xml b/pom.xml index c43a5f82..dcff8a42 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.atomhopper parent pom - 1.2.35 + 1.2.35-SNAPSHOT ATOM Hopper - ATOMpub Server Collection http://atomhopper.org/ diff --git a/server/pom.xml b/server/pom.xml index 87d4e58e..5d19438e 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -5,7 +5,7 @@ org.atomhopper parent - 1.2.35 + 1.2.35-SNAPSHOT org.atomhopper diff --git a/test-suite/pom.xml b/test-suite/pom.xml index 47fc67dd..0576600f 100644 --- a/test-suite/pom.xml +++ b/test-suite/pom.xml @@ -5,7 +5,7 @@ org.atomhopper parent - 1.2.35 + 1.2.35-SNAPSHOT org.atomhopper diff --git a/test-util/pom.xml b/test-util/pom.xml index 65fb42eb..4526ead6 100644 --- a/test-util/pom.xml +++ b/test-util/pom.xml @@ -5,7 +5,7 @@ org.atomhopper parent - 1.2.35 + 1.2.35-SNAPSHOT org.atomhopper From bf94032493a2620d029282dbd8e333c5ee2130c8 Mon Sep 17 00:00:00 2001 From: Srihari K Date: Thu, 4 Sep 2025 21:25:42 +0530 Subject: [PATCH 4/6] fixes for PostgreSQL error and spring initialization in Staging --- atomhopper/pom.xml | 1 + pom.xml | 8 +------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/atomhopper/pom.xml b/atomhopper/pom.xml index 8c3d386e..9764b7ca 100644 --- a/atomhopper/pom.xml +++ b/atomhopper/pom.xml @@ -65,6 +65,7 @@ org.atomhopper.adapter dynamoDB_adapters + 1.2.35-SNAPSHOT diff --git a/pom.xml b/pom.xml index dcff8a42..b3de5f27 100644 --- a/pom.xml +++ b/pom.xml @@ -102,13 +102,7 @@ ${project.version} - - org.atomhopper.adapter - dynamoDB_adapters - ${project.version} - - - + org.hibernate hibernate-core 4.1.3.Final From 98fbf28cf1a0ce9229a451fb5e301ec390990b6b Mon Sep 17 00:00:00 2001 From: Srihari K Date: Thu, 4 Sep 2025 21:35:04 +0530 Subject: [PATCH 5/6] fixes for PostgreSQL error and spring initialization in Staging --- docker/Dockerfile | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 4b733d90..eb2ed09d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -3,16 +3,6 @@ FROM tomcat:9.0.41-jdk8 as tomcat FROM adoptopenjdk/openjdk8:alpine-slim -# Build arguments for GitHub authentication -ARG GITHUB_TOKEN -ARG GITHUB_ACTOR - -# Validate that authentication arguments are provided -RUN if [ -z "$GITHUB_TOKEN" ] || [ -z "$GITHUB_ACTOR" ]; then \ - echo "ERROR: GITHUB_TOKEN and GITHUB_ACTOR build arguments are required for GitHub Packages authentication"; \ - exit 1; \ - fi - LABEL maintainer="AtomHopperTeam@rackspace.com" \ #Atom Hopper version version="1.2.33" \ @@ -31,22 +21,21 @@ ENV DB_TYPE=H2 \ AH_HOME=/opt/atomhopper \ PATH=${PATH}:${CATALINA_HOME}/bin:${AH_HOME} -RUN mkdir -p "${CATALINA_HOME}" "${AH_HOME}" /etc/atomhopper/ /var/log/atomhopper/ +RUN mkdir -p "${CATALINA_HOME}" "${AH_HOME}" /etc/atomhopper/ /var/log/atomhopper/ WORKDIR ${AH_HOME} COPY --from=tomcat /usr/local/tomcat ${CATALINA_HOME} COPY docker/start.sh . -RUN apk --no-cache add curl unzip \ - && curl -L -u ${GITHUB_ACTOR}:${GITHUB_TOKEN} -o atomhopper.war \ - "https://maven.pkg.github.com/rackerlabs/atom-hopper/org/atomhopper/atomhopper/${AH_VERSION}/atomhopper-${AH_VERSION}.war" \ +RUN apk --no-cache add curl \ + && curl -o atomhopper.war https://maven.research.rackspacecloud.com/content/repositories/releases/org/atomhopper/atomhopper/${AH_VERSION}/atomhopper-${AH_VERSION}.war \ && unzip atomhopper.war META-INF/application-context.xml META-INF/template-logback.xml WEB-INF/classes/META-INF/atom-server.cfg.xml -d . \ && mv META-INF/application-context.xml WEB-INF/classes/META-INF/atom-server.cfg.xml /etc/atomhopper/ \ && mv META-INF/template-logback.xml /etc/atomhopper/logback.xml \ && mv atomhopper.war ${CATALINA_HOME}/webapps/ROOT.war \ && rm -rf META-INF WEB-INF \ - && chmod +x ${AH_HOME}/start.sh + && chmod +x ${AH_HOME}/start.sh EXPOSE 8080 From 7b1850d499358f5296be1b42fd76aaa527d13e9a Mon Sep 17 00:00:00 2001 From: Srihari K Date: Fri, 5 Sep 2025 14:37:04 +0530 Subject: [PATCH 6/6] removed workflow doc as it's not needed --- .github/workflows/Docker.build.yaml | 37 ----------------------------- 1 file changed, 37 deletions(-) delete mode 100644 .github/workflows/Docker.build.yaml diff --git a/.github/workflows/Docker.build.yaml b/.github/workflows/Docker.build.yaml deleted file mode 100644 index 015a982e..00000000 --- a/.github/workflows/Docker.build.yaml +++ /dev/null @@ -1,37 +0,0 @@ -name: Docker Build and Deploy - -on: - push: - branches: - - staging-error-fixes #branch name which is used for image building - -jobs: - build: - runs-on: self-hosted - permissions: - contents: read - packages: read - - env: - ECR_REPOSITORY: atomhopper - AWS_REGION: us-east-1 - - steps: - - name: checkout code - uses: actions/checkout@v3 - - - name: Set Short commit SHA as image tag - run: echo "IMAGE_TAG=$(echo $GITHUB_SHA | cut -c1-7)" >> $GITHUB_ENV - - - name: AWS ECR login - run: | - aws ecr get-login-password --region ${{ env.AWS_REGION }} | docker login --username AWS --password-stdin ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com - - name: Build docker image - run: | - docker build -f docker/Dockerfile \ - --build-arg GITHUB_TOKEN=${{ secrets.PAT_FOR_DOCKER }} \ - --build-arg GITHUB_ACTOR=${{ secrets.USER_ID }} \ - -t ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com/${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }} . - - name: Push docker image to registry - run: | - docker push ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com/${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }} \ No newline at end of file