Skip to content

Commit

Permalink
Merge branch 'aiccra-staging' into aiccra-marlo-java-11-version2
Browse files Browse the repository at this point in the history
  • Loading branch information
@Cristian45
Cristian45 committed Sep 5, 2024
2 parents 9a36034 + 8348362 commit 1939856
Show file tree
Hide file tree
Showing 23 changed files with 3,757 additions and 234 deletions.
2 changes: 2 additions & 0 deletions marlo-data/src/main/java/org/cgiar/ccafs/marlo/config/APConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ public final class APConstants {
public static final String FEEDBACK_REPLAY_USERNAME = "feedback_replay_username";
public static final String FEEDBACK_COMMENT_REACTION = "feedback_comment_reaction";
public static final String FEEDBACK_RESPONSE = "feedback_response";
public static final String TIP_NOTIFICATION_EMAIL_ACTIVE = "tip_notification_email_active";

public static final String SECTION_ID = "section_id";
public static final String PREVIOUS_PROJECT_ID_ACTIVE = "previous_project_id_field_active";
public static final String HOMEPAGE_TIMELINE_ACTIVE = "homepage_timeline_active";
Expand Down
33 changes: 31 additions & 2 deletions marlo-data/src/main/java/org/cgiar/ccafs/marlo/data/model/TipParameters.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,20 @@ public class TipParameters extends MarloBaseEntity implements java.io.Serializab
private String encryptionKey;
@Expose
private Date tokenDueDate;
@Expose
private String tipEmail;
@Expose
private String emailText;
@Expose
private String emailSubject;

public String getEmailSubject() {
return emailSubject;
}

public String getEmailText() {
return emailText;
}

public String getEncryptionKey() {
return encryptionKey;
Expand Down Expand Up @@ -72,6 +86,11 @@ public String getTipBaseUrl() {
return tipBaseUrl;
}


public String getTipEmail() {
return tipEmail;
}

public String getTipLoginService() {
return tipLoginService;
}
Expand All @@ -88,7 +107,6 @@ public Date getTokenDueDate() {
return tokenDueDate;
}


public String getTokenValue() {
return tokenValue;
}
Expand All @@ -99,14 +117,21 @@ public boolean isActive() {
return false;
}

public void setEmailSubject(String emailSubject) {
this.emailSubject = emailSubject;
}

public void setEmailText(String emailText) {
this.emailText = emailText;
}

public void setEncryptionKey(String encryptionKey) {
this.encryptionKey = encryptionKey;
}

@Override
public void setModifiedBy(User modifiedBy) {
// TODO Auto-generated method stub

}

public void setPrivateKey(String privateKey) {
Expand All @@ -117,6 +142,10 @@ public void setTipBaseUrl(String tipBaseUrl) {
this.tipBaseUrl = tipBaseUrl;
}

public void setTipEmail(String tipEmail) {
this.tipEmail = tipEmail;
}

public void setTipLoginService(String tipLoginService) {
this.tipLoginService = tipLoginService;
}
Expand Down
9 changes: 9 additions & 0 deletions marlo-data/src/main/resources/xmls/TipParameters.hbm.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,14 @@
<property name="encryptionKey" type="string">
<column name="encryption_key"/>
</property>
<property name="tipEmail" type="string">
<column name="tip_email"/>
</property>
<property name="emailText" type="string">
<column name="email_text"/>
</property>
<property name="emailSubject" type="string">
<column name="email_subject"/>
</property>
</class>
</hibernate-mapping>
148 changes: 46 additions & 102 deletions marlo-parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<mysql.version>8.0.28</mysql.version>
<servlet-api.version>3.0.1</servlet-api.version>
<jsp-api.version>2.2.1</jsp-api.version>
<poi.version>3.13</poi.version>
<poi.version>3.17</poi.version>
<ooxml-schemas.version>1.0</ooxml-schemas.version>
<flyway.version>4.0.1</flyway.version>
<org.json.version>20231013</org.json.version>
Expand All @@ -37,7 +37,7 @@
<jasper-reports-version>6.2.2</jasper-reports-version>
<com.google.code.gson-version>2.8.9</com.google.code.gson-version>
<pusher-http-java>1.0.0</pusher-http-java>
<pentaho-report.version>6.1.0.1-196</pentaho-report.version>
<pentaho-report.version>8.0.0.6-352</pentaho-report.version>
<org-apache-axis.version>1.4</org-apache-axis.version>
<javax-xml.version>1.1</javax-xml.version>
<hikari.version>2.4.6</hikari.version>
Expand Down Expand Up @@ -68,7 +68,7 @@
<tomcat.version>8.0.53</tomcat.version>
<log4j.version>2.16.0</log4j.version>
<sonar.organization>ccafs</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
</properties>
<developers>
<developer>
Expand Down Expand Up @@ -101,17 +101,24 @@
<url>https://github.com/CCAFS/marlo/issues</url>
</issueManagement>
<!-- Setup repositories -->
<!-- <repositories> -->
<!-- <repository> -->
<!-- <id>spring-boot-throttling-repo</id> -->
<!-- <url>https://raw.github.com/weddini/spring-boot-throttling/mvn-repo/</url> -->
<!-- <snapshots> -->
<!-- <enabled>true</enabled> -->
<!-- <updatePolicy>always</updatePolicy> -->
<!-- </snapshots> -->
<!-- </repository> -->
<!-- </repositories> -->
<!-- <repositories> -->
<!-- <repository> -->
<!-- <id>spring-boot-throttling-repo</id> -->
<!--
<url>https://raw.github.com/weddini/spring-boot-throttling/mvn-repo/</url> -->
<!-- <snapshots> -->
<!-- <enabled>true</enabled> -->
<!-- <updatePolicy>always</updatePolicy> -->
<!-- </snapshots> -->
<!-- </repository> -->
<!-- </repositories> -->

<repositories>
<repository>
<id>pentaho-repo</id>
<url>https://repo.orl.eng.hitachivantara.com/artifactory/pnt-mvn/</url>
</repository>
</repositories>
<!-- Common dependencies go here. -->
<dependencyManagement>
<dependencies>
Expand All @@ -133,9 +140,9 @@
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${log4j.version}</version>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
Expand Down Expand Up @@ -212,82 +219,12 @@
<version>${ciat-adauth.version}</version>
</dependency>
<!-- PENTAHO dependencies -->

<dependency>
<groupId>org.pentaho</groupId>
<artifactId>core</artifactId>
<version>${pentaho-report.version}</version>
</dependency>
<dependency>
<groupId>org.pentaho</groupId>
<artifactId>extensions</artifactId>
<version>${pentaho-report.version}</version>
</dependency>
<dependency>
<groupId>org.pentaho</groupId>
<artifactId>base</artifactId>
<version>${pentaho-report.version}</version>
</dependency>
<dependency>
<groupId>org.pentaho</groupId>
<artifactId>libdocbundle</artifactId>
<version>${pentaho-report.version}</version>
</dependency>
<dependency>
<groupId>org.pentaho</groupId>
<artifactId>libfonts</artifactId>
<version>${pentaho-report.version}</version>
</dependency>
<dependency>
<groupId>org.pentaho</groupId>
<artifactId>libformat</artifactId>
<version>${pentaho-report.version}</version>
</dependency>
<dependency>
<groupId>org.pentaho</groupId>
<artifactId>libformula</artifactId>
<version>${pentaho-report.version}</version>
</dependency>
<dependency>
<groupId>org.pentaho</groupId>
<artifactId>libloader</artifactId>
<version>${pentaho-report.version}</version>
</dependency>
<dependency>
<groupId>org.pentaho</groupId>
<artifactId>librepository</artifactId>
<version>${pentaho-report.version}</version>
</dependency>
<dependency>
<groupId>org.pentaho</groupId>
<artifactId>libserializer</artifactId>
<version>${pentaho-report.version}</version>
</dependency>
<dependency>
<groupId>org.pentaho</groupId>
<artifactId>libxml</artifactId>
<version>${pentaho-report.version}</version>
</dependency>
<dependency>
<groupId>org.pentaho</groupId>
<artifactId>libswing</artifactId>
<version>${pentaho-report.version}</version>
</dependency>
<dependency>
<groupId>org.pentaho</groupId>
<artifactId>libsparkline</artifactId>
<version>${pentaho-report.version}</version>
</dependency>
<dependency>
<groupId>org.pentaho</groupId>
<artifactId>charts</artifactId>
<version>${pentaho-report.version}</version>
</dependency>
<dependency>
<groupId>org.pentaho</groupId>
<artifactId>report-charts</artifactId>
<groupId>org.pentaho.reporting.engine</groupId>
<artifactId>classic-core</artifactId>
<version>${pentaho-report.version}</version>
</dependency>
<!-- Logging Management -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
Expand Down Expand Up @@ -445,6 +382,12 @@
<artifactId>poi-ooxml</artifactId>
<version>${poi.version}</version>
</dependency>

<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml-schemas</artifactId>
<version>${poi.version}</version>
</dependency>
<dependency>
<!-- Apache POI - JAVA API ooXML Schemas -->
<groupId>org.apache.poi</groupId>
Expand Down Expand Up @@ -474,10 +417,10 @@
</dependency>
<!-- End jasper -->
<dependency>
<groupId>com.lowagie.org.olap4j</groupId>
<artifactId>olap4j</artifactId>
<version>0.9.7.309-JS-3</version>
</dependency>
<groupId>com.lowagie.org.olap4j</groupId>
<artifactId>olap4j</artifactId>
<version>0.9.7.309-JS-3</version>
</dependency>
<!-- gson -->
<dependency>
<groupId>com.google.code.gson</groupId>
Expand Down Expand Up @@ -567,7 +510,8 @@
<artifactId>jaxrpc-api</artifactId>
<version>${javax-xml.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/commons-discovery/commons-discovery -->
<!--
https://mvnrepository.com/artifact/commons-discovery/commons-discovery -->
<dependency>
<groupId>commons-discovery</groupId>
<artifactId>commons-discovery</artifactId>
Expand All @@ -584,7 +528,7 @@
<artifactId>quartz</artifactId>
<version>${quartz.version}</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
Expand Down Expand Up @@ -635,11 +579,11 @@
<version>${geoip2.version}</version>
</dependency>
<!-- throttling library to REST API -->
<!-- <dependency> -->
<!-- <groupId>com.weddini.throttling</groupId> -->
<!-- <artifactId>spring-boot-throttling-starter</artifactId> -->
<!-- <version>0.0.9</version> -->
<!-- </dependency> -->
<!-- <dependency> -->
<!-- <groupId>com.weddini.throttling</groupId> -->
<!-- <artifactId>spring-boot-throttling-starter</artifactId> -->
<!-- <version>0.0.9</version> -->
<!-- </dependency> -->
<!-- Apache Commons Library -->
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down Expand Up @@ -735,13 +679,13 @@
<artifactId>maven-resources-plugin</artifactId>
<version>2.7</version>
</plugin>

<plugin>
<groupId>com.samaxes.maven</groupId>
<artifactId>minify-maven-plugin</artifactId>
<version>1.7.6</version>
</plugin>

<plugin>
<!-- Ensure we can analyze java 8 code -->
<groupId>org.apache.maven.plugins</groupId>
Expand Down
Loading

0 comments on commit 1939856

Please sign in to comment.