Skip to content

Commit

Permalink
Merge pull request #92 from OsgiliathEnterprise/main
Browse files Browse the repository at this point in the history
Spring boot version bump
  • Loading branch information
Tcharl authored Sep 15, 2024
2 parents 95c579f + a5de679 commit 0802850
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 16 deletions.
2 changes: 1 addition & 1 deletion bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>net.osgiliath.datamigrator</groupId>
<artifactId>data-migrator</artifactId>
<version>1.78-SNAPSHOT</version>
<version>1.79-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>net.osgiliath.datamigrator</groupId>
<artifactId>data-migrator</artifactId>
<version>1.78-SNAPSHOT</version>
<version>1.79-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>data-migrator-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion datamigrator-archetype/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>net.osgiliath.datamigrator</groupId>
<artifactId>data-migrator</artifactId>
<version>1.78-SNAPSHOT</version>
<version>1.79-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/faker/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>net.osgiliath.datamigrator.modules</groupId>
<artifactId>data-migrator-modules</artifactId>
<version>1.78-SNAPSHOT</version>
<version>1.79-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>net.osgiliath.datamigrator</groupId>
<artifactId>data-migrator</artifactId>
<version>1.78-SNAPSHOT</version>
<version>1.79-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>net.osgiliath.datamigrator.modules</groupId>
Expand Down
2 changes: 1 addition & 1 deletion modules/row-limiter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>net.osgiliath.datamigrator.modules</groupId>
<artifactId>data-migrator-modules</artifactId>
<version>1.78-SNAPSHOT</version>
<version>1.79-SNAPSHOT</version>
</parent>
<artifactId>row-limiter</artifactId>
<dependencyManagement>
Expand Down
18 changes: 8 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
<project xmlns="http://maven.apache.org/POM/4.0.0" 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>
<parent>
<groupId>org.springframework.boot</groupId>
Expand All @@ -9,7 +8,7 @@
</parent>
<groupId>net.osgiliath.datamigrator</groupId>
<artifactId>data-migrator</artifactId>
<version>1.78-SNAPSHOT</version>
<version>1.79-SNAPSHOT</version>
<packaging>pom</packaging>
<ciManagement>
<system>Github actions</system>
Expand Down Expand Up @@ -167,7 +166,7 @@
<id>enforce-dependencyConvergence</id>
<configuration>
<rules>
<DependencyConvergence/>
<DependencyConvergence />
</rules>
<fail>false</fail>
</configuration>
Expand Down Expand Up @@ -379,14 +378,13 @@
<phase>generate-sources</phase>
<configuration>
<target>
<mkdir dir="${project.build.directory}/generated-sources/repositories"/>
<mkdir dir="${project.build.directory}/generated-sources/repositories" />
<move todir="${project.build.directory}/generated-sources/repositories">
<fileset dir="${project.basedir}/src/main/java"
includes="**/repository/*.java"/>
<fileset dir="${project.basedir}/src/main/java" includes="**/repository/*.java" />
</move>
<property name="maven.project.build.directory" value="${project.build.directory}"/>
<property name="maven.project.basedir" value="${project.basedir}"/>
<ant antfile="build.xml" target="amendEntities"/>
<property name="maven.project.build.directory" value="${project.build.directory}" />
<property name="maven.project.basedir" value="${project.basedir}" />
<ant antfile="build.xml" target="amendEntities" />
</target>
</configuration>
<goals>
Expand Down

0 comments on commit 0802850

Please sign in to comment.