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

prep for push to central #383

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

prep for push to central #383

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions fits-pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,18 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
Expand Down
151 changes: 103 additions & 48 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@
<profile>
<id>default</id>
<activation>
<activeByDefault>true</activeByDefault>
<property>
<name>!skipDefault</name>
</property>
</activation>
<modules>
<!-- These modules are used to pull in the tools -->
Expand All @@ -67,13 +69,95 @@
</profile>
<profile>
<id>update-droid-sigs</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<modules>
<module>tool-poms/droid-sig-pom.xml</module>
</modules>
</profile>
<profile>
<!-- Disable the default Harvard config with -P-harvard -->
<id>harvard</id>
<activation>
<property>
<name>!releaseCentral</name>
</property>
</activation>
<repositories>
<repository>
<id>maven-central</id>
<name>Maven repo</name>
<url>https://repo1.maven.org/maven2/</url>
</repository>
<repository>
<id>local-maven-repo</id>
<name>Local file system for temporarily holding non-repo JAR files</name>
<url>file://${project.basedir}/lib-local/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>maven2-repository.dev.java.net</id>
<name>Java.net Maven 2 Repository</name>
<url>https://repo1.maven.org/maven2/</url>
</pluginRepository>
</pluginRepositories>
<distributionManagement>
<!-- repository URL and credentials set up in local .m2/settings.xml -->
<repository>
<id>harvard-lts-internal-release-repository</id>
<name>Harvard LTS internal Release Repository</name>
<url>${lts-artifactory-url}/lts-libs-release-local</url>
</repository>
<snapshotRepository>
<id>harvard-lts-internal-snapshot-repository</id>
<name>Harvard LTS internal Snapshot Repository</name>
<url>${lts-artifactory-url}/lts-libs-snapshot-local</url>
</snapshotRepository>
</distributionManagement>
</profile>
<profile>
<!-- Profile for releasing to Maven Central: -DreleaseCentral -->
<id>release-central</id>
<activation>
<property>
<name>releaseCentral</name>
</property>
</activation>
<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
</distributionManagement>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.0.1</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.13</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>false</autoReleaseAfterClose>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<build>
Expand All @@ -100,11 +184,6 @@
<artifactId>maven-deploy-plugin</artifactId>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.4.1</version>
</plugin>
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
Expand All @@ -125,55 +204,31 @@
<artifactId>maven-clean-plugin</artifactId>
<version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.5.0</version>
</plugin>
</plugins>
</pluginManagement>
</build>

<repositories>
<repository>
<id>maven-central</id>
<name>Maven repo</name>
<url>https://repo1.maven.org/maven2/</url>
</repository>
<repository>
<id>local-maven-repo</id>
<name>Local file system for temporarily holding non-repo JAR files</name>
<url>file://${project.basedir}/lib-local/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>maven2-repository.dev.java.net</id>
<name>Java.net Maven 2 Repository</name>
<url>https://repo1.maven.org/maven2/</url>
</pluginRepository>
</pluginRepositories>

<distributionManagement>
<!-- repository URL and credentials set up in local .m2/settings.xml -->
<repository>
<id>harvard-lts-internal-release-repository</id>
<name>Harvard LTS internal Release Repository</name>
<url>${lts-artifactory-url}/lts-libs-release-local</url>
</repository>
<snapshotRepository>
<id>harvard-lts-internal-snapshot-repository</id>
<name>Harvard LTS internal Snapshot Repository</name>
<url>${lts-artifactory-url}/lts-libs-snapshot-local</url>
</snapshotRepository>
</distributionManagement>

<scm>
<connection>scm:git:git@github.com:harvard-lts/fits.git</connection>
<developerConnection>scm:git:git@github.com:harvard-lts/fits.git</developerConnection>
<url>https://github.com/harvard-lts/fits</url>
<tag>HEAD</tag>
</scm>
</scm>

<licenses>
<license>
<name>The Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<name>GNU Lesser General Public License (LGPL), Version 2.1</name>
<url>http://www.fsf.org/licensing/licenses/lgpl.txt</url>
</license>
</licenses>

Expand All @@ -185,8 +240,8 @@
<organizationUrl>https://huit.harvard.edu</organizationUrl>
</developer>
<developer>
<name>Spencer McEwen</name>
<email>spencer_mcewen@harvard.edu</email>
<name>Andrew Woods</name>
<email>andrew_woods@harvard.edu</email>
<organization>Harvard University Information Technology</organization>
<organizationUrl>https://huit.harvard.edu</organizationUrl>
</developer>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/edu/harvard/hul/ois/fits/tools/ffident/FormatIdentification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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. <h3>Usage</h3>
* or byte array representing the first bytes of a file.
*
* @author Marco Schmidt, Modified for use by FITS by Spencer McEwen
*/
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/edu/harvard/hul/ois/fits/tools/mediainfo/ChannelPositionParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public class ChannelPositionParser {
/**
*
* @param channelsStr - the channel position string returned by MediaInfo
* @return List<ChannelPositionWrapper>
* @return List of ChannelPositionWrapper
* @throws XmlContentException
*/
public List<ChannelPositionWrapper> getChannelsFromString(String channelsStr) throws XmlContentException {
Expand Down