272 lines
9.8 KiB
Diff
272 lines
9.8 KiB
Diff
From d5fb647a6ec5fdae5966c08d1859421fd63a228c Mon Sep 17 00:00:00 2001
|
|
Subject: [PATCH] fix pom.xml
|
|
|
|
---
|
|
pom.xml | 201 ++++++++++++++++++++++++++++++++++++--------------------
|
|
1 file changed, 131 insertions(+), 70 deletions(-)
|
|
|
|
diff --git a/pom.xml b/pom.xml
|
|
index 6635950..23d800c 100644
|
|
--- a/pom.xml
|
|
+++ b/pom.xml
|
|
@@ -4,28 +4,34 @@
|
|
<modelVersion>4.0.0</modelVersion>
|
|
|
|
<parent>
|
|
- <groupId>org.jboss</groupId>
|
|
- <artifactId>jboss-parent</artifactId>
|
|
- <version>25</version>
|
|
+ <groupId>net.java</groupId>
|
|
+ <artifactId>jvnet-parent</artifactId>
|
|
+ <version>3</version>
|
|
</parent>
|
|
|
|
- <groupId>org.jboss.spec.javax.xml.rpc</groupId>
|
|
- <artifactId>jboss-jaxrpc-api_1.1_spec</artifactId>
|
|
- <version>1.0.2.Final</version>
|
|
+ <groupId>javax.xml.rpc</groupId>
|
|
+ <artifactId>javax.xml.rpc-api</artifactId>
|
|
+ <version>1.1.1</version>
|
|
<packaging>jar</packaging>
|
|
|
|
+ <properties>
|
|
+ <extension.name>javax.xml.rpc</extension.name>
|
|
+ <spec.version>1.1</spec.version>
|
|
+ <spec.bundle.version>1.1.1</spec.bundle.version>
|
|
+ <bundle.symbolicName>javax.xml.rpc-api</bundle.symbolicName>
|
|
+ <vendor.name>Oracle Corporation</vendor.name>
|
|
+ <implementation.vendor.id>org.glassfish</implementation.vendor.id>
|
|
+ <findbugs.version>2.3.1</findbugs.version>
|
|
+ <findbugs.exclude>exclude.xml</findbugs.exclude>
|
|
+ <findbugs.threshold>Low</findbugs.threshold>
|
|
+ </properties>
|
|
<name>Java(TM) API for XML-based RPC (JAX-RPC) 1.1</name>
|
|
<description>JSR-101: Java(TM) API for XML-based RPC (JAX-RPC) 1.1</description>
|
|
|
|
<licenses>
|
|
<license>
|
|
- <name>Common Development and Distribution License</name>
|
|
- <url>http://repository.jboss.org/licenses/cddl.txt</url>
|
|
- <distribution>repo</distribution>
|
|
- </license>
|
|
- <license>
|
|
- <name>GNU General Public License, Version 2 with the Classpath Exception</name>
|
|
- <url>http://repository.jboss.org/licenses/gpl-2.0-ce.txt</url>
|
|
+ <name>CDDL + GPLv2 with classpath exception</name>
|
|
+ <url>https://glassfish.dev.java.net/nonav/public/CDDL+GPL.html</url>
|
|
<distribution>repo</distribution>
|
|
</license>
|
|
</licenses>
|
|
@@ -38,38 +44,37 @@
|
|
</scm>
|
|
|
|
<build>
|
|
+ <resources>
|
|
+ <resource>
|
|
+ <directory>src/main/java</directory>
|
|
+ <includes>
|
|
+ <include>**/*.properties</include>
|
|
+ <include>**/*.html</include>
|
|
+ </includes>
|
|
+ </resource>
|
|
+ <resource>
|
|
+ <directory>src/main/resources</directory>
|
|
+ <excludes>
|
|
+ <exclude>META-INF/README</exclude>
|
|
+ </excludes>
|
|
+ </resource>
|
|
+ </resources>
|
|
<plugins>
|
|
- <!-- Include LICENSE.txt in the META-INF directory -->
|
|
<plugin>
|
|
- <groupId>org.apache.maven.plugins</groupId>
|
|
- <artifactId>maven-resources-plugin</artifactId>
|
|
- <executions>
|
|
- <execution>
|
|
- <id>copy-resources</id>
|
|
- <phase>process-resources</phase>
|
|
- <goals>
|
|
- <goal>copy-resources</goal>
|
|
- </goals>
|
|
- <configuration>
|
|
- <resources>
|
|
- <resource>
|
|
- <directory>${basedir}</directory>
|
|
- <includes>
|
|
- <include>LICENSE</include>
|
|
- <include>README</include>
|
|
- </includes>
|
|
- </resource>
|
|
- </resources>
|
|
- <outputDirectory>${project.build.outputDirectory}/META-INF</outputDirectory>
|
|
- </configuration>
|
|
- </execution>
|
|
- </executions>
|
|
+ <artifactId>maven-compiler-plugin</artifactId>
|
|
+ <version>2.5.1</version>
|
|
+ <configuration>
|
|
+ <source>1.6</source>
|
|
+ <target>1.6</target>
|
|
+ <compilerArgument>-Xlint:unchecked</compilerArgument>
|
|
+ </configuration>
|
|
</plugin>
|
|
|
|
<!-- Generate the OSGi jar Manifest. -->
|
|
<plugin>
|
|
<groupId>org.apache.felix</groupId>
|
|
<artifactId>maven-bundle-plugin</artifactId>
|
|
+ <version>1.4.3</version>
|
|
<executions>
|
|
<execution>
|
|
<id>bundle-manifest</id>
|
|
@@ -80,47 +85,103 @@
|
|
</execution>
|
|
</executions>
|
|
<configuration>
|
|
- <archive>
|
|
- <manifest>
|
|
- <addDefaultSpecificationEntries>false</addDefaultSpecificationEntries>
|
|
- </manifest>
|
|
- <manifestEntries>
|
|
- <Automatic-Module-Name>beta.jboss.jaxrpc.api_1_1</Automatic-Module-Name>
|
|
- </manifestEntries>
|
|
- </archive>
|
|
- <instructions>
|
|
- <Specification-Title>JSR-101: Java(TM) API for XML-based RPC (JAX-RPC) 1.1</Specification-Title>
|
|
- <Specification-Vendor>Oracle</Specification-Vendor>
|
|
- <Specification-Version>1.1</Specification-Version>
|
|
- <!-- Set the package version to match the spec version -->
|
|
- <Export-Package>
|
|
- javax.xml.rpc*;version=1.1
|
|
- </Export-Package>
|
|
- </instructions>
|
|
+ <supportedProjectTypes>
|
|
+ <supportedProjectType>jar</supportedProjectType>
|
|
+ </supportedProjectTypes>
|
|
+ <instructions>
|
|
+ <Bundle-Version>${spec.bundle.version}</Bundle-Version>
|
|
+ <Bundle-SymbolicName>${spec.bundle.symbolic-name}</Bundle-SymbolicName>
|
|
+ <Extension-Name>${spec.extension.name}</Extension-Name>
|
|
+ <Implementation-Version>${spec.implementation.version}</Implementation-Version>
|
|
+ <Specification-Version>${spec.specification.version}</Specification-Version>
|
|
+ <Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
|
|
+ <Bundle-Description>
|
|
+ JavaTM APIs for XML based RPC ${spec.version} Design Specification
|
|
+ </Bundle-Description>
|
|
+ <Specification-Vendor>${vendor.name}</Specification-Vendor>
|
|
+ <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
|
|
+ <Implementation-Vendor-Id>${implementation.vendor.id}</Implementation-Vendor-Id>
|
|
+ <Export-Package>${extension.name}.*; version=${spec.version}</Export-Package>
|
|
+ </instructions>
|
|
</configuration>
|
|
</plugin>
|
|
<!-- Add the OSGi Manifest to the main jar -->
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
- <artifactId>maven-jar-plugin</artifactId>
|
|
- <configuration>
|
|
- <archive>
|
|
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
|
|
- </archive>
|
|
+ <artifactId>maven-jar-plugin</artifactId>
|
|
+ <version>2.4</version>
|
|
+ <configuration>
|
|
+ <useDefaultManifestFile>true</useDefaultManifestFile>
|
|
+ <excludes>
|
|
+ <exclude>**/*.java</exclude>
|
|
+ </excludes>
|
|
+ </configuration>
|
|
+ </plugin>
|
|
+
|
|
+ <plugin>
|
|
+ <groupId>org.apache.maven.plugins</groupId>
|
|
+ <artifactId>maven-remote-resources-plugin</artifactId>
|
|
+ <version>1.2.1</version>
|
|
+ <executions>
|
|
+ <execution>
|
|
+ <goals>
|
|
+ <goal>process</goal>
|
|
+ </goals>
|
|
+ <configuration>
|
|
+ <resourceBundles>
|
|
+ <resourceBundle>org.glassfish:legal:1.1</resourceBundle>
|
|
+ </resourceBundles>
|
|
+ </configuration>
|
|
+ </execution>
|
|
+ </executions>
|
|
+ </plugin>
|
|
+
|
|
+ <plugin>
|
|
+ <groupId>org.apache.maven.plugins</groupId>
|
|
+ <artifactId>maven-source-plugin</artifactId>
|
|
+ <version>2.1</version>
|
|
+ <configuration>
|
|
+ <includePom>true</includePom>
|
|
</configuration>
|
|
+ <executions>
|
|
+ <execution>
|
|
+ <id>attach-sources</id>
|
|
+ <goals>
|
|
+ <goal>jar-no-fork</goal>
|
|
+ </goals>
|
|
+ </execution>
|
|
+ </executions>
|
|
+ </plugin>
|
|
+
|
|
+ <plugin>
|
|
+ <groupId>org.apache.maven.plugins</groupId>
|
|
+ <artifactId>maven-javadoc-plugin</artifactId>
|
|
+ <version>2.8</version>
|
|
+ <executions>
|
|
+ <execution>
|
|
+ <phase>javadoc</phase>
|
|
+ <goals>
|
|
+ <goal>javadoc</goal>
|
|
+ </goals>
|
|
+ <configuration>
|
|
+ <groups>
|
|
+ <group>
|
|
+ <title>APIs for XML based RPC Documentation</title>
|
|
+ <packages>javax.xml.rpc</packages>
|
|
+ </group>
|
|
+ </groups>
|
|
+ </configuration>
|
|
+ </execution>
|
|
+ </executions>
|
|
</plugin>
|
|
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
- <artifactId>maven-source-plugin</artifactId>
|
|
+ <artifactId>maven-release-plugin</artifactId>
|
|
<configuration>
|
|
- <archive>
|
|
- <manifestEntries>
|
|
- <Specification-Title>JSR-101: Java(TM) API for XML-based RPC (JAX-RPC) 1.1</Specification-Title>
|
|
- <Specification-Vendor>Oracle</Specification-Vendor>
|
|
- <Specification-Version>1.1</Specification-Version>
|
|
- </manifestEntries>
|
|
- </archive>
|
|
+ <mavenExecutorId>forked-path</mavenExecutorId>
|
|
+ <useReleaseProfile>false</useReleaseProfile>
|
|
+ <arguments>${release.arguments}</arguments>
|
|
</configuration>
|
|
</plugin>
|
|
|
|
@@ -129,9 +190,9 @@
|
|
|
|
<dependencies>
|
|
<dependency>
|
|
- <groupId>org.jboss.spec.javax.servlet</groupId>
|
|
- <artifactId>jboss-servlet-api_3.1_spec</artifactId>
|
|
- <version>1.0.2.Final</version>
|
|
+ <groupId>javax.servlet</groupId>
|
|
+ <artifactId>javax.servlet-api</artifactId>
|
|
+ <version>3.1.0</version>
|
|
<optional>true</optional>
|
|
</dependency>
|
|
</dependencies>
|
|
--
|
|
2.23.0
|
|
|