Skip to content

Commit

Permalink
Fixes #29
Browse files Browse the repository at this point in the history 
location4j was referencing location4j-parent but its not needed really. It was breaking imports on maven
  • Loading branch information
@tomaytotomato
tomaytotomato committed Aug 13, 2024
1 parent 0148d84 commit ddbc2db
Show file tree
Hide file tree
Showing 2 changed files with 82 additions and 69 deletions.
87 changes: 81 additions & 6 deletions location4j/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,21 @@
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<artifactId>location4j</artifactId>
<dependencies>
<dependency>
<artifactId>junit-jupiter</artifactId>
<groupId>org.junit.jupiter</groupId>
<scope>test</scope>
<version>${junit-jupiter.version}</version>
</dependency>
<dependency>
<artifactId>assertj-core</artifactId>
<groupId>org.assertj</groupId>
<scope>test</scope>
<version>${assertj-core.version}</version>
</dependency>
</dependencies>
<groupId>com.tomaytotomato</groupId>
<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -107,6 +122,44 @@
<groupId>org.apache.maven.plugins</groupId>
<version>${maven-deploy-plugin.version}</version>
</plugin>
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>${spotless.version}</version>
<configuration>
<!-- optional: limit format enforcement to just the files changed by this feature branch -->
<ratchetFrom>origin/master</ratchetFrom>
<formats>
<!-- you can define as many formats as you want, each is independent -->
<format>
<!-- define the files to apply to -->
<includes>
<include>.gitattributes</include>
<include>.gitignore</include>
</includes>
<!-- define the steps to apply to those files -->
<trimTrailingWhitespace/>
<endWithNewline/>
<indent>
<tabs>true</tabs>
<spacesPerTab>4</spacesPerTab>
</indent>
</format>
</formats>
<!-- define a language-specific format -->
<java>
<!-- no need to specify files, inferred automatically, but you can if you want -->

<!-- apply a specific flavor of google-java-format and reflow long strings -->
<googleJavaFormat>
<version>1.23.0</version>
<style>AOSP</style>
<reflowLongStrings>true</reflowLongStrings>
<formatJavadoc>false</formatJavadoc>
</googleJavaFormat>
</java>
</configuration>
</plugin>
</plugins>
</build>
<description>${parent.description}</description>
Expand All @@ -117,6 +170,17 @@
<name>Bruce Taylor</name>
</developer>
</developers>

<!-- this version is overridden by Github Action check release.yml !-->
<distributionManagement>
<repository>
<id>github</id>
<name>${env.GITHUB_USERNAME}</name>
<!--suppress UnresolvedMavenProperty -->
<url>https://maven.pkg.github.com/${env.GITHUB_USERNAME}/${env.GITHUB_REPOSITORY}</url>
</repository>
</distributionManagement>

<licenses>
<license>
<distribution>repo</distribution>
Expand All @@ -127,16 +191,27 @@

<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>location4j-parent</artifactId>
<groupId>com.tomaytotomato</groupId>
<version>1.0.0</version>
</parent>

<properties>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<assertj-core.version>3.26.3</assertj-core.version>
<central-publishing-maven-plugin.version>0.5.0</central-publishing-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
<junit-jupiter.version>5.10.3</junit-jupiter.version>
<maven-deploy-plugin.version>3.1.2</maven-deploy-plugin.version>
<maven-gpg-plugin.version>3.2.4</maven-gpg-plugin.version>
<maven-surefire-plugin.version>3.3.1</maven-surefire-plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<sonar-maven-plugin.version>4.0.0.4121</sonar-maven-plugin.version>
<sonar.coverage.jacoco.xmlReportPaths>${project.build.directory}/site/jacoco/jacoco.xml
</sonar.coverage.jacoco.xmlReportPaths>
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
<sonar.language>java</sonar.language>
<sonar.organization>tomaytotomato</sonar.organization>
<spotless.version>2.43.0</spotless.version>
</properties>

<scm>
Expand Down
64 changes: 1 addition & 63 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<artifactId>location4j-parent</artifactId>
<groupId>com.tomaytotomato</groupId>

<build>
<pluginManagement>
Expand All @@ -12,62 +13,9 @@
<groupId>org.apache.maven.plugins</groupId>
<version>${maven-deploy-plugin.version}</version>
</plugin>
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>${spotless.version}</version>
<configuration>
<!-- optional: limit format enforcement to just the files changed by this feature branch -->
<ratchetFrom>origin/master</ratchetFrom>
<formats>
<!-- you can define as many formats as you want, each is independent -->
<format>
<!-- define the files to apply to -->
<includes>
<include>.gitattributes</include>
<include>.gitignore</include>
</includes>
<!-- define the steps to apply to those files -->
<trimTrailingWhitespace/>
<endWithNewline/>
<indent>
<tabs>true</tabs>
<spacesPerTab>4</spacesPerTab>
</indent>
</format>
</formats>
<!-- define a language-specific format -->
<java>
<!-- no need to specify files, inferred automatically, but you can if you want -->

<!-- apply a specific flavor of google-java-format and reflow long strings -->
<googleJavaFormat>
<version>1.23.0</version>
<style>AOSP</style>
<reflowLongStrings>true</reflowLongStrings>
<formatJavadoc>false</formatJavadoc>
</googleJavaFormat>
</java>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
<dependencies>
<!-- Test Dependencies -->
<dependency>
<artifactId>junit-jupiter</artifactId>
<groupId>org.junit.jupiter</groupId>
<scope>test</scope>
<version>${junit-jupiter.version}</version>
</dependency>
<dependency>
<artifactId>assertj-core</artifactId>
<groupId>org.assertj</groupId>
<scope>test</scope>
<version>${assertj-core.version}</version>
</dependency>
</dependencies>
<description>A location service for Java, identify a city, state or country by multiple terms.
</description>
<developers>
Expand All @@ -77,16 +25,6 @@
<name>Bruce Taylor</name>
</developer>
</developers>
<!-- this version is overridden by Github Action check release.yml !-->
<distributionManagement>
<repository>
<id>github</id>
<name>${env.GITHUB_USERNAME}</name>
<!--suppress UnresolvedMavenProperty -->
<url>https://maven.pkg.github.com/${env.GITHUB_USERNAME}/${env.GITHUB_REPOSITORY}</url>
</repository>
</distributionManagement>
<groupId>com.tomaytotomato</groupId>

<licenses>
<license>
Expand Down

0 comments on commit ddbc2db

Please sign in to comment.