diff --git a/aws-modules/aws-miscellaneous/pom.xml b/aws-modules/aws-miscellaneous/pom.xml
index 2b07f1153b..036e692d24 100644
--- a/aws-modules/aws-miscellaneous/pom.xml
+++ b/aws-modules/aws-miscellaneous/pom.xml
@@ -100,20 +100,12 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>dynamodb-local</id>
-            <name>DynamoDB Local Release Repository</name>
-            <url>${dynamodblocal.repository.url}</url>
-        </repository>
-    </repositories>
 
     <properties>
         <aws-lambda-java-events.version>1.3.0</aws-lambda-java-events.version>
         <aws-lambda-java-core.version>1.1.0</aws-lambda-java-core.version>
         <gson.version>2.8.0</gson.version>
-        <dynamodblocal.version>1.11.86</dynamodblocal.version>
-        <dynamodblocal.repository.url>https://s3-us-west-2.amazonaws.com/dynamodb-local/release</dynamodblocal.repository.url>
+        <dynamodblocal.version>1.21.1</dynamodblocal.version>
         <commons-codec-version>1.10.L001</commons-codec-version>
         <jets3t-version>0.9.4.0006L</jets3t-version>
         <maven-plugins-version>3.1.1</maven-plugins-version>
diff --git a/jgit/pom.xml b/jgit/pom.xml
index 1b0d82e4d7..4e88808097 100644
--- a/jgit/pom.xml
+++ b/jgit/pom.xml
@@ -26,13 +26,6 @@
         </dependency>
     </dependencies>
 
-    <repositories>
-        <repository>
-            <id>jgit-repository</id>
-            <url>https://repo.eclipse.org/content/groups/releases/</url>
-        </repository>
-    </repositories>
-
     <properties>
         <org.eclipse.jgit.version>4.5.0.201609210915-r</org.eclipse.jgit.version>
     </properties>
diff --git a/web-modules/apache-tapestry/pom.xml b/web-modules/apache-tapestry/pom.xml
index 9632dd70dc..562cdff00c 100644
--- a/web-modules/apache-tapestry/pom.xml
+++ b/web-modules/apache-tapestry/pom.xml
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>org.apache.tapestry</groupId>
             <artifactId>tapestry-core</artifactId>
-            <version>${tapestry-release-version}</version>
+            <version>${tapestry.version}</version>
         </dependency>
         <!-- Include the Log4j implementation for the SLF4J logging framework -->
         <dependency>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tapestry</groupId>
             <artifactId>tapestry-webresources</artifactId>
-            <version>${tapestry-release-version}</version>
+            <version>${tapestry.version}</version>
         </dependency>
         <!-- Uncomment this to add support for file uploads: -->
         <!-- <dependency> -->
         <!-- <groupId>org.apache.tapestry</groupId> -->
         <!-- <artifactId>tapestry-upload</artifactId> -->
-        <!-- <version>${tapestry-release-version}</version> -->
+        <!-- <version>${tapestry.version}</version> -->
         <!-- </dependency> -->
         <!-- A dependency on either JUnit or TestNG is required, or the surefire plugin (which runs the -->
         <!-- tests) will fail, preventing Maven from packaging the WAR. Tapestry includes a large number -->
@@ -53,7 +53,7 @@
         <dependency>
             <groupId>org.apache.tapestry</groupId>
             <artifactId>tapestry-test</artifactId>
-            <version>${tapestry-release-version}</version>
+            <version>${tapestry.version}</version>
             <scope>test</scope>
         </dependency>
         <!-- Provided by the servlet container, but sometimes referenced in the application code. -->
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>org.apache.tapestry</groupId>
             <artifactId>tapestry-javadoc</artifactId>
-            <version>${tapestry-release-version}</version>
+            <version>${tapestry.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -135,12 +135,6 @@
             <id>jboss</id>
             <url>http://repository.jboss.org/nexus/content/groups/public/</url>
         </repository>
-        <!-- This repository is only needed when the Tapestry version is a preview release, -->
-        <!-- rather than a final release. -->
-        <repository>
-            <id>apache-staging</id>
-            <url>https://repository.apache.org/content/groups/staging/</url>
-        </repository>
     </repositories>
 
     <properties>
@@ -149,7 +143,7 @@
         <compiler.plugin.version>3.8.1</compiler.plugin.version>
         <source.version>11</source.version>
         <target.version>11</target.version>
-        <tapestry-release-version>5.8.2</tapestry-release-version>
+        <tapestry.version>5.8.2</tapestry.version>
         <servlet-api-release-version>2.5</servlet-api-release-version>
         <testng-release-version>6.8.21</testng-release-version>
         <slf4j-release-version>1.7.19</slf4j-release-version>