Skip to content
This repository has been archived by the owner on Jul 23, 2024. It is now read-only.

Commit

Permalink
Merge pull request #18 from NASA-PDS/i17
Browse files Browse the repository at this point in the history 
Upgrade to Solr 9.3.0
  • Loading branch information
@jordanpadams
jordanpadams authored Oct 9, 2023
2 parents c192830 + 2303aa8 commit ce94592
Show file tree
Hide file tree
Showing 55 changed files with 188 additions and 10,410 deletions.
205 changes: 12 additions & 193 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ POSSIBILITY OF SUCH DAMAGE.
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>gov.nasa</groupId>
<artifactId>pds</artifactId>
<version>1.13.0</version>
</parent>

<groupId>gov.nasa.pds</groupId>
<artifactId>registry-mgr-legacy</artifactId>
<version>2.3.0-SNAPSHOT</version>
Expand All @@ -53,45 +59,6 @@ POSSIBILITY OF SUCH DAMAGE.
</license>
</licenses>

<developers>
<developer>
<name>Jordan Padams</name>
<id>jpadams</id>
<email>Jordan.H.Padams@jpl.nasa.gov</email>
<organization>NASA Jet Propulsion Laboratory</organization>
<roles>
<role>PDS Engineering Node Manager</role>
</roles>
</developer>
<developer>
<name>Galen Hollins</name>
<id>ghollins</id>
<email>Galen.Hollins@jpl.nasa.gov</email>
<organization>NASA Jet Propulsion Laboratory</organization>
<roles>
<role>PDS Engineering Node Development Lead</role>
</roles>
</developer>
<developer>
<name>Sean Hardman</name>
<id>shardman</id>
<email>Sean.Hardman@jpl.nasa.gov</email>
<organization>NASA Jet Propulsion Laboratory</organization>
<roles>
<role>Development Lead</role>
</roles>
</developer>
<developer>
<name>Hyun Lee</name>
<id>hyunlee</id>
<email>Hyun.H.Lee@jpl.nasa.gov</email>
<organization>NASA Jet Propulsion Laboratory</organization>
<roles>
<role>Developer</role>
</roles>
</developer>
</developers>

<build>
<resources>
<resource>
Expand Down Expand Up @@ -150,126 +117,15 @@ POSSIBILITY OF SUCH DAMAGE.
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.7</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.8.2</version>
<configuration>
<skipDeploy>true</skipDeploy>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version>
<configuration>
<tagNameFormat>v@{project.version}</tagNameFormat>
</configuration>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<phase>prepare-package</phase>
<goals>
<goal>jar-no-fork</goal>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<source>1.8</source>
<failOnError>false</failOnError>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
<configuration>
<gpgArguments>
<arg>--pinentry-mode</arg>
<arg>loopback</arg>
</gpgArguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<scm>
<url>https://github.com/NASA-PDS/registry-mgr-legacy</url>
<connection>scm:git:git://github.com/NASA-PDS/registry-mgr-legacy.git</connection>
<developerConnection>scm:git:git@github.com:NASA-PDS/registry-mgr-legacy.git</developerConnection>
</scm>

<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>

<repositories>
<repository>
<id>snapshots-repo</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>

<properties>
<solr.version>9.3.0</solr.version>
</properties>
Expand All @@ -289,6 +145,12 @@ POSSIBILITY OF SUCH DAMAGE.
<type>jar</type>
<scope>compile</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.14.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
Expand All @@ -306,47 +168,4 @@ POSSIBILITY OF SUCH DAMAGE.
</dependency>
</dependencies>

<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<reportSets>
<reportSet>
<reports>
<report>dependencies</report>
<report>issue-management</report>
<report>licenses</report>
<report>mailing-lists</report>
<report>team</report>
<report>summary</report>
</reports>
</reportSet>
</reportSets>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
<reportSets>
<reportSet>
<reports>
<report>changes-report</report>
</reports>
</reportSet>
</reportSets>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<source>1.8</source>
<failOnError>false</failOnError>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
</plugin>
</plugins>
</reporting>
</project>
1 change: 0 additions & 1 deletion src/main/assembly/tar-assembly.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@
<outputDirectory>lib</outputDirectory>
<includes>
<include>commons-logging:commons-logging</include>
<include>log4j:log4j</include>
<include>commons-io:commons-io</include>
<include>org.apache.solr:solr-core</include>
<include>net.sf.saxon:Saxon-HE</include>
Expand Down
2 changes: 0 additions & 2 deletions src/main/assembly/zip-assembly.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,7 @@
<outputDirectory>lib</outputDirectory>
<includes>
<include>org.slf4j:slf4j-api</include>
<include>org.slf4j:slf4j-log4j12</include>
<include>commons-logging:commons-logging</include>
<include>log4j:log4j</include>
<include>commons-io:commons-io</include>
<include>org.apache.solr:solr-core</include>
</includes>
Expand Down
61 changes: 0 additions & 61 deletions src/main/java/gov/nasa/pds/search/XSLTResponseWriter.java
View file

This file was deleted.

Loading

0 comments on commit ce94592

Please sign in to comment.