Skip to content
GitLab
Unverified Commit 126471b0 authored by Mahesh Maney R's avatar Mahesh Maney R Committed by GitHub
Browse files

Merge pull request #5 from Radheshhathwar/main 

Changed the dependency and made changes in the java version
parents 792b455e 86bd1995
main Response_fixes access_based_check auxillary_apis bug_fix_question_paper_upload development fee_changes fee_workflow github/fork/ruksana2808/filter_bug_examCycle instituteApis_shishir uri_access_check
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 362 additions and 362 deletions
+362 -362
common-util/pom.xml
+ 309
− 325
View file @ 126471b0
This diff is collapsed.
upsmf-entity/pom.xml
+ 7
− 1
View file @ 126471b0
......@@ -45,7 +45,7 @@
<version>2.12.1</version>
</dependency>
<dependency>
<groupId>com.tarento.upsmf</groupId>
<groupId>org.upsmf</groupId>
<artifactId>upsmf-es-utils</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>compile</scope>
......@@ -92,6 +92,12 @@
<artifactId>modelmapper</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>org.upsmf</groupId>
<artifactId>upsmf-es-utils</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
......
upsmf-entity/src/main/resources/application.properties
+ 2
− 2
View file @ 126471b0
......@@ -6,7 +6,7 @@ spring.datasource.password=postgres
spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect
spring.jpa.properties.hibernate.format_sql=true
spring.jpa.show-sql=false
spring.jpa.properties.hibernate.type_map.your.package.MapType=your.package.MapType
#spring.jpa.properties.hibernate.type_map.your.package.MapType=your.package.MapType
#Storage Service properties
......@@ -26,7 +26,7 @@ accesstoken.publickey.basepath=/home/radhesh/Desktop/FileStorage/keys
sunbird_sso_url=https://aastrika-stage.tarento.com/auth/
sunbird_sso_realm=sunbird
#user.read.endpoint=https://aastrika-stage.tarento.com/api/user/v2/read/
user.read.endpoint=https://aastrika-stage.tarento.com/api/user/v2/read/
#workflow service
wf.service.url=http://localhost:5099/
......
upsmf-es-utils/pom.xml
+ 44
− 34
View file @ 126471b0
......@@ -2,20 +2,21 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.tarento.upsmf</groupId>
<groupId>org.upsmf</groupId>
<artifactId>upsmf-es-utils</artifactId>
<version>1.0-SNAPSHOT</version>
<name>UPSMF ElasticSearch Utils</name>
<properties>
<version.compiler.plugin>2.3.1</version.compiler.plugin>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<scoverage.plugin.version>1.1.1</scoverage.plugin.version>
</properties>
<dependencies>
<!-- Elasticsearch Dependencies -->
<!-- added for rest client -->
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>elasticsearch-rest-high-level-client</artifactId>
......@@ -26,67 +27,76 @@
<artifactId>transport</artifactId>
<version>6.3.2</version>
</dependency>
<!-- Logging Dependencies -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.14.1</version>
<version>2.8.2</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.14.1</version>
<version>2.8.2</version>
</dependency>
<!-- Other Dependencies -->
<dependency>
<groupId>com.tarento.upsmf</groupId>
<groupId>org.sunbird</groupId>
<artifactId>common-util</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<!-- Test Dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.upsmf</groupId>
<artifactId>common-util</artifactId>
<version>0.0.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<sourceDirectory>${basedir}/src/main/java</sourceDirectory>
<testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>11</source>
<target>11</target>
</configuration>
</plugin>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>11</source>
<target>11</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.20</version>
<configuration>
<includes>
<include>**/*Spec.java</include>
<include>**/*Test.java</include>
</includes>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
<configuration>
<includes>
<include>**/*Spec.java</include>
<include>**/*Test.java</include>
</includes>
</configuration>
</plugin>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.7</version>
<version>0.8.4</version>
<configuration>
<destFile>${basedir}/target/coverage-reports/jacoco-unit.exec</destFile>
<dataFile>${basedir}/target/coverage-reports/jacoco-unit.exec</dataFile>
</configuration>
<executions>
<execution>
<id>jacoco-initialize</id>
<goals>
<goal>prepare-agent</goal>
</goals>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment