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

chore: change pom parent #377

Merged
merged 2 commits into from
Jan 20, 2025
Merged

chore: change pom parent #377

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3799b6
chore: change pom parent
bjagg Jun 2, 2023
40a7547
Merge branch 'master' into chore/change-pom-parent
Naenyn Jan 20, 2025
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
63 changes: 4 additions & 59 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

<parent>
<groupId>org.jasig.parent</groupId>
<artifactId>jasig-parent</artifactId>
<version>41</version>
<groupId>org.jasig.portlet</groupId>
<artifactId>uportal-portlet-parent</artifactId>
<version>42</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down Expand Up @@ -182,7 +182,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jdbc</artifactId>
<version>${tomcat-jdbc.version}</version>
<version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Expand Down Expand Up @@ -669,23 +669,6 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>3.1.1</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-gitexe</artifactId>
<version>2.0.1</version>
</dependency>
</dependencies>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<localCheckout>true</localCheckout>
<tagNameFormat>NewsReaderPortlet-@{project.version}</tagNameFormat>
</configuration>
</plugin>
<plugin>
<groupId>org.jasig.resourceserver</groupId>
<artifactId>resource-server-plugin</artifactId>
Expand Down Expand Up @@ -722,44 +705,18 @@
<configuration>
<aggregate>true</aggregate>
<excludes>
<exclude>.gitignore</exclude>
<exclude>target/**</exclude>
<exclude>bin/**</exclude>
<exclude>pom.xml.*</exclude>
<exclude>release.properties</exclude>
<exclude>**/NOTICE</exclude>
<exclude>NOTICE.template</exclude>
<exclude>README</exclude>
<exclude>LICENSE</exclude>
<exclude>src/main/webapp/rs/**</exclude>
<exclude>src/main/resources/antisamy/**</exclude>
<exclude>src/main/webapp/WEB-INF/dtd/**</exclude>
<exclude>src/main/webapp/WEB-INF/validator-rules.xml</exclude>
<exclude>.idea/**</exclude> <!-- Exclude intelliJ files -->
<exclude>overlays/**</exclude> <!-- Exclude intelliJ files -->
</excludes>
<mapping>
<channel>XML_STYLE</channel>
<crn>XML_STYLE</crn>
<less>SLASHSTAR_STYLE</less>
<tag>DYNASCRIPT_STYLE</tag>
</mapping>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<attachClasses>true</attachClasses>
<warName>NewsReaderPortlet</warName>
<overlays>
<overlay>
<groupId>org.jasig.resourceserver</groupId>
Expand Down Expand Up @@ -997,16 +954,4 @@
</plugins>
</build>

<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is check style no longer used?
It can be kinda nice to have for consistency.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Relocated to parent

<version>3.5.0</version>
<configuration>
<configLocation>google_checks.xml</configLocation>
</configuration>
</plugin>
</plugins>
</reporting>
</project>
Loading