Fridrich Strba 2019-04-15 13:17:30 +00:00 committed by Git OBS Bridge
parent b352bfd9e8
commit a5005ad653
9 changed files with 389 additions and 2095 deletions

View File

@ -1,115 +0,0 @@
--- pom.xml.sav0 2007-10-17 11:59:14.000000000 +0200
+++ pom.xml 2007-10-18 13:59:17.000000000 +0200
@@ -24,17 +24,19 @@
<modelVersion>4.0.0</modelVersion>
+<!--
<parent>
<groupId>org.apache.geronimo.genesis.config</groupId>
<artifactId>project-config</artifactId>
<version>1.1</version>
</parent>
+-->
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>specs</artifactId>
<packaging>pom</packaging>
<name>Geronimo Specifications</name>
- <version>1.2-SNAPSHOT</version>
+ <version>1.2</version>
<description>
Provides open-source implementations of Sun specifications.
@@ -74,6 +76,7 @@
<build>
<plugins>
+<!--
<plugin>
<groupId>org.apache.geronimo.genesis.plugins</groupId>
<artifactId>tools-maven-plugin</artifactId>
@@ -87,6 +90,7 @@
</execution>
</executions>
</plugin>
+-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -114,6 +118,7 @@
</configuration>
</plugin>
+<!--
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -131,20 +136,46 @@
</instructions>
</configuration>
</plugin>
+-->
</plugins>
</build>
<modules>
- <module>geronimo-activation_1.1_spec</module>
- <module>geronimo-commonj_1.1_spec</module>
+ <module>geronimo-activation_1.0.2_spec-1.2</module>
+ <module>geronimo-activation_1.1_spec-1.0</module>
+ <module>geronimo-ejb_2.1_spec-1.1</module>
+ <module>geronimo-el_1.0_spec-1.0</module>
+ <module>geronimo-j2ee-connector_1.5_spec-1.1.1</module>
+ <module>geronimo-j2ee-deployment_1.1_spec-1.1</module>
+ <module>geronimo-j2ee-jacc_1.0_spec-1.1</module>
+ <module>geronimo-j2ee-management_1.0_spec-1.1</module>
+ <module>geronimo-j2ee-management_1.1_spec-1.0</module>
+ <module>geronimo-jacc_1.1_spec-1.0</module>
+<!--
<module>geronimo-jaspi_1.0_spec</module>
- <module>geronimo-javamail_1.4_spec</module>
- <module>geronimo-j2ee-management_1.1_spec</module>
- <module>geronimo-jms_1.1_spec</module>
- <module>geronimo-jta_1.1_spec</module>
- <module>geronimo-servlet_2.5_spec</module>
- <module>geronimo-stax-api_1.0_spec</module>
+-->
+ <module>geronimo-javaee-deployment_1.1MR3_spec-1.0</module>
+ <module>geronimo-javamail_1.3.1_spec-1.3</module>
+ <module>geronimo-javamail_1.4_spec-1.1</module>
+ <module>geronimo-jaxr_1.0_spec-1.1</module>
+ <module>geronimo-jaxrpc_1.1_spec-1.1</module>
+ <module>geronimo-jms_1.1_spec-1.1</module>
+ <module>geronimo-jpa_3.0_spec-1.1.0</module>
+ <module>geronimo-jsp_2.0_spec-1.1</module>
+ <module>geronimo-jsp_2.1_spec-1.0</module>
+ <module>geronimo-jta_1.0.1B_spec-1.1.1</module>
+ <module>geronimo-jta_1.1_spec-1.1.0</module>
+ <module>geronimo-qname_1.1_spec-1.1</module>
+ <module>geronimo-saaj_1.1_spec-1.1</module>
+ <module>geronimo-servlet_2.4_spec-1.1.1</module>
+ <module>geronimo-servlet_2.5_spec-1.1</module>
+ <module>geronimo-spec-commonj</module>
+ <module>geronimo-spec-corba</module>
+ <module>geronimo-spec-corba-2.3</module>
+ <module>geronimo-spec-corba-3.0</module>
+ <module>geronimo-stax-api_1.0_spec-1.0</module>
+ <module>geronimo-ws-metadata_2.0_spec-1.1.1</module>
</modules>
<profiles>
@@ -160,9 +191,9 @@
</activation>
<modules>
- <module>geronimo-annotation_1.0_spec</module>
- <module>geronimo-ejb_3.0_spec</module>
- <module>geronimo-interceptor_3.0_spec</module>
+ <module>geronimo-annotation_1.0_spec-1.1.0</module>
+ <module>geronimo-ejb_3.0_spec-1.0</module>
+ <module>geronimo-interceptor_3.0_spec-1.0</module>
</modules>
</profile>
</profiles>

View File

@ -1,14 +0,0 @@
--- geronimo-spec-corba-2.3/pom.xml.orig 2008-07-11 16:04:50.713574621 -0400
+++ geronimo-spec-corba-2.3/pom.xml 2008-07-11 16:05:20.067522902 -0400
@@ -50,6 +50,11 @@
<artifactId>jacorb-idl-compiler</artifactId>
<version>2.2.3</version>
</dependency>
+ <dependency>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ <version>1.2.2</version>
+ </dependency>
</dependencies>
</plugin>
</plugins>

View File

