Skip to content
This repository has been archived by the owner on Nov 15, 2022. It is now read-only.

Fixing jaxr-ra pom.xml files #22535

Merged
merged 6 commits into from
Jul 9, 2018
Merged

Fixing jaxr-ra pom.xml files #22535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9f71908
Fixing jaxr-ra pom.xml files
ankathur Jun 21, 2018
4740f59
correcting indentation
ankathur Jun 22, 2018
b58f6bc
Using 4 space indentation
ankathur Jun 22, 2018
a099c2f
Merge remote-tracking branch 'upstream/master' into jaxr-ra-issue
ankathur Jul 6, 2018
4d6a08f
managing maven-rar-plugin in appserver/pom.xml.
ankathur Jul 6, 2018
413b246
Merge remote-tracking branch 'upstream/master' into jaxr-ra-issue
ankathur Jul 9, 2018
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
57 changes: 27 additions & 30 deletions appserver/jaxr-ra/jaxr-ra-jar/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,39 +40,36 @@

-->
<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
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.glassfish.main.jaxr-ra</groupId>
<artifactId>jaxr-ra-pom</artifactId>
<version>5.0.1-SNAPSHOT</version>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.glassfish.main.jaxr-ra</groupId>
<artifactId>jaxr-ra-pom</artifactId>
<version>5.0.1-SNAPSHOT</version>

</parent>
</parent>

<artifactId>jaxr-ra</artifactId>
<version>5.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>JAXR-RA</name>
<artifactId>jaxr-ra</artifactId>
<version>5.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>JAXR-RA</name>

<dependencies>
<dependency>
<groupId>javax.resource</groupId>
<artifactId>javax.resource-api</artifactId>
<version>1.7.1</version>
<scope>provided</scope>
</dependency>
<dependencies>
<dependency>
<groupId>javax.resource</groupId>
<artifactId>javax.resource-api</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>javax.xml.registry</groupId>
<artifactId>javax.xml.registry-api</artifactId>
<version>1.0.8</version>
</dependency>
<dependency>
<groupId>org.glassfish.annotations</groupId>
<artifactId>logging-annotation-processor</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
<dependency>
<groupId>javax.xml.registry</groupId>
<artifactId>javax.xml.registry-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.annotations</groupId>
<artifactId>logging-annotation-processor</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
</project>

80 changes: 40 additions & 40 deletions appserver/jaxr-ra/jaxr-ra-rar/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,49 +40,49 @@

-->
<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
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.glassfish.main.jaxr-ra</groupId>
<artifactId>jaxr-ra-pom</artifactId>
<version>5.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.glassfish.main.jaxr-ra</groupId>
<artifactId>jaxr-ra-pom</artifactId>
<version>5.0.1-SNAPSHOT</version>
</parent>

<artifactId>jaxr-ra-rar</artifactId>
<packaging>rar</packaging>
<version>5.0.1-SNAPSHOT</version>
<name>JAXR-RA RAR package</name>
<artifactId>jaxr-ra-rar</artifactId>
<packaging>rar</packaging>
<version>5.0.1-SNAPSHOT</version>
<name>JAXR-RA RAR package</name>

<dependencies>
<dependency>
<groupId>org.glassfish.main.jaxr-ra</groupId>
<artifactId>jaxr-ra</artifactId>
<version>5.0.1-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>javax.xml.registry</groupId>
<artifactId>javax.xml.registry-api</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<dependencies>
<dependency>
<groupId>org.glassfish.main.jaxr-ra</groupId>
<artifactId>jaxr-ra</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>javax.xml.registry</groupId>
<artifactId>javax.xml.registry-api</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-rar-plugin</artifactId>
<version>2.4</version>
<configuration>
<raXmlFile>ra.xml</raXmlFile>
<includeDependencies>true</includeDependencies>
<archive>
<addMavenDescriptor>true</addMavenDescriptor>
</archive>
<includeJar>false</includeJar>
</configuration>
</plugin>
</plugins>
</build>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-rar-plugin</artifactId>
<configuration>
<raXmlFile>ra.xml</raXmlFile>
<includeDependencies>true</includeDependencies>
<archive>
<addMavenDescriptor>true</addMavenDescriptor>
</archive>
<includeJar>false</includeJar>
</configuration>
</plugin>
</plugins>
</build>
</project>

34 changes: 17 additions & 17 deletions appserver/jaxr-ra/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,23 +40,23 @@

-->
<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
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.glassfish.main</groupId>
<artifactId>glassfish-parent</artifactId>
<version>5.0.1-SNAPSHOT</version>

</parent>
<groupId>org.glassfish.main.jaxr-ra</groupId>
<artifactId>jaxr-ra-pom</artifactId>
<packaging>pom</packaging>
<name>JAXR-RA POM</name>

<modules>
<module>jaxr-ra-jar</module>
<module>jaxr-ra-rar</module>
</modules>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.glassfish.main</groupId>
<artifactId>glassfish-parent</artifactId>
<version>5.0.1-SNAPSHOT</version>

</parent>
<groupId>org.glassfish.main.jaxr-ra</groupId>
<artifactId>jaxr-ra-pom</artifactId>
<packaging>pom</packaging>
<name>JAXR-RA POM</name>

<modules>
<module>jaxr-ra-jar</module>
<module>jaxr-ra-rar</module>
</modules>
</project>

9 changes: 9 additions & 0 deletions appserver/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,10 @@
<javax.management.j2ee-api.version>1.1.2</javax.management.j2ee-api.version>
<jboss.classfilewriter.version>1.2.1.Final</jboss.classfilewriter.version>
<easymock.version>3.5</easymock.version>
<javax.resource-api.version>1.7.1</javax.resource-api.version>
<javax.xml.registry-api.version>1.0.8</javax.xml.registry-api.version>
<maven-rar-plugin.version>2.4</maven-rar-plugin.version>

</properties>

<modules>
Expand Down Expand Up @@ -516,6 +520,11 @@
</exclude>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-rar-plugin</artifactId>
<version>${maven-rar-plugin.version}</version>
</plugin>
</plugins>
</pluginManagement>
</build>
Expand Down