Skip to content

Commit

Permalink
Merge pull request #6732 from kalinchan/FISH-8588
Browse files Browse the repository at this point in the history 
FISH-8588 Cleanup POMs
  • Loading branch information
@kalinchan
kalinchan authored Jun 20, 2024
2 parents c51dc0e + 7436b05 commit 8ec4208
Show file tree
Hide file tree
Showing 552 changed files with 30 additions and 99,330 deletions.
10 changes: 5 additions & 5 deletions api/payara-bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@
<dependency>
<groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
<version>${org.apache.santuario.version}</version>
<version>${santuario.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
Expand All @@ -441,12 +441,12 @@
<dependency>
<groupId>org.glassfish.mq</groupId>
<artifactId>mq-distribution</artifactId>
<version>${mq.version}</version>
<version>${openmq.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.web</groupId>
<artifactId>jakarta.servlet.jsp.jstl</artifactId>
<version>${jstl-impl.version}</version>
<version>${jakarta.servlet.jsp.jstl.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
Expand All @@ -472,7 +472,7 @@
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.enterprise.concurrent</artifactId>
<version>${concurrent.version}</version>
<version>${concurro.version}</version>
</dependency>

<dependency>
Expand All @@ -483,7 +483,7 @@
<dependency>
<groupId>org.eclipse.angus</groupId>
<artifactId>angus-activation</artifactId>
<version>${angus.activation.version}</version>
<version>${angus-activation.version}</version>
</dependency>

<!-- Other libraries -->
Expand Down
12 changes: 0 additions & 12 deletions appserver/admin/admin-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,16 +83,4 @@
<scope>test</scope>
</dependency>
</dependencies>

<profiles>
<profile>
<id>release-phase2</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<properties>
<skipTests>true</skipTests>
</properties>
</profile>
</profiles>
</project>
38 changes: 0 additions & 38 deletions appserver/admingui/dataprovider/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,6 @@
<modelVersion>4.0.0</modelVersion>
<description>DataProvider Repackaged as OSGi bundle for Payara</description>

<properties>
<!--
Exclude this module because the source code isn't here;
it comes from an external project that we don't modify.
-->
<findbugs.skip>true</findbugs.skip>
</properties>

<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -124,34 +116,4 @@
<scope>provided</scope>
</dependency>
</dependencies>

<profiles>
<profile>
<!-- generate empty javadoc jar -->
<id>release-phase2</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<id>create-empty-javadoc-jar</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<classesDirectory>${project.build.directory}/javadoc</classesDirectory>
<classifier>javadoc</classifier>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
4 changes: 2 additions & 2 deletions appserver/admingui/devtests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
</developers>

<properties>
<selenium.version>2.40.0</selenium.version>
<selenium-server.version>2.40.0</selenium-server.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

Expand Down Expand Up @@ -162,7 +162,7 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-server</artifactId>
<version>${selenium.version}</version>
<version>${selenium-server.version}</version>
<exclusions>
<exclusion>
<groupId>org.testng</groupId>
Expand Down
13 changes: 0 additions & 13 deletions appserver/admingui/war/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,18 +173,5 @@
<enterprise.theme.classifier></enterprise.theme.classifier>
</properties>
</profile>
<profile>
<id>enterprise</id>
<dependencies>
<dependency>
<groupId>org.glassfish.woodstock</groupId>
<artifactId>woodstock-webui-jsf-suntheme</artifactId>
<classifier>enterprise</classifier>
</dependency>
</dependencies>
<properties>
<enterprise.theme.classifier>-enterprise</enterprise.theme.classifier>
</properties>
</profile>
</profiles>
</project>
1 change: 0 additions & 1 deletion appserver/appclient/client/acc-config/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@
<config-xsd-dir>src/main/resources</config-xsd-dir>
<config-xsd-file>sun-application-client-container_1_2.xsd</config-xsd-file>
-->
<findbugs.exclude>${project.basedir}/exclude.xml</findbugs.exclude>
</properties>

<developers>
Expand Down
1 change: 0 additions & 1 deletion appserver/appclient/client/acc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@

<standalone.classifier>lib</standalone.classifier>
<acc.osgi.module.classifier>module</acc.osgi.module.classifier>
<findbugs.exclude>${project.basedir}/exclude.xml</findbugs.exclude>
</properties>

<developers>
Expand Down
30 changes: 0 additions & 30 deletions appserver/batch/jbatch-repackaged/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,34 +192,4 @@
<artifactId>com.ibm.jbatch.container</artifactId>
</dependency>
</dependencies>

<profiles>
<profile>
<!-- generate empty javadoc jar -->
<id>release-phase2</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<id>create-empty-javadoc-jar</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<classesDirectory>${project.build.directory}/javadoc</classesDirectory>
<classifier>javadoc</classifier>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
4 changes: 0 additions & 4 deletions appserver/common/amx-javaee/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,6 @@
</developer>
</developers>

<properties>
<findbugs.exclude>${project.basedir}/exclude.xml</findbugs.exclude>
</properties>

<dependencies>
<dependency>
<groupId>fish.payara.server.core.common</groupId>
Expand Down
4 changes: 0 additions & 4 deletions appserver/common/glassfish-ee-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,6 @@
</developer>
</developers>

<properties>
<findbugs.exclude>${project.basedir}/exclude.xml</findbugs.exclude>
</properties>

<dependencies>
<dependency>
<groupId>org.glassfish.hk2</groupId>
Expand Down
6 changes: 1 addition & 5 deletions appserver/common/glassfish-naming/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,7 @@
<role>developer</role>
</roles>
</developer>
</developers>

<properties>
<findbugs.exclude>${project.basedir}/exclude.xml</findbugs.exclude>
</properties>
</developers>

<dependencies>
<dependency>
Expand Down
24 changes: 0 additions & 24 deletions appserver/distributions/payara-ml/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,30 +126,6 @@
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>ips</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
<artifactId>maven-antrun-extended-plugin</artifactId>
<executions>
<execution>
<id>create-ips-distribution</id>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<dependencies>
<dependency>
Expand Down
24 changes: 0 additions & 24 deletions appserver/distributions/payara-web-ml/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,30 +128,6 @@
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>ips</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
<artifactId>maven-antrun-extended-plugin</artifactId>
<executions>
<execution>
<id>create-ips-distribution</id>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<dependencies>
<!-- following dependencies are needed to run tests... -->
Expand Down
24 changes: 0 additions & 24 deletions appserver/distributions/payara-web/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,30 +129,6 @@
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>ips</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
<artifactId>maven-antrun-extended-plugin</artifactId>
<executions>
<execution>
<id>create-ips-distribution</id>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<dependencies>
<!-- following dependencies are needed to run tests... -->
Expand Down
25 changes: 0 additions & 25 deletions appserver/distributions/payara/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,31 +130,6 @@
</plugins>
</build>

<profiles>
<profile>
<id>ips</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
<artifactId>maven-antrun-extended-plugin</artifactId>
<executions>
<execution>
<id>create-ips-distribution</id>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<dependencies>
<dependency>
<groupId>fish.payara.server.internal.featuresets</groupId>
Expand Down
Loading

0 comments on commit 8ec4208

Please sign in to comment.