@ -1,40 +0,0 @@
--- geronimo-spec-j2ee/pom.xml.sav4 2006-09-09 05:41:50.000000000 +0200
+++ geronimo-spec-j2ee/pom.xml 2008-08-07 11:05:43.000000000 +0200
@@ -2,12 +2,12 @@
<parent>
<artifactId>specs</artifactId>
<groupId>org.apache.geronimo.specs</groupId>
- <version>1.1.1</version>
+ <version>1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>geronimo-j2ee_1.4_spec</artifactId>
<name>J2EE</name>
- <version>${geronimoSpecsVersion}</version>
+ <version>1.2</version>
<packaging>pom</packaging>
<scm>
@@ -20,17 +20,11 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>assembly</goal>
- </goals>
- <configuration>
- <descriptor>src/main/assembly/j2ee.xml</descriptor>
- </configuration>
- </execution>
- </executions>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ </configuration>
</plugin>
</plugins>
</build>

View File

@ -1,15 +0,0 @@
--- geronimo-j2ee-connector_1.5_spec-1.1.1/pom.xml.sav2 2007-10-17 12:59:37.000000000 +0200
+++ geronimo-j2ee-connector_1.5_spec-1.1.1/pom.xml 2007-10-17 12:59:52.000000000 +0200
@@ -50,9 +50,9 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<verbose>true</verbose>
- <source>1.3</source>
- <target>1.3</target>
- <compilerVersion>1.3</compilerVersion>
+ <source>1.4</source>
+ <target>1.4</target>
+ <compilerVersion>1.4</compilerVersion>
</configuration>
</plugin>
</plugins>

View File

@ -1,111 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<dependencies>
<dependency>
<maven>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit_version}</version>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>junit</artifactId>
<version>${junit_version}</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>mockobjects</groupId>
<artifactId>mockobjects-core</artifactId>
<version>0.09</version>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>mockobjects-core</artifactId>
<version>0.09</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
<version>1.0</version>
</maven>
<jpp>
<groupId>JPP/mx4j</groupId>
<artifactId>mx4j</artifactId>
<version>1.0</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>scout</groupId>
<artifactId>scout</artifactId>
<version>0.5</version>
</maven>
<jpp>
<groupId>JPP/ws-scout</groupId>
<artifactId>scout</artifactId>
<version>1.0</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>scout</groupId>
<artifactId>scout</artifactId>
<version>1.0</version>
</maven>
<jpp>
<groupId>JPP/ws-scout</groupId>
<artifactId>scout</artifactId>
<version>1.0</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>plexus</groupId>
<artifactId>plexus-compiler-api</artifactId>
<version>1.5</version>
</maven>
<jpp>
<groupId>JPP/plexus</groupId>
<artifactId>compiler-api</artifactId>
<version>1.5</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>logkit</groupId>
<artifactId>logkit</artifactId>
<version>1.2.2</version>
</maven>
<jpp>
<groupId>JPP/excalibur</groupId>
<artifactId>avalon-logkit</artifactId>
<version>2.2.1</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework</artifactId>
<version>4.1.3</version>
</maven>
<jpp>
<groupId>JPP/excalibur</groupId>
<artifactId>avalon-framework</artifactId>
<version>4.3.1</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>org.jacorb</groupId>
<artifactId>jacorb-idl-compiler</artifactId>
<version>1.0</version>
</maven>
<jpp>
<groupId>JPP/jacorb</groupId>
<artifactId>idl</artifactId>
<version>1.0</version>
</jpp>
</dependency>
</dependencies>

View File

@ -1,15 +0,0 @@
--- geronimo-jta_1.0.1B_spec-1.1.1/pom.xml.sav1 2007-10-17 12:56:38.000000000 +0200
+++ geronimo-jta_1.0.1B_spec-1.1.1/pom.xml 2007-10-17 12:57:17.000000000 +0200
@@ -41,9 +41,9 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<verbose>true</verbose>
- <source>1.3</source>
- <target>1.3</target>
- <compilerVersion>1.3</compilerVersion>
+ <source>1.4</source>
+ <target>1.4</target>
+ <compilerVersion>1.4</compilerVersion>
</configuration>
</plugin>
</plugins>

View File

@ -1,15 +0,0 @@
--- geronimo-servlet_2.4_spec-1.1.1/pom.xml.sav3 2007-10-17 13:07:04.000000000 +0200
+++ geronimo-servlet_2.4_spec-1.1.1/pom.xml 2007-10-17 13:07:44.000000000 +0200
@@ -58,9 +58,9 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<verbose>true</verbose>
- <source>1.3</source>
- <target>1.3</target>
- <compilerVersion>1.3</compilerVersion>
+ <source>1.4</source>
+ <target>1.4</target>
+ <compilerVersion>1.4</compilerVersion>
</configuration>
</plugin>
</plugins>

View File

@ -1,5 +1,23 @@
-------------------------------------------------------------------
Fri Apr 12 13:16:12 UTC 2019 - Julio González Gil <jgonzalez@suse.com>
Mon Apr 15 13:02:26 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Removed patches:
* geronimo-specs-1.2-pom_xml.patch
* geronimo-specs-corba-2.3-pom_xml.patch
* geronimo-specs-j2ee-1.4-pom_xml.patch
* geronimo-specs-j2ee-connector-1.5-pom_xml.patch
* geronimo-specs-jta-1.0.1B-pom_xml.patch
* geronimo-specs-servlet-2.4-pom_xml.patch
+ Not needed since we are not building with maven and some
of the modifications are possible using the
javapackages-local macros.
- Remove all reference to parent pom, since we are not building
with maven, and don't package the parent pom in this build.
- Stop using alternatives to handle different versions of provides.
- Avoid multiplication of jar symlinks
-------------------------------------------------------------------
Fri Apr 12 13:16:12 UTC 2019 - Julio Gonzalez Gil <jgonzalez@suse.com>
- Obsoletes, conflicts and provides must use only %%{version} as the
the release is managed automatically by OBS and not needed (bsc#1132514)

File diff suppressed because it is too large Load Diff