fixes for PostgreSQL error and spring initialization in Staging

ksrihari09 · ksrihari09 · commit e2f1d269de25 · 2025-09-04T21:19:20.000+05:30
diff --git a/adapters/dynamoDB_adapters/pom.xml b/adapters/dynamoDB_adapters/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>org.atomhopper</groupId>
-        <version>1.2.35</version>
+        <version>1.2.35-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -81,6 +81,10 @@
             <artifactId>commons-text</artifactId>
             <version>1.9</version>
         </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+        </dependency>
 
 
     </dependencies>
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
@@ -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
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.atomhopper</groupId>
         <artifactId>parent</artifactId>
-        <version>1.2.35</version>
+        <version>1.2.35-SNAPSHOT</version>
         <relativePath>./../../pom.xml</relativePath>
     </parent>
 
diff --git a/adapters/jdbc/pom.xml b/adapters/jdbc/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.atomhopper</groupId>
         <artifactId>parent</artifactId>
-        <version>1.2.35</version>
+        <version>1.2.35-SNAPSHOT</version>
         <relativePath>./../../pom.xml</relativePath>
     </parent>
 
diff --git a/adapters/migration/pom.xml b/adapters/migration/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.atomhopper</groupId>
         <artifactId>parent</artifactId>
-        <version>1.2.35</version>
+        <version>1.2.35-SNAPSHOT</version>
         <relativePath>./../../pom.xml</relativePath>
     </parent>
 
diff --git a/adapters/mongodb/pom.xml b/adapters/mongodb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.atomhopper</groupId>
         <artifactId>parent</artifactId>
-        <version>1.2.35</version>
+        <version>1.2.35-SNAPSHOT</version>
         <relativePath>./../../pom.xml</relativePath>
     </parent>
 
diff --git a/adapters/postgres-adapter/pom.xml b/adapters/postgres-adapter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.atomhopper</groupId>
         <artifactId>parent</artifactId>
-        <version>1.2.35</version>
+        <version>1.2.35-SNAPSHOT</version>
         <relativePath>./../../pom.xml</relativePath>
     </parent>
 
diff --git a/atomhopper/pom.xml b/atomhopper/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.atomhopper</groupId>
         <artifactId>parent</artifactId>
-        <version>1.2.35</version>
+        <version>1.2.35-SNAPSHOT</version>
     </parent>
 
     <groupId>org.atomhopper</groupId>
diff --git 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
         <categories-descriptor reference="workspace-categories-descriptor" />
 
         <feed title="Testing Feed" resource="/feed">
-            <feed-source reference="dynamodbFeedSource" />
+            <!--             <feed-source reference="hibernate-feed-source" /> -->
             <publisher reference="dynamodb-feed-publisher" />
         </feed>
     </workspace>
diff --git a/atomhopper/src/main/webapp/META-INF/application-context.xml b/atomhopper/src/main/webapp/META-INF/application-context.xml
@@ -221,8 +221,8 @@
         <property name="dynamoDBClient" ref="client"></property>
     </bean>
 
-    <bean id="dynamodbFeedSource" name="dynamodbFeedSource" class="org.atomhopper.dynamodb.adapter.DynamoDBFeedSource">
-        <property name="amazonDynamoDBClient" ref="client"></property>
-    </bean>
+    <!--    <bean id="dynamodb-feed-source" name="dynamodb-feed-source" class="org.atomhopper.dynamodb.adapter.DynamoDBFeedSource">-->
+    <!--        <property name="dynamoDBClient" ref="client"></property>-->
+    <!--    </bean>-->
 
 </beans>
diff --git 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
@@ -5,7 +5,7 @@
      <parent>
         <groupId>org.atomhopper</groupId>
         <artifactId>parent</artifactId>
-        <version>1.2.35</version>
+         <version>1.2.35-SNAPSHOT</version>
     </parent>
 
     <groupId>org.atomhopper</groupId>
diff --git a/hopper/pom.xml b/hopper/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.atomhopper</groupId>
         <artifactId>parent</artifactId>
-        <version>1.2.35</version>
+        <version>1.2.35-SNAPSHOT</version>
     </parent>
 
     <groupId>org.atomhopper</groupId>
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>org.atomhopper</groupId>
     <artifactId>parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.2.35</version>
+    <version>1.2.35-SNAPSHOT</version>
     <name>ATOM Hopper - ATOMpub Server Collection</name>
 
     <url>http://atomhopper.org/</url>
diff --git a/server/pom.xml b/server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.atomhopper</groupId>
         <artifactId>parent</artifactId>
-        <version>1.2.35</version>
+        <version>1.2.35-SNAPSHOT</version>
     </parent>
 
     <groupId>org.atomhopper</groupId>
diff --git a/test-suite/pom.xml b/test-suite/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.atomhopper</groupId>
         <artifactId>parent</artifactId>
-        <version>1.2.35</version>
+        <version>1.2.35-SNAPSHOT</version>
     </parent>
 
     <groupId>org.atomhopper</groupId>
diff --git a/test-util/pom.xml b/test-util/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.atomhopper</groupId>
         <artifactId>parent</artifactId>
-        <version>1.2.35</version>
+        <version>1.2.35-SNAPSHOT</version>
     </parent>
 
     <groupId>org.atomhopper</groupId>
