Skip to content

Commit

Permalink
Merge pull request #89 from DSpace/pom_cleanup
Browse files Browse the repository at this point in the history
Update POM based on DSpace/DSpace POM. Upgrade Maven plugins
  • Loading branch information
tdonohue authored Oct 27, 2023
2 parents 9fa6845 + 34f0a77 commit ae52db0
Showing 1 changed file with 63 additions and 17 deletions.
80 changes: 63 additions & 17 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
<java.version>1.7</java.version>
<java.version>11</java.version>
</properties>

<build>
Expand All @@ -21,7 +21,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.4.1</version>
<version>3.4.1</version>
<executions>
<execution>
<id>enforce-java</id>
Expand Down Expand Up @@ -56,17 +56,16 @@
<!-- Used to compile all Java classes -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<version>3.11.0</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
<release>${java.version}</release>
</configuration>
</plugin>
<!-- Used to package all JARs -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<version>3.2.2</version>
<configuration>
<archive>
<manifest>
Expand All @@ -78,29 +77,29 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.6</version>
<version>3.5.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
<version>3.5.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.7</version>
<version>3.3.1</version>
</plugin>
<!-- Used to generate a new release via Sonatype (see release profile). -->
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.7</version>
<version>1.6.8</version>
</plugin>
<!-- Used to generate JavaDocs for new releases (see release profile). -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.3</version>
<version>3.5.0</version>
<configuration>
<!-- Never fail a build based on Javadoc errors -->
<failOnError>false</failOnError>
Expand All @@ -110,7 +109,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.4</version>
<version>3.3.0</version>
</plugin>
<!-- Used to sign new releases via GPG (see release profile). -->
<plugin>
Expand Down Expand Up @@ -156,15 +155,18 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.7</version>
<extensions>true</extensions>
<configuration>
<!-- In your settings.xml, your username/password
MUST be specified for server 'ossrh' -->
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<!-- Disable autoclose of repository after upload, as this sometimes times out -->
<skipStagingRepositoryClose>true</skipStagingRepositoryClose>
<!-- Require manual verification / release to Maven Central -->
<autoReleaseAfterClose>false</autoReleaseAfterClose>
<!-- Increase Staging timeout to 10mins -->
<stagingProgressTimeoutMinutes>10</stagingProgressTimeoutMinutes>
</configuration>
</plugin>
<!-- For new releases, generate Source JAR files -->
Expand All @@ -180,6 +182,19 @@
</execution>
</executions>
</plugin>
<!-- For new releases, generate JavaDocs for each module -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- Sign any new releases via GPG.
NOTE: you may optionall specify the "gpg.passphrase" in your settings.xml -->
<plugin>
Expand Down Expand Up @@ -295,15 +310,20 @@

<licenses>
<license>
<name>DuraSpace BSD License</name>
<url>https://raw.github.com/DSpace/DSpace/master/LICENSE</url>
<name>DSpace BSD License</name>
<url>https://raw.github.com/DSpace/DSpace/main/LICENSE</url>
<distribution>repo</distribution>
<comments>
A BSD 3-Clause license for the DSpace codebase.
</comments>
</license>
</licenses>

<issueManagement>
<system>GitHub</system>
<url>https://github.com/DSpace/xoai/issues</url>
</issueManagement>

<scm>
<connection>scm:git:[email protected]:DSpace/xoai.git</connection>
<developerConnection>scm:git:[email protected]:DSpace/xoai.git</developerConnection>
Expand All @@ -324,17 +344,43 @@
</repository>
</distributionManagement>

<repositories>
<!-- Check Maven Central first (before other repos below) -->
<repository>
<id>maven-central</id>
<url>https://repo.maven.apache.org/maven2</url>
</repository>
<!-- Enable access to artifacts in Sonatype's snapshot repo for Snapshots ONLY -->
<repository>
<id>maven-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<layout>default</layout>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>

<developers>
<developer>
<name>DSpace @ Lyncode</name>
<email>[email protected]</email>
<organization>Lyncode</organization>
<organizationUrl>http://www.lyncode.com</organizationUrl>
<url>http://www.lyncode.com</url>
<roles>
<role>original-developer</role>
</roles>
</developer>
<developer>
<name>DSpace Committers</name>
<email>[email protected]</email>
<url>https://wiki.duraspace.org/display/DSPACE/DSpace+Committers</url>
<url>https://wiki.lyrasis.org/display/DSPACE/DSpace+Committers</url>
<roles>
<role>committer</role>
</roles>
</developer>
</developers>

Expand Down

0 comments on commit ae52db0

Please sign in to comment.