Skip to content

Commit

Permalink
Merge pull request #290 from quartz-scheduler/zemian-pom-cleanup
Browse files Browse the repository at this point in the history
Zemian pom cleanup
  • Loading branch information
zemian authored Dec 20, 2018
2 parents 5a81958 + 5c53513 commit 8cd4e1f
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 55 deletions.
2 changes: 1 addition & 1 deletion .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.zip
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip
30 changes: 12 additions & 18 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,14 @@
<c3p0.version>0.9.5.2</c3p0.version>
<hikaricp.version>2.3.13</hikaricp.version>
<log4j.version>1.2.16</log4j.version>
<maven-forge-plugin.version>1.1.9</maven-forge-plugin.version>
<gmaven-plugin.version>1.4</gmaven-plugin.version>
<checkstyle-suppressions-file>${session.executionRootDirectory}/checkstyle/src/main/resources/suppressions.xml</checkstyle-suppressions-file>
<checkstyle-config-file>${session.executionRootDirectory}/checkstyle/src/main/resources/checkstyle.xml</checkstyle-config-file>
<checkstyle-header-file>${session.executionRootDirectory}/checkstyle/src/main/resources/header.txt</checkstyle-header-file>
<checkstyle-suppressions-file>${user.home}/checkstyle/src/main/resources/suppressions.xml</checkstyle-suppressions-file>
<checkstyle-config-file>${user.home}/checkstyle/src/main/resources/checkstyle.xml</checkstyle-config-file>
<checkstyle-header-file>${user.home}/checkstyle/src/main/resources/header.txt</checkstyle-header-file>

<terracotta-snapshots-url>http://nexus.terracotta.eur.ad.sag/content/repositories/terracotta-snapshots</terracotta-snapshots-url>
<terracotta-staging-url>http://nexus.terracotta.eur.ad.sag/content/repositories/terracotta-staging</terracotta-staging-url>
<terracotta-releases-url>http://nexus.terracotta.eur.ad.sag/content/repositories/terracotta-releases</terracotta-releases-url>
<terracotta-releases-url>http://nexus.terracotta.eur.ad.sag/content/repositories/terracotta-releases</terracotta-releases-url>
</properties>

<build>
Expand Down Expand Up @@ -109,19 +108,6 @@
<ignore />
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.terracotta</groupId>
<artifactId>maven-forge-plugin</artifactId>
<versionRange>[1.0.4,)</versionRange>
<goals>
<goal>manifest</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -219,7 +205,10 @@
<version>2.4.0</version>
<configuration>
<findbugsXmlOutput>true</findbugsXmlOutput>
<!--
This seems to be an invalid option.
<findbugsXmlWithMessages>true</findbugsXmlWithMessages>
-->
<xmlOutput>true</xmlOutput>
</configuration>
</plugin>
Expand Down Expand Up @@ -256,6 +245,11 @@
<artifactId>maven-release-plugin</artifactId>
<version>2.4.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.1</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
Expand Down
50 changes: 14 additions & 36 deletions quartz/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -76,44 +76,22 @@
</resource>
</resources>

<plugins>
<plugins>
<plugin>
<groupId>org.terracotta</groupId>
<artifactId>maven-forge-plugin</artifactId>
<version>${maven-forge-plugin.version}</version>
<executions>
<execution>
<id>create-manifest</id>
<phase>process-resources</phase>
<goals>
<goal>manifest</goal>
</goals>
<configuration>
<rootPath>${basedir}/..</rootPath>
<manifestFile>${project.build.directory}/MANIFEST.MF</manifestFile>
<manifestEntries>
<License>Apache Software License, Version 2.0</License>
<Terracotta-ProjectStatus>Supported</Terracotta-ProjectStatus>
<Terracotta-Name>${project.artifactId}</Terracotta-Name>
<Terracotta-Description>${project.description}</Terracotta-Description>
</manifestEntries>
</configuration>
</execution>
<execution>
<id>enforce-dependencies</id>
<goals>
<goal>enforceDependencies</goal>
</goals>
<phase>verify</phase>
<configuration>
<enforceGroupId>org.quartz-scheduler.internal</enforceGroupId>
<enforceArtifactId>quartz-core</enforceArtifactId>
<enforceVersion>${project.version}</enforceVersion>
</configuration>
</execution>
</executions>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<License>Apache Software License, Version 2.0</License>
<Terracotta-ProjectStatus>Supported</Terracotta-ProjectStatus>
<Terracotta-Name>${project.artifactId}</Terracotta-Name>
<Terracotta-Description>${project.description}</Terracotta-Description>
</manifestEntries>
</archive>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
Expand Down

0 comments on commit 8cd4e1f

Please sign in to comment.