Skip to content

Commit

Permalink
bump antwerkz-parent
Browse files Browse the repository at this point in the history 
sync with the upstream features
  • Loading branch information
@evanchooly
evanchooly committed May 19, 2023
1 parent 66d3000 commit 99e88ae
Show file tree
Hide file tree
Showing 5 changed files with 67 additions and 183 deletions.
2 changes: 1 addition & 1 deletion audits/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
<artifactId>kotlin-stdlib</artifactId>
</dependency>
<dependency>
<groupId>org.jsoup</groupId>
Expand Down
6 changes: 3 additions & 3 deletions core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
</executions>
<configuration>
<repository>MorphiaOrg/morphia</repository>
<docsUrl>https://morphia.dev/morphia/2.3</docsUrl>
<javadocUrl>https://morphia.dev/morphia/2.3/javadoc</javadocUrl>
<docsUrl>https://morphia.dev/morphia/2.4</docsUrl>
<javadocUrl>https://morphia.dev/morphia/2.4/javadoc</javadocUrl>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -95,7 +95,7 @@
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
<resources>
<resource>
<directory>${project.basedir}/..</directory>
<directory>${maven.multiModuleProjectDirectory}</directory>
<includes>
<include>LICENSE.txt</include>
</includes>
Expand Down
84 changes: 0 additions & 84 deletions kotlin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,40 +13,8 @@

<artifactId>morphia-kotlin</artifactId>

<properties>
<kotlin.compiler.jvmTarget>11</kotlin.compiler.jvmTarget>
</properties>

<build>
<sourceDirectory>src/main/kotlin</sourceDirectory>
<testSourceDirectory>src/test/kotlin</testSourceDirectory>

<plugins>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${kotlin.version}</version>

<configuration>
<javaParameters>true</javaParameters>
</configuration>

<executions>
<execution>
<id>compile</id>
<goals>
<goal>compile</goal>
</goals>
</execution>

<execution>
<id>test-compile</id>
<goals>
<goal>test-compile</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
Expand All @@ -60,15 +28,10 @@
<artifactId>morphia-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-reflect</artifactId>
</dependency>

<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
Expand All @@ -93,52 +56,5 @@
<artifactId>java-semver</artifactId>
</dependency>
</dependencies>

<profiles>
<profile>
<activation>
<property>
<name>release</name>
</property>
</activation>
<id>dokka</id>
<build>
<plugins>
<plugin>
<groupId>org.jetbrains.dokka</groupId>
<artifactId>dokka-maven-plugin</artifactId>
<version>${dokka.version}</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>dokka</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
<executions>
<execution>
<id>dokka-jar</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<classifier>javadoc</classifier>
<classesDirectory>${project.build.directory}/dokka</classesDirectory>
<skipIfEmpty>true</skipIfEmpty>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>

139 changes: 63 additions & 76 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.antwerkz</groupId>
<artifactId>antwerkz-parent</artifactId>
<version>3</version>
<version>6</version>
</parent>

<groupId>dev.morphia.morphia</groupId>
Expand All @@ -23,13 +23,10 @@

<properties>
<awaitility.version>1.7.0</awaitility.version>
<dokka.version>1.7.20</dokka.version>
<driver.version>4.9.0</driver.version>
<driver.minor.version>4.7</driver.minor.version>
<jackson.version>2.14.2</jackson.version>
<json.assert.version>1.5.1</json.assert.version>
<kotlin.compiler.jvmTarget>11</kotlin.compiler.jvmTarget>
<kotlin.version>1.8.10</kotlin.version>
<logback.version>1.4.7</logback.version>
<maven.version>3.9.2</maven.version>
<revapi.maven.plugin.version>0.15.0</revapi.maven.plugin.version>
Expand All @@ -40,13 +37,70 @@
<surefire.version>3.1.0</surefire.version>
<testng.version>7.7.1</testng.version>
<zt.exec.version>1.12</zt.exec.version>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<downloadSources>true</downloadSources>
<nexus.url>https://oss.sonatype.org</nexus.url>
<local.repository.path>target/localRepo</local.repository.path>
</properties>

<build>
<defaultGoal>install</defaultGoal>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<source>11</source>
<target>11</target>
<compilerArgument>-proc:none</compilerArgument>
<compilerArgument>-Xlint:deprecation</compilerArgument>
</configuration>
</plugin>
<plugin>
<groupId>org.revapi</groupId>
<artifactId>revapi-maven-plugin</artifactId>
<version>${revapi.maven.plugin.version}</version>
<dependencies>
<dependency>
<groupId>org.revapi</groupId>
<artifactId>revapi-java</artifactId>
<version>${revapi.java.version}</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>revapi</id>
<goals>
<goal>check</goal>
</goals>
<phase>verify</phase>
</execution>
</executions>
<configuration>
<failBuildOnProblemsFound>true</failBuildOnProblemsFound>
<analysisConfigurationFiles>
<analysisConfigurationFile>${maven.multiModuleProjectDirectory}/config/revapi-filtered.json</analysisConfigurationFile>
</analysisConfigurationFiles>
<analysisConfiguration>
<revapi.versions>
<enabled>true</enabled>
<versionIncreaseAllows>
<major>
<severity>BREAKING</severity>
</major>
<minor>
<severity>NON_BREAKING</severity>
</minor>
<patch>
<severity>EQUIVALENT</severity>
</patch>
</versionIncreaseAllows>
</revapi.versions>
</analysisConfiguration>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>

<dependencyManagement>
<dependencies>
<dependency>
Expand Down Expand Up @@ -100,11 +154,6 @@
<version>1.18.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
<version>${kotlin.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-reflect</artifactId>
Expand Down Expand Up @@ -160,68 +209,6 @@
</dependencies>
</dependencyManagement>

<build>
<defaultGoal>install</defaultGoal>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<source>11</source>
<target>11</target>
<compilerArgument>-proc:none</compilerArgument>
<compilerArgument>-Xlint:deprecation</compilerArgument>
</configuration>
</plugin>
<plugin>
<groupId>org.revapi</groupId>
<artifactId>revapi-maven-plugin</artifactId>
<version>${revapi.maven.plugin.version}</version>
<dependencies>
<dependency>
<groupId>org.revapi</groupId>
<artifactId>revapi-java</artifactId>
<version>${revapi.java.version}</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>revapi</id>
<goals>
<goal>check</goal>
</goals>
<phase>verify</phase>
</execution>
</executions>
<configuration>
<failBuildOnProblemsFound>true</failBuildOnProblemsFound>
<analysisConfigurationFiles>
<analysisConfigurationFile>../config/revapi-filtered.json</analysisConfigurationFile>
</analysisConfigurationFiles>
<analysisConfiguration>
<revapi.versions>
<enabled>true</enabled>
<versionIncreaseAllows>
<major>
<severity>BREAKING</severity>
</major>
<minor>
<severity>NON_BREAKING</severity>
</minor>
<patch>
<severity>EQUIVALENT</severity>
</patch>
</versionIncreaseAllows>
</revapi.versions>
</analysisConfiguration>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>

<profiles>
<profile>
<id>audits</id>
Expand Down
19 changes: 0 additions & 19 deletions validation/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,23 +72,4 @@
<scope>provided</scope>
</dependency>
</dependencies>

<profiles>
<profile>
<id>code-audits</id>
<activation>
<property>
<name>code-audits</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>

0 comments on commit 99e88ae

Please sign in to comment.