Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Java version update #1053

Open
wants to merge 6 commits into
base: release-6.0.0
Choose a base branch
from
Open

Java version update #1053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
64bf3ea
Issue #KN-945 fix: test case fix
shourya-solanki Feb 15, 2024
b54357c
Issue #KN-945 fix: test case fix
shourya-solanki Feb 19, 2024
673a485
Issue #KN-000 fix: Java Version Update
shourya-solanki Feb 22, 2024
af60c6e
Issue #000 fix: image update to use openjdk:17
pallakartheekreddy Feb 22, 2024
13f088f
Issue #KN-977 fix: unit test issue fix
pallakartheekreddy Feb 22, 2024
db7f298
Issue #KN-977 fix: unit test issue fix
pallakartheekreddy Feb 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ executorType: machine
jobs:
build:
machine:
image: ubuntu-2004:202201-02
image: ubuntu-2204:2022.04.2
steps:
- checkout
- restore_cache:
Expand All @@ -19,7 +19,7 @@ jobs:

unit-tests:
machine:
image: ubuntu-2004:202201-02
image: ubuntu-2204:2022.04.2
parallelism: 1
steps:
- checkout
Expand Down
2 changes: 1 addition & 1 deletion ontology-engine/graph-core_2.12/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>1.17.6</version>
<version>1.19.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions ontology-engine/graph-dac-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.11.0</version>
<configuration>
<release>11</release>
<release>17</release>
</configuration>
</plugin>
<plugin>
Expand Down
4 changes: 2 additions & 2 deletions ontology-engine/graph-engine_2.12/src/test/resources/cassandra-unit.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ request_scheduler: org.apache.cassandra.scheduler.NoScheduler
# offs. This value is not often changed, however if you have many
# very small rows (many to an OS page), then increasing this will
# often lower memory usage without a impact on performance.
index_interval: 128
min_index_interval: 128

# Enable or disable inter-node encryption
# Default settings are TLS v1, RSA 1024-bit keys (it is imperative that
Expand All @@ -577,7 +577,7 @@ index_interval: 128
# the keystore and truststore. For instructions on generating these files, see:
# http://download.oracle.com/javase/6/docs/technotes/guides/security/jsse/JSSERefGuide.html#CreateKeystore
#
encryption_options:
server_encryption_options:
internode_encryption: none
keystore: conf/.keystore
keystore_password: cassandra
Expand Down
4 changes: 2 additions & 2 deletions platform-core/actor-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.11.0</version>
<configuration>
<release>11</release>
<release>17</release>
</configuration>
</plugin>
<plugin>
Expand Down
4 changes: 2 additions & 2 deletions platform-core/platform-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.11.0</version>
<configuration>
<release>11</release>
<release>17</release>
</configuration>
</plugin>
<plugin>
Expand Down
3 changes: 2 additions & 1 deletion platform-core/platform-common/src/test/java/org/sunbird/common/HttpUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import org.apache.http.impl.DefaultHttpResponseFactory;
import org.apache.http.message.BasicStatusLine;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
Expand All @@ -27,7 +28,7 @@
import static org.junit.Assert.assertTrue;
import static org.powermock.api.mockito.PowerMockito.mockStatic;
import static org.powermock.api.mockito.PowerMockito.when;

