From 51c96cd60747aa7e74c82d45583f5abe3681df5f Mon Sep 17 00:00:00 2001 From: Peter Winckles Date: Mon, 13 Mar 2023 21:14:17 -0500 Subject: [PATCH] update pom for central deployment --- fits-pom.xml | 12 ++ pom.xml | 151 ++++++++++++------ .../tools/ffident/FormatIdentification.java | 2 +- .../mediainfo/ChannelPositionParser.java | 2 +- 4 files changed, 117 insertions(+), 50 deletions(-) diff --git a/fits-pom.xml b/fits-pom.xml index 09bbb8ae..bb0748d0 100644 --- a/fits-pom.xml +++ b/fits-pom.xml @@ -95,6 +95,18 @@ + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + com.diffplug.spotless spotless-maven-plugin diff --git a/pom.xml b/pom.xml index 3aad5365..3ba802f0 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,9 @@ default - true + + !skipDefault + @@ -67,13 +69,95 @@ update-droid-sigs - - false - tool-poms/droid-sig-pom.xml + + + harvard + + + !releaseCentral + + + + + maven-central + Maven repo + https://repo1.maven.org/maven2/ + + + local-maven-repo + Local file system for temporarily holding non-repo JAR files + file://${project.basedir}/lib-local/ + + + + + maven2-repository.dev.java.net + Java.net Maven 2 Repository + https://repo1.maven.org/maven2/ + + + + + + harvard-lts-internal-release-repository + Harvard LTS internal Release Repository + ${lts-artifactory-url}/lts-libs-release-local + + + harvard-lts-internal-snapshot-repository + Harvard LTS internal Snapshot Repository + ${lts-artifactory-url}/lts-libs-snapshot-local + + + + + + release-central + + + releaseCentral + + + + + ossrh + https://s01.oss.sonatype.org/content/repositories/snapshots + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 3.0.1 + + + sign-artifacts + verify + + sign + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.13 + true + + ossrh + https://s01.oss.sonatype.org/ + false + + + + + @@ -100,11 +184,6 @@ maven-deploy-plugin 3.0.0 - - org.apache.maven.plugins - maven-javadoc-plugin - 3.4.1 - com.diffplug.spotless spotless-maven-plugin @@ -125,55 +204,31 @@ maven-clean-plugin 3.2.0 + + org.apache.maven.plugins + maven-source-plugin + 3.2.1 + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.5.0 + - - - maven-central - Maven repo - https://repo1.maven.org/maven2/ - - - local-maven-repo - Local file system for temporarily holding non-repo JAR files - file://${project.basedir}/lib-local/ - - - - - maven2-repository.dev.java.net - Java.net Maven 2 Repository - https://repo1.maven.org/maven2/ - - - - - - - harvard-lts-internal-release-repository - Harvard LTS internal Release Repository - ${lts-artifactory-url}/lts-libs-release-local - - - harvard-lts-internal-snapshot-repository - Harvard LTS internal Snapshot Repository - ${lts-artifactory-url}/lts-libs-snapshot-local - - - scm:git:git@github.com:harvard-lts/fits.git scm:git:git@github.com:harvard-lts/fits.git https://github.com/harvard-lts/fits HEAD - + - The Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt + GNU Lesser General Public License (LGPL), Version 2.1 + http://www.fsf.org/licensing/licenses/lgpl.txt @@ -185,8 +240,8 @@ https://huit.harvard.edu - Spencer McEwen - spencer_mcewen@harvard.edu + Andrew Woods + andrew_woods@harvard.edu Harvard University Information Technology https://huit.harvard.edu diff --git a/src/main/java/edu/harvard/hul/ois/fits/tools/ffident/FormatIdentification.java b/src/main/java/edu/harvard/hul/ois/fits/tools/ffident/FormatIdentification.java index 78cf2343..44e02113 100644 --- a/src/main/java/edu/harvard/hul/ois/fits/tools/ffident/FormatIdentification.java +++ b/src/main/java/edu/harvard/hul/ois/fits/tools/ffident/FormatIdentification.java @@ -23,7 +23,7 @@ /** * helper class that tries to identify the file format for a given file - * or byte array representing the first bytes of a file.

Usage

+ * or byte array representing the first bytes of a file. * * @author Marco Schmidt, Modified for use by FITS by Spencer McEwen */ diff --git a/src/main/java/edu/harvard/hul/ois/fits/tools/mediainfo/ChannelPositionParser.java b/src/main/java/edu/harvard/hul/ois/fits/tools/mediainfo/ChannelPositionParser.java index b3674658..a2a1749d 100644 --- a/src/main/java/edu/harvard/hul/ois/fits/tools/mediainfo/ChannelPositionParser.java +++ b/src/main/java/edu/harvard/hul/ois/fits/tools/mediainfo/ChannelPositionParser.java @@ -47,7 +47,7 @@ public class ChannelPositionParser { /** * * @param channelsStr - the channel position string returned by MediaInfo - * @return List + * @return List of ChannelPositionWrapper * @throws XmlContentException */ public List getChannelsFromString(String channelsStr) throws XmlContentException {