Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions core-java-modules/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@
<module>core-java-lang-oop-modifiers-2</module>
<module>core-java-lang-oop-types</module>
<module>core-java-lang-oop-types-2</module>
<module>core-java-lang-oop-types-3</module>
<module>core-java-lang-oop-inheritance</module>
<module>core-java-lang-oop-inheritance-2</module>
<module>core-java-lang-oop-methods</module>
Expand Down
21 changes: 11 additions & 10 deletions jdeb/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,17 @@
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>
<artifactId>jdeb</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
<name>jdeb</name>

<parent>
<groupId>com.baeldung</groupId>
<artifactId>parent-modules</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>

<artifactId>simple-cal</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
<name>jdeb</name>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jdeb.version>1.14</jdeb.version>
</properties>

<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -86,4 +81,10 @@
</plugin>
</plugins>
</build>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jdeb.version>1.14</jdeb.version>
</properties>

</project>
2 changes: 1 addition & 1 deletion jdeb/src/main/resources/deb/control/control
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Package: simple-cal
Package: jdeb
Version: 1.0-SNAPSHOT
Section: utils
Priority: optional
Expand Down
2 changes: 2 additions & 0 deletions jdeb/src/main/resources/jdeb
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/bin/sh
java -jar /opt/jdeb/jdeb.jar "$@"
2 changes: 0 additions & 2 deletions jdeb/src/main/resources/simple-cal

This file was deleted.

3 changes: 2 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,6 @@
<module>core-java-modules/core-java-io-6</module>
<module>core-java-modules/core-java-jvm</module>
<module>core-java-modules/core-java-lang-7</module>
<module>core-java-modules/core-java-lang-oop-types-3</module>
<module>core-java-modules/core-java-datetime-conversion</module>
<module>libraries-data-io</module>
<module>persistence-modules/spring-data-neo4j</module>
Expand Down Expand Up @@ -1108,6 +1107,7 @@
<module>apache-httpclient4</module>
<module>apache-kafka-2</module>
<module>apache-kafka-3</module>
<module>apache-kafka-4</module>
<module>apache-libraries</module>
<module>apache-libraries-2</module>
<module>apache-libraries-3</module>
Expand Down Expand Up @@ -1498,6 +1498,7 @@

<modules>
<module>apache-kafka</module>
<module>apache-kafka-4</module>
<module>apache-libraries</module>
<module>apache-spark</module> <!-- failing after upgrading to jdk17 -->
<module>atomix</module>
Expand Down
1 change: 1 addition & 0 deletions spring-boot-modules/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
<!-- <module>spring-boot-gradle</module> --> <!-- Not a maven project -->
<module>spring-boot-grpc</module>
<module>spring-boot-jasypt</module>
<module>spring-boot-jdbc</module>
<module>spring-boot-jsp</module>
<module>spring-boot-keycloak</module>
<module>spring-boot-keycloak-2</module>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import org.springframework.transaction.annotation.Transactional;

@SpringBootTest
class OrderServiceTest {
class OrderServiceIntegrationTest {

@Autowired
private OrderService orderService;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import org.springframework.boot.test.context.SpringBootTest;

@SpringBootTest
class PaymentRepositoryTest {
class PaymentRepositoryIntegrationTest {

@Autowired
private PaymentRepository paymentRepository;
Expand Down