From 0414a3e8c322d0fcb90671648c4419785c2940a7 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Nov 27 2015 07:01:53 +0000
Subject: Use upstream POMs for buliding


---

diff --git a/antlr4-aggregator.pom b/antlr4-aggregator.pom
deleted file mode 100644
index dffc53c..0000000
--- a/antlr4-aggregator.pom
+++ /dev/null
@@ -1,12 +0,0 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.fedoraproject.maven</groupId>
-  <artifactId>aggregator-project</artifactId>
-  <version>dummy</version>
-  <packaging>pom</packaging>
-  <modules>
-    <module>antlr4-maven-plugin</module>
-    <module>tool</module>
-    <module>runtime/Java</module>
-  </modules>
-</project>
diff --git a/antlr4-maven-plugin.pom b/antlr4-maven-plugin.pom
deleted file mode 100644
index fa59581..0000000
--- a/antlr4-maven-plugin.pom
+++ /dev/null
@@ -1,79 +0,0 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.antlr</groupId>
-  <artifactId>antlr4-maven-plugin</artifactId>
-  <version>4.5</version>
-  <packaging>maven-plugin</packaging>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-core</artifactId>
-      <version>3.3.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>3.3.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-compiler-api</artifactId>
-      <version>2.2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.sonatype.plexus</groupId>
-      <artifactId>plexus-build-api</artifactId>
-      <version>0.0.7</version>
-    </dependency>
-    <dependency>
-      <groupId>org.antlr</groupId>
-      <artifactId>antlr4</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.plugin-tools</groupId>
-      <artifactId>maven-plugin-annotations</artifactId>
-      <version>3.2</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.11</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.shared</groupId>
-      <artifactId>maven-plugin-testing-harness</artifactId>
-      <version>1.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <resources>
-      <resource>
-	<directory>resources</directory>
-      </resource>
-    </resources>
-    <pluginManagement>
-      <plugins>
-	<plugin>
-	  <groupId>org.apache.maven.plugins</groupId>
-	  <artifactId>maven-plugin-plugin</artifactId>
-	  <version>3.4</version>
-	  <configuration>
-	    <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
-	  </configuration>
-	</plugin>
-	<plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <configuration>
-            <source>1.6</source>
-            <target>1.6</target>
-          </configuration>
-	</plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-</project>
diff --git a/antlr4-runtime.pom b/antlr4-runtime.pom
deleted file mode 100644
index dae7982..0000000
--- a/antlr4-runtime.pom
+++ /dev/null
@@ -1,48 +0,0 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.antlr</groupId>
-  <artifactId>antlr4-runtime</artifactId>
-  <version>4.5</version>
-  <packaging>bundle</packaging>
-  <dependencies>
-    <dependency>
-      <groupId>org.abego.treelayout</groupId>
-      <artifactId>org.abego.treelayout.core</artifactId>
-      <version>1.0.1</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <sourceDirectory>src</sourceDirectory>
-    <plugins>
-      <plugin>
-	<groupId>org.apache.felix</groupId>
-	<artifactId>maven-bundle-plugin</artifactId>
-	<version>2.3.7</version>
-	<extensions>true</extensions>
-	<configuration>
-	  <instructions>
-	    <Bundle-SymbolicName>org.antlr.antlr4-runtime-osgi</Bundle-SymbolicName>
-	    <Bundle-Name>${project.name}</Bundle-Name>
-	    <Bundle-Vendor>ANTLR</Bundle-Vendor>
-	    <Bundle-Version>${project.version}</Bundle-Version>
-	  </instructions>
-	</configuration>
-      </plugin>
-      <plugin>
-	<groupId>org.antlr</groupId>
-	<artifactId>antlr4-maven-plugin</artifactId>
-	<version>4.3</version>
-	<configuration>
-	  <sourceDirectory>src</sourceDirectory>
-	</configuration>
-	<executions>
-	  <execution>
-	    <goals>
-	      <goal>antlr4</goal>
-	    </goals>
-	  </execution>
-	</executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/antlr4-tool.pom b/antlr4-tool.pom
deleted file mode 100644
index 84a34f3..0000000
--- a/antlr4-tool.pom
+++ /dev/null
@@ -1,61 +0,0 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.antlr</groupId>
-  <artifactId>antlr4</artifactId>
-  <version>4.5</version>
-  <dependencies>
-    <dependency>
-      <groupId>org.antlr</groupId>
-      <artifactId>antlr-runtime</artifactId>
-      <version>3.5.2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.antlr</groupId>
-      <artifactId>antlr4-runtime</artifactId>
-      <version>4.5</version>
-    </dependency>
-    <dependency>
-      <groupId>org.antlr</groupId>
-      <artifactId>ST4</artifactId>
-      <version>4.0.8</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.11</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <sourceDirectory>src</sourceDirectory>
-    <resources>
-      <resource>
-        <directory>resources</directory>
-      </resource>
-    </resources>
-    <testSourceDirectory>test</testSourceDirectory>
-    <testResources>
-      <testResource>
-        <directory>test</directory>
-      </testResource>
-    </testResources>
-    <plugins>
-      <plugin>
-        <groupId>org.antlr</groupId>
-        <artifactId>antlr3-maven-plugin</artifactId>
-        <version>3.5.2</version>
-        <configuration>
-          <sourceDirectory>src</sourceDirectory>
-          <verbose>true</verbose>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>antlr</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/antlr4.spec b/antlr4.spec
index ae0d4b4..0c3d5ad 100644
--- a/antlr4.spec
+++ b/antlr4.spec
@@ -1,6 +1,6 @@
 Name:           antlr4
 Version:        4.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Java parser generator
 # C# runtime is MIT-licensed, but currently it is not used in this package
 License:        BSD
