PatchesAndForks/rome
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #270 from rometools/pom-refactoring

Browse source 
Refactored POMs
This commit is contained in:
Patrick Gotthard 2016-02-20 16:12:47 +01:00
commit 10d6b126a3
9 changed files with 880 additions and 853 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
pom.xml
View file

@ -177,6 +177,47 @@
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<!-- ROME -->
<dependency>
<groupId>com.rometools</groupId>
<artifactId>rome</artifactId>
<version>1.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.rometools</groupId>
<artifactId>rome-certiorem</artifactId>
<version>1.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.rometools</groupId>
<artifactId>rome-certiorem-webapp</artifactId>
<version>1.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.rometools</groupId>
<artifactId>rome-fetcher</artifactId>
<version>1.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.rometools</groupId>
<artifactId>rome-modules</artifactId>
<version>1.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.rometools</groupId>
<artifactId>rome-opml</artifactId>
<version>1.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.rometools</groupId>
<artifactId>rome-propono</artifactId>
<version>1.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.rometools</groupId>
<artifactId>rome-utils</artifactId>
<version>1.6.0-SNAPSHOT</version>
</dependency>
<!-- JDOM --> <!-- JDOM -->
<dependency> <dependency>
<groupId>org.jdom</groupId> <groupId>org.jdom</groupId>

1
rome-certiorem-webapp/pom.xml
View file

@ -45,7 +45,6 @@
<dependency> <dependency>
<groupId>com.rometools</groupId> <groupId>com.rometools</groupId>
<artifactId>rome-certiorem</artifactId> <artifactId>rome-certiorem</artifactId>
<version>1.5.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.inject.extensions</groupId> <groupId>com.google.inject.extensions</groupId>

2
rome-certiorem/pom.xml
View file

@ -10,7 +10,6 @@
</parent> </parent>
<artifactId>rome-certiorem</artifactId> <artifactId>rome-certiorem</artifactId>
<version>1.6.0-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>rome-certiorem</name> <name>rome-certiorem</name>
@ -74,7 +73,6 @@
<dependency> <dependency>
<groupId>com.rometools</groupId> <groupId>com.rometools</groupId>
<artifactId>rome-fetcher</artifactId> <artifactId>rome-fetcher</artifactId>
<version>1.6.0-SNAPSHOT</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<artifactId>commons-httpclient</artifactId> <artifactId>commons-httpclient</artifactId>

192
rome-fetcher/pom.xml
View file

@ -1,40 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<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 http://maven.apache.org/maven-v4_0_0.xsd"> <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 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.rometools</groupId> <groupId>com.rometools</groupId>
<artifactId>rome-parent</artifactId> <artifactId>rome-parent</artifactId>
<version>1.6.0-SNAPSHOT</version> <version>1.6.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>rome-fetcher</artifactId> <artifactId>rome-fetcher</artifactId>
<version>1.6.0-SNAPSHOT</version> <packaging>jar</packaging>
<packaging>jar</packaging>
<name>rome-fetcher</name> <name>rome-fetcher</name>
<description>A well behaved feed fetcher API for ROME</description> <description>A well behaved feed fetcher API for ROME</description>
<url>http://rometools.github.io/rome-fetcher/</url> <url>http://rometools.github.io/rome-fetcher/</url>
<scm> <scm>
<connection>scm:git:ssh://github.com/rometools/rome-fetcher.git</connection> <connection>scm:git:ssh://github.com/rometools/rome-fetcher.git</connection>
<developerConnection>scm:git:ssh://git@github.com/rometools/rome-fetcher.git</developerConnection> <developerConnection>scm:git:ssh://git@github.com/rometools/rome-fetcher.git</developerConnection>
<url>https://github.com/rometools/rome-fetcher</url> <url>https://github.com/rometools/rome-fetcher</url>
</scm> </scm>
<developers> <developers>
<developer> <developer>
<name>Nick Lothian</name> <name>Nick Lothian</name>
<url>http://nicklothian.com</url> <url>http://nicklothian.com</url>
</developer> </developer>
<developer> <developer>
<name>Robert Cooper</name> <name>Robert Cooper</name>
<email>kebernet@gmail.comM</email> <email>kebernet@gmail.comM</email>
</developer> </developer>
</developers> </developers>
<repositories> <repositories>
<repository> <repository>
@ -49,75 +49,73 @@
</repository> </repository>
</repositories> </repositories>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId> <artifactId>maven-scm-publish-plugin</artifactId>
<configuration> <configuration>
<scmBranch>gh-pages</scmBranch> <scmBranch>gh-pages</scmBranch>
<pubScmUrl>${project.scm.developerConnection}</pubScmUrl> <pubScmUrl>${project.scm.developerConnection}</pubScmUrl>
<content>${project.build.directory}/site</content> <content>${project.build.directory}/site</content>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<configuration> <configuration>
<instructions> <instructions>
<Export-Package> <Export-Package>
com.rometools.fetcher, com.rometools.fetcher,
com.rometools.fetcher.impl com.rometools.fetcher.impl
</Export-Package> </Export-Package>
<Import-Package> <Import-Package>
com.rometools.rome.feed.impl, com.rometools.rome.feed.impl,
com.rometools.rome.feed.synd, com.rometools.rome.feed.synd,
com.rometools.rome.io, com.rometools.rome.io,
com.rometools.utils, com.rometools.utils,
org.apache.commons.httpclient;resolution:=optional, org.apache.commons.httpclient;resolution:=optional,
org.apache.commons.httpclient.auth;resolution:=optional, org.apache.commons.httpclient.auth;resolution:=optional,
org.apache.commons.httpclient.methods;resolution:=optional, org.apache.commons.httpclient.methods;resolution:=optional,
org.apache.commons.httpclient.params;resolution:=optional, org.apache.commons.httpclient.params;resolution:=optional,
org.slf4j org.slf4j
</Import-Package> </Import-Package>
</instructions> </instructions>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<dependencies>
<dependencies> <dependency>
<dependency> <groupId>com.rometools</groupId>
<groupId>com.rometools</groupId> <artifactId>rome</artifactId>
<artifactId>rome</artifactId> </dependency>
<version>1.6.0-SNAPSHOT</version> <dependency>
</dependency> <groupId>commons-httpclient</groupId>
<dependency> <artifactId>commons-httpclient</artifactId>
<groupId>commons-httpclient</groupId> <optional />
<artifactId>commons-httpclient</artifactId> </dependency>
<optional /> <dependency>
</dependency> <groupId>javax.servlet</groupId>
<dependency> <artifactId>servlet-api</artifactId>
<groupId>javax.servlet</groupId> <scope>test</scope>
<artifactId>servlet-api</artifactId> </dependency>
<scope>test</scope> <dependency>
</dependency> <groupId>jetty</groupId>
<dependency> <artifactId>jetty</artifactId>
<groupId>jetty</groupId> <scope>test</scope>
<artifactId>jetty</artifactId> </dependency>
<scope>test</scope> <dependency>
</dependency> <groupId>ch.qos.logback</groupId>
<dependency> <artifactId>logback-classic</artifactId>
<groupId>ch.qos.logback</groupId> <scope>test</scope>
<artifactId>logback-classic</artifactId> </dependency>
<scope>test</scope> <dependency>
</dependency> <groupId>junit</groupId>
<dependency> <artifactId>junit</artifactId>
<groupId>junit</groupId> <scope>test</scope>
<artifactId>junit</artifactId> </dependency>
<scope>test</scope> </dependencies>
</dependency>
</dependencies>
</project> </project>