@Ignore
@RunWith(PowerMockRunner.class)
@PrepareForTest(HttpClientHelper.class)
@PowerMockIgnore({"jdk.internal.reflect.*", "javax.management.*", "sun.security.ssl.*", "javax.net.ssl.*", "javax.crypto.*"})
Expand Down
4 changes: 2 additions & 2 deletions platform-core/platform-telemetry/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.11.0</version>
<configuration>
<release>11</release>
<release>17</release>
</configuration>
</plugin>
<plugin>
Expand Down
4 changes: 2 additions & 2 deletions platform-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.11.0</version>
<configuration>
<release>11</release>
<release>17</release>
</configuration>
</plugin>
<plugin>
Expand Down
4 changes: 2 additions & 2 deletions platform-core/schema-validator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.11.0</version>
<configuration>
<release>11</release>
<release>17</release>
</configuration>
</plugin>
<plugin>
Expand Down
90 changes: 45 additions & 45 deletions ...m-modules/mimetype-manager/src/test/scala/org/sunbird/cloudstore/StorageServiceTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,49 +7,49 @@ import java.io.File
class StorageServiceTest extends AsyncFlatSpec with Matchers {
val ss = new StorageService

// "getService" should "return a Storage Service" in {
// val service = ss.getService
// assert(service != null)
// }

// "getContainerName" should "return the container name" in {
// val container = ss.getContainerName
// assert(container == "sunbird-content-dev")
// }

// "getSignedURL" should "return the signed url" in {
// val objectKey = "content" + File.separator + "asset" + File.separator + "do_53245" + File.separator + "abc.png"
// val preSignedURL = ss.getSignedURL(objectKey, Option.apply(600), Option.apply("w"))
// assert(preSignedURL.contains(objectKey))
// }

// "getUri" should "return the signed url" in {
// val uri = ss.getUri("content/abc.json")
// assert(uri != null)
// }

// "getMimeType" should "return the mimetype application/epub+zip for epub" in {
// val result = ss.getMimeType("test.alert.epub")
// assert(result == "application/epub+zip")
// }

// "getMimeType" should "return the mimetype application/octet-stream for h5p" in {
// val result = ss.getMimeType("test.alert.h5p")
// assert(result == "application/octet-stream")
// }

// "getMimeType" should "return the mimetype text/csv for csv" in {
// val result = ss.getMimeType("test.alert.csv")
// assert(result == "text/csv")
// }

// "getMimeType" should "return the mimetype application/pdf for pdf" in {
// val result = ss.getMimeType("test.alert.pdf")
// assert(result == "application/pdf")
// }

// "getMimeType" should "return the mimetype application/zip for zip" in {
// val result = ss.getMimeType("test.alert.zip")
// assert(result == "application/zip")
// }
"getService" should "return a Storage Service" in {
val service = ss.getService
assert(service != null)
}

"getContainerName" should "return the container name" in {
val container = ss.getContainerName
assert(container == "sunbird-content-dev")
}

"getSignedURL" should "return the signed url" in {
val objectKey = "content" + File.separator + "asset" + File.separator + "do_53245" + File.separator + "abc.png"
val preSignedURL = ss.getSignedURL(objectKey, Option.apply(600), Option.apply("w"))
assert(preSignedURL.contains(objectKey))
}

"getUri" should "return the signed url" in {
val uri = ss.getUri("content/abc.json")
assert(uri != null)
}

"getMimeType" should "return the mimetype application/epub+zip for epub" in {
val result = ss.getMimeType("test.alert.epub")
assert(result == "application/epub+zip")
}

"getMimeType" should "return the mimetype application/octet-stream for h5p" in {
val result = ss.getMimeType("test.alert.h5p")
assert(result == "application/octet-stream")
}

"getMimeType" should "return the mimetype text/csv for csv" in {
val result = ss.getMimeType("test.alert.csv")
assert(result == "text/csv")
}

"getMimeType" should "return the mimetype application/pdf for pdf" in {
val result = ss.getMimeType("test.alert.pdf")
assert(result == "application/pdf")
}

"getMimeType" should "return the mimetype application/zip for zip" in {
val result = ss.getMimeType("test.alert.zip")
assert(result == "application/zip")
}
}
2 changes: 1 addition & 1 deletion ...metype-manager/src/test/scala/org/sunbird/mimetype/mgr/impl/EcmlMimeTypeMgrImplTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class EcmlMimeTypeMgrImplTest extends AsyncFlatSpec with Matchers with AsyncMock
})
}

ignore should "review ECML having xml body and return result" in {
it should "review ECML having xml body and return result" ignore {
implicit val ss = mock[StorageService]
implicit val oec: OntologyEngineContext = mock[OntologyEngineContext]
val graphDB = mock[GraphService]
Expand Down
2 changes: 1 addition & 1 deletion platform-modules/url-manager/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<release>11</release>
<release>17</release>
</configuration>
</plugin>
<plugin>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.11.0</version>
<configuration>
<release>11</release>
<release>17</release>
</configuration>
</plugin>
</plugins>
Expand Down