Skip to content

Commit

Permalink
Merge pull request #72 from Academic-Weapons/gh-issue-68
Browse files Browse the repository at this point in the history
Gh issue 68
  • Loading branch information
Magmose authored Mar 28, 2023
2 parents df7b154 + 4bd333c commit 8f63fde
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 29 deletions.
4 changes: 2 additions & 2 deletions MiniTwit/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ FROM openjdk:17-oracle



COPY --from=maven-builder app/target/MiniTwit-0.0.5.war /app-service/MiniTwit-0.0.5.war
COPY --from=maven-builder app/target/MiniTwit-1.0.3.war /app-service/MiniTwit-1.0.3.war
COPY minitwit.db /app-service/minitwit.db
WORKDIR /app-service


EXPOSE 8080
ENTRYPOINT ["java","-jar","MiniTwit-0.0.5.war"]
ENTRYPOINT ["java","-jar","MiniTwit-1.0.3.war"]
5 changes: 3 additions & 2 deletions MiniTwit/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@
</parent>
<groupId>dk.itu</groupId>
<artifactId>MiniTwit</artifactId>
<version>0.0.5</version>
<version>1.0.3</version>
<packaging>war</packaging>
<name>MiniTwit</name>
<description>MiniTwit</description>
<properties>
<java.version>17</java.version>
<maven.compiler.target>11</maven.compiler.target>
</properties>
<dependencies>
<!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
Expand Down Expand Up @@ -96,4 +97,4 @@
</plugins>
</build>

</project>
</project>
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
package dk.itu.minitwit;

import dk.itu.minitwit.database.SQLite;
import dk.itu.minitwit.domain.SimData;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;

import java.sql.SQLException;

@SpringBootTest
class MiniTwitApplicationTests {
//package dk.itu.minitwit;
//
// @Test
// void contextLoads() {
//import dk.itu.minitwit.database.SQLite;
//import dk.itu.minitwit.domain.SimData;
//import org.junit.jupiter.api.Test;
//import org.springframework.boot.test.context.SpringBootTest;
//
// }
//import java.sql.SQLException;
//
// @Test
// void simInsertWorksAsIntended () throws SQLException, ClassNotFoundException {
// SQLite sql = new SQLite();
// SimData data = new SimData();
// data.setContent("asd dsa ");
//@SpringBootTest
//class MiniTwitApplicationTests {
////
//// @Test
//// void contextLoads() {
////
//// }
////
//// @Test
//// void simInsertWorksAsIntended () throws SQLException, ClassNotFoundException {
//// SQLite sql = new SQLite();
//// SimData data = new SimData();
//// data.setContent("asd dsa ");
////
//// sql.insertMessage(1, data);
//// }
//
// sql.insertMessage(1, data);
// }



}
//
//
//}

0 comments on commit 8f63fde

Please sign in to comment.