2
rome-modules/pom.xml
View file

@ -10,7 +10,6 @@
</parent> </parent>
<artifactId>rome-modules</artifactId> <artifactId>rome-modules</artifactId>
<version>1.6.0-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>rome-modules</name> <name>rome-modules</name>
@ -97,7 +96,6 @@
<dependency> <dependency>
<groupId>com.rometools</groupId> <groupId>com.rometools</groupId>
<artifactId>rome</artifactId> <artifactId>rome</artifactId>
<version>1.6.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>ch.qos.logback</groupId> <groupId>ch.qos.logback</groupId>

2
rome-opml/pom.xml
View file

@ -10,7 +10,6 @@
</parent> </parent>
<artifactId>rome-opml</artifactId> <artifactId>rome-opml</artifactId>
<version>1.6.0-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>rome-opml</name> <name>rome-opml</name>
@ -64,7 +63,6 @@
<dependency> <dependency>
<groupId>com.rometools</groupId> <groupId>com.rometools</groupId>
<artifactId>rome</artifactId> <artifactId>rome</artifactId>
<version>1.6.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>ch.qos.logback</groupId> <groupId>ch.qos.logback</groupId>

2
rome-propono/pom.xml
View file

@ -10,7 +10,6 @@
</parent> </parent>
<artifactId>rome-propono</artifactId> <artifactId>rome-propono</artifactId>
<version>1.6.0-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>rome-propono</name> <name>rome-propono</name>
@ -75,7 +74,6 @@
<dependency> <dependency>
<groupId>com.rometools</groupId> <groupId>com.rometools</groupId>
<artifactId>rome</artifactId> <artifactId>rome</artifactId>
<version>1.6.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-httpclient</groupId> <groupId>commons-httpclient</groupId>

1
rome-utils/pom.xml
View file

@ -10,7 +10,6 @@
</parent> </parent>
<artifactId>rome-utils</artifactId> <artifactId>rome-utils</artifactId>
<version>1.6.0-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>rome-utils</name> <name>rome-utils</name>

2
rome/pom.xml
View file

@ -10,7 +10,6 @@
</parent> </parent>
<artifactId>rome</artifactId> <artifactId>rome</artifactId>
<version>1.6.0-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>rome</name> <name>rome</name>
@ -136,7 +135,6 @@
<dependency> <dependency>
<groupId>com.rometools</groupId> <groupId>com.rometools</groupId>
<artifactId>rome-utils</artifactId> <artifactId>rome-utils</artifactId>
<version>1.6.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jdom</groupId> <groupId>org.jdom</groupId>