Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump parent from 70 to 74 and poms cleanup #241

Merged
merged 1 commit into from
Mar 24, 2023
Merged

Bump parent from 70 to 74 and poms cleanup #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
33 changes: 0 additions & 33 deletions animal-sniffer-annotations/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,39 +32,6 @@
</parent>

<artifactId>animal-sniffer-annotations</artifactId>

<name>Animal Sniffer Annotations</name>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-java</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireJavaVersion>
<message>Annotations require Java 1.5+ to compile</message>
<version>[1.5,)</version>
</requireJavaVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${mojo.java.target}</source>
<target>${mojo.java.target}</target>
</configuration>
</plugin>
</plugins>
</build>

</project>
44 changes: 2 additions & 42 deletions animal-sniffer-enforcer-rule/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,58 +91,18 @@
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<configuration>
<setupIncludes>
<setupInclude>setup-*/pom.xml</setupInclude>
</setupIncludes>
<pomIncludes>
<pomInclude>*/pom.xml</pomInclude>
</pomIncludes>
<filterProperties>
<build-helper.version>${build-helper.version}</build-helper.version>
</filterProperties>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<!-- run integration tests
to use this profile:
or run integration tests: mvn -Prun-its
-->
<id>run-its</id>
<build>
<defaultGoal>verify</defaultGoal>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<executions>
<execution>
<id>integration-test</id>
<goals>
<goal>install</goal>
<goal>run</goal>
</goals>
<configuration>
<streamLogs>false</streamLogs>
<debug>true</debug>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
23 changes: 1 addition & 22 deletions animal-sniffer-maven-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.8.1</version>
<scope>provided</scope>
</dependency>

Expand All @@ -102,7 +101,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<!-- see http://jira.codehaus.org/browse/MNG-5346 -->
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
Expand All @@ -127,9 +125,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<configuration>
<pomIncludes>
<pomInclude>*/pom.xml</pomInclude>
</pomIncludes>
<filterProperties>
<java.home>${env.JAVA_HOME}</java.home>
</filterProperties>
Expand All @@ -143,32 +138,16 @@

<profiles>
<profile>
<!-- run integration tests
to use this profile:
or run integration tests: mvn -Prun-its
-->
<id>run-its</id>
<build>
<defaultGoal>verify</defaultGoal>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<executions>
<execution>
<id>integration-test</id>
<goals>
<goal>install</goal>
<goal>run</goal>
</goals>
<configuration>
<debug>true</debug>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
7 changes: 0 additions & 7 deletions java-boot-classpath-detector/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,6 @@
</archive>
</configuration>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${mojo.java.target}</source>
<target>${mojo.java.target}</target>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
128 changes: 31 additions & 97 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>org.codehaus.mojo</groupId>
<artifactId>mojo-parent</artifactId>
<version>70</version>
<version>74</version>
</parent>

<artifactId>animal-sniffer-parent</artifactId>
Expand Down Expand Up @@ -80,99 +80,83 @@
<scm>
<connection>scm:git:https://github.com/mojohaus/animal-sniffer.git</connection>
<developerConnection>scm:git:ssh://git@github.com/mojohaus/animal-sniffer.git</developerConnection>
<url>https://github.com/mojohaus/animal-sniffer</url>
<url>https://github.com/mojohaus/animal-sniffer/tree/master</url>
<tag>master</tag>
</scm>

<issueManagement>
<system>GitHub</system>
<url>https://github.com/mojohaus/animal-sniffer/issues</url>
</issueManagement>

<ciManagement>
<system>Travis</system>
<url>https://travis-ci.org/mojohaus/animal-sniffer</url>
<system>GitHub</system>
<url>https://github.com/mojohaus/animal-sniffer/actions</url>
</ciManagement>

<distributionManagement>
<site>
<id>github</id>
<url>scm:git:ssh://git@github.com/mojohaus/animal-sniffer.git</url>
</site>
</distributionManagement>

<properties>
<topSiteURL>scm:git:ssh://git@github.com/mojohaus/animal-sniffer.git</topSiteURL>
<scmpublish.content>${project.build.directory}/staging</scmpublish.content>
<maven.version>3.2.5</maven.version>
<mojo.java.target>1.8</mojo.java.target>
<mojo.java.target>8</mojo.java.target>
<build-helper.version>3.3.0</build-helper.version>
<invoker.streamLogs>false</invoker.streamLogs>
<project.build.outputTimestamp>2022-08-16T03:45:35Z</project.build.outputTimestamp>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>9.4</version>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.2.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<detectJavaApiLink>false</detectJavaApiLink>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.2.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>3.5.0</version>
<configuration>
<projectsDirectory>src/it</projectsDirectory>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
<settingsFile>src/it/settings.xml</settingsFile>
<showErrors>true</showErrors>
<streamLogs>false</streamLogs>
<streamLogsOnFailures>true</streamLogsOnFailures>
<debug>true</debug>
<postBuildHookScript>verify</postBuildHookScript>
<goals>
<goal>verify</goal>
</goals>
</configuration>
<executions>
<execution>
<id>integration-test</id>
<goals>
<goal>install</goal>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>${build-helper.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
<configuration>
<content>${project.build.directory}/staging</content>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>9.4</version>
</dependency>
</dependencies>
</dependencyManagement>

<profiles>
<profile>
<id>disable-doclint-for-jdk8</id>
Expand All @@ -183,55 +167,5 @@
<additionalparam>-Xdoclint:none</additionalparam>
</properties>
</profile>
<profile>
<id>jdk9</id>
<activation>
<jdk>[1.9,)</jdk>
</activation>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<release>8</release>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>
<profile>
<!-- run integration tests
to use this profile:
or run integration tests: mvn -Prun-its
Always run on travis
-->
<id>run-its</id>
<activation>
<property>
<name>env.CONTINUOUS_INTEGRATION</name>
</property>
</activation>
<build>
<defaultGoal>verify</defaultGoal>
<plugins>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
<executions>
<execution>
<id>integration-test</id>
<goals>
<goal>install</goal>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>

</profiles>
</project>