@@ -9,27 +9,19 @@ BuildArch:      noarch
 
 Source0:        https://github.com/antlr/antlr4/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
-# Upstream uses an experimental bulid tool (http://bildtool.org/),
-# which is not available in Fedora.  RPMs are built with Maven using
-# POMs maintained by package maintainer.
-Source1:        antlr4-runtime.pom
-Source2:        antlr4-tool.pom
-Source3:        antlr4-maven-plugin.pom
-Source4:        antlr4-aggregator.pom
-
 BuildRequires:  maven-local
-BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.abego.treelayout:org.abego.treelayout.core)
 BuildRequires:  mvn(org.antlr:antlr3-maven-plugin)
 BuildRequires:  mvn(org.antlr:antlr4-maven-plugin)
 BuildRequires:  mvn(org.antlr:antlr-runtime)
 BuildRequires:  mvn(org.antlr:ST4)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires:  mvn(org.apache.maven:maven-core)
 BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
+BuildRequires:  mvn(org.apache.maven:maven-project)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
 BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
-BuildRequires:  mvn(org.apache.maven.shared:maven-plugin-testing-harness)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-compiler-api)
+BuildRequires:  mvn(org.sonatype.oss:oss-parent:pom:)
 BuildRequires:  mvn(org.sonatype.plexus:plexus-build-api)
 
 
@@ -62,12 +54,15 @@ This package contains %{summary}.
 
 %prep
 %setup -q
-cp -a %{SOURCE1} runtime/Java/pom.xml
-cp -a %{SOURCE2} tool/pom.xml
-cp -a %{SOURCE3} antlr4-maven-plugin/pom.xml
-cp -a %{SOURCE4} pom.xml
 find -name \*.jar -delete
 
+# Missing test deps: org.seleniumhq.selenium:selenium-java
+%pom_disable_module runtime-testsuite
+%pom_disable_module tool-testsuite
+
+# Don't bundle dependencies
+%pom_remove_plugin :maven-shade-plugin tool
+
 # On ARM builder
 # Tests run: 3, Failures: 0, Errors: 1, Skipped: 1, Time elapsed: 32.898 sec <<< FAILURE!
 # - in org.antlr.v4.test.tool.TestPerformance
@@ -75,10 +70,10 @@ find -name \*.jar -delete
 # org.junit.runners.model.TestTimedOutException: test timed out after 20000 milliseconds
 find -name TestPerformance.java -delete
 
-%mvn_package :aggregator-project __noinstall
+%mvn_package :%{name}-master __noinstall
 
 %build
-%mvn_build -s
+%mvn_build -s -f
 
 %install
 %mvn_install
@@ -99,6 +94,9 @@ find -name TestPerformance.java -delete
 %license LICENSE.txt
 
 %changelog
+* Fri Nov 27 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.5.1-2
+- Use upstream POMs for buliding
+
 * Fri Nov 27 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.5.1-1
 - Update to upstream version 4.5.1