Skip to content
Snippets Groups Projects
Commit b645d60d authored by Yong Zeng's avatar Yong Zeng
Browse files

Merge branch 'aws-3' into 'master'

update os-core-lib-aws version

See merge request !460
parents 80b6f769 251837e9
No related branches found
No related tags found
1 merge request!460update os-core-lib-aws version
Pipeline #229554 failed
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
<java.version>17</java.version> <java.version>17</java.version>
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<aws.version>1.11.1018</aws.version>
<log4j2.version>2.17.1</log4j2.version> <log4j2.version>2.17.1</log4j2.version>
<jackson-databind.version>2.13.2.2</jackson-databind.version> <jackson-databind.version>2.13.2.2</jackson-databind.version>
<jackson.version>2.13.2</jackson.version> <jackson.version>2.13.2</jackson.version>
...@@ -44,13 +43,6 @@ ...@@ -44,13 +43,6 @@
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
<version>${os-core-common.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId> <artifactId>log4j-to-slf4j</artifactId>
...@@ -76,7 +68,7 @@ ...@@ -76,7 +68,7 @@
<dependency> <dependency>
<groupId>org.opengroup.osdu.core.aws</groupId> <groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId> <artifactId>os-core-lib-aws</artifactId>
<version>0.25.1-SNAPSHOT</version> <version>0.25.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
...@@ -85,13 +77,6 @@ ...@@ -85,13 +77,6 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-secretsmanager -->
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-secretsmanager</artifactId>
<version>${aws.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.opengroup.osdu</groupId> <groupId>org.opengroup.osdu</groupId>
<artifactId>notification-core</artifactId> <artifactId>notification-core</artifactId>
......
...@@ -38,7 +38,7 @@ limitations under the License. ...@@ -38,7 +38,7 @@ limitations under the License.
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<os-core-common.version>0.25.0-rc2</os-core-common.version> <os-core-common.version>0.25.0-rc2</os-core-common.version>
<spring-boot-maven-plugin.version>2.7.6</spring-boot-maven-plugin.version> <spring-boot-maven-plugin.version>2.7.6</spring-boot-maven-plugin.version>
<aws-java-sdk.version>1.11.1018</aws-java-sdk.version> <aws-java-sdk.version>1.12.472</aws-java-sdk.version>
<aws-encryption-sdk-java.version>2.4.0</aws-encryption-sdk-java.version> <aws-encryption-sdk-java.version>2.4.0</aws-encryption-sdk-java.version>
</properties> </properties>
...@@ -83,7 +83,6 @@ limitations under the License. ...@@ -83,7 +83,6 @@ limitations under the License.
</property> </property>
</activation> </activation>
<properties> <properties>
<aws.version>1.11.1018</aws.version>
<repo.releases.id>community-maven-repo</repo.releases.id> <repo.releases.id>community-maven-repo</repo.releases.id>
<publish.snapshots.id>community-maven-via-job-token</publish.snapshots.id> <publish.snapshots.id>community-maven-via-job-token</publish.snapshots.id>
<publish.releases.id>community-maven-via-job-token</publish.releases.id> <publish.releases.id>community-maven-via-job-token</publish.releases.id>
......
...@@ -44,33 +44,13 @@ ...@@ -44,33 +44,13 @@
<dependency> <dependency>
<groupId>org.opengroup.osdu.core.aws</groupId> <groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId> <artifactId>os-core-lib-aws</artifactId>
<version>0.24.0</version> <version>0.25.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-cognitoidp</artifactId>
<version>1.11.676</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-ssm</artifactId>
<version>1.11.339</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-sqs</artifactId>
<version>1.11.339</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.opengroup.osdu.notification</groupId> <groupId>org.opengroup.osdu.notification</groupId>
<artifactId>notification-test-core</artifactId> <artifactId>notification-test-core</artifactId>
<version>0.25.0-SNAPSHOT</version> <version>0.25.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
<version>0.24.0</version>
</dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment