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
6 changes: 3 additions & 3 deletions spring-batch-db-examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<h2.version>2.4.240</h2.version>
<spring.boot.version>3.5.8</spring.boot.version>
<spring.batch.version>5.2.4</spring.batch.version>
<maven.compiler.plugin.version>3.14.1</maven.compiler.plugin.version>
<maven.plugin.version>3.14.1</maven.plugin.version>
<instancio.version>5.5.1</instancio.version>
<jacoco.version>0.8.14</jacoco.version>
</properties>
Expand Down Expand Up @@ -77,8 +77,8 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>${spring.boot.version}</version>
<scope>test</scope>
<version>${spring.boot.version}</version>
</dependency>

<dependency>
Expand All @@ -96,7 +96,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven.compiler.plugin.version}</version>
<version>${maven.plugin.version}</version>
<configuration>
<annotationProcessorPaths>
<path>
Expand Down
3 changes: 3 additions & 0 deletions spring-multimodule-example/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
target/
**/target/

!**/src/main/**/target/
!**/src/test/**/target/
!**/.idea
Comment on lines 4 to 6
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Fix contradictory negation and ignore patterns for .idea.

The negation pattern !**/.idea at line 6 is ineffective and contradicts the .idea ignore pattern at line 18. In .gitignore, negation patterns only unignore previously ignored entries; since line 6 precedes any .idea ignore pattern, it does nothing. The subsequent .idea at line 18 then re-ignores at the root level.

Clarify intent:

  • To track .idea: Move the !**/.idea pattern after the .idea pattern to override it.
  • To ignore .idea: Remove the redundant negation at line 6.
- target/
- **/target/
-
- !**/src/main/**/target/
- !**/src/test/**/target/
- !**/.idea
-
- ### STS ###
+ target/
+ **/target/
+
+ !**/src/main/**/target/
+ !**/src/test/**/target/
+
+ ### STS ###

If the intent is to track .idea, apply this instead:

  ### IntelliJ IDEA ###
- .idea
  *.iws
  *.iml
  *.ipr
+
+ !**/.idea

Also applies to: 18-18

🤖 Prompt for AI Agents
spring-multimodule-example/.gitignore around lines 4-6 (and line 18): the
negation pattern `!**/.idea` at lines 4-6 is ineffective and contradicts the
`.idea` ignore at line 18; to fix, decide intent: if you want to track `.idea`,
remove the `.idea` ignore at line 18 or move the `!**/.idea` negation to after
the `.idea` pattern so the negation can override it; if you want to ignore
`.idea`, simply delete the `!**/.idea` negation at lines 4-6 to avoid the
redundant/contradictory entry.

Expand Down
11 changes: 0 additions & 11 deletions spring-multimodule-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,5 @@
<module>module-b-example</module>
</modules>

<dependencies>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
<version>${spring.boot.version}</version>
</dependency>

</dependencies>

</project>

60 changes: 31 additions & 29 deletions spring-wolf-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,75 +19,77 @@

<properties>
<java.version>21</java.version>
</properties>
<spring.boot.version>3.5.8</spring.boot.version>
<maven.plugin.version>3.14.1</maven.plugin.version>
<spring.cloud.kafka>5.0.0</spring.cloud.kafka>
<lombok.version>1.18.42</lombok.version>
<springwolf.version>1.20.0</springwolf.version>
</properties>

<dependencies>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${spring.boot.version}</version>
</dependency>

<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-stream-kafka</artifactId>
<version>5.0.0</version>
<version>${spring.cloud.kafka}</version>
</dependency>

<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
<version>${lombok.version}</version>
</dependency>

<dependency>
<groupId>io.github.springwolf</groupId>
<artifactId>springwolf-ui</artifactId>
<version>1.20.0</version>
<version>${springwolf.version}</version>
</dependency>

<dependency>
<groupId>io.github.springwolf</groupId>
<artifactId>springwolf-kafka</artifactId>
<version>1.20.0</version>
<version>${springwolf.version}</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
<version>${spring.boot.version}</version>
</dependency>

</dependencies>

<build>
<plugins>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>

<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<excludes>
<exclude>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven.plugin.version}</version>
<configuration>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>

<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring.boot.version}</version>
</plugin>

</plugins>
</build>
Expand Down