Skip to content

Commit

Permalink
additional pom / dependency clean-up #540
Browse files Browse the repository at this point in the history
  • Loading branch information
@steveblackmon
steveblackmon committed Jan 18, 2024
1 parent f0b4c75 commit 7f31d35
Show file tree
Hide file tree
Showing 16 changed files with 136 additions and 65 deletions.
62 changes: 25 additions & 37 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,18 +201,6 @@
</developers>

<repositories>
<!-- <repository>-->
<!-- <id>central-repo</id>-->
<!-- <name>Maven Repository</name>-->
<!-- &lt;!&ndash; HTTPS is unavailable for Maven Central &ndash;&gt;-->
<!-- <url>https://repo.maven.apache.org/maven2</url>-->
<!-- <releases>-->
<!-- <enabled>true</enabled>-->
<!-- </releases>-->
<!-- <snapshots>-->
<!-- <enabled>false</enabled>-->
<!-- </snapshots>-->
<!-- </repository>-->
<repository>
<id>apache-repo</id>
<name>Apache Repository</name>
Expand All @@ -235,28 +223,17 @@
<enabled>true</enabled>
</snapshots>
</repository>
<!-- <repository>-->
<!-- <id>clojars-repo</id>-->
<!-- <name>Clojars Repository</name>-->
<!-- <url>https://clojars.org/repo</url>-->
<!-- <releases>-->
<!-- <enabled>true</enabled>-->
<!-- </releases>-->
<!-- <snapshots>-->
<!-- <enabled>false</enabled>-->
<!-- </snapshots>-->
<!-- </repository>-->
<!-- <repository>-->
<!-- <id>cloudera-repo</id>-->
<!-- <name>Cloudera Repository</name>-->
<!-- <url>https://repository.cloudera.com/artifactory/cloudera-repos</url>-->
<!-- <releases>-->
<!-- <enabled>true</enabled>-->
<!-- </releases>-->
<!-- <snapshots>-->
<!-- <enabled>false</enabled>-->
<!-- </snapshots>-->
<!-- </repository>-->
<repository>
<id>central-repo</id>
<name>Maven Repository</name>
<url>https://repo1.maven.org/maven2</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>

<pluginRepositories>
Expand All @@ -282,6 +259,17 @@
<enabled>true</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>central-repo</id>
<name>Maven Repository</name>
<url>https://repo1.maven.org/maven2</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>

<distributionManagement>
Expand Down Expand Up @@ -336,7 +324,7 @@
<clean.plugin.version>3.3.2</clean.plugin.version>
<dependency.plugin.version>3.6.1</dependency.plugin.version>
<depgraph.plugin.version>1.0.3</depgraph.plugin.version>
<docker.plugin.version>0.24.0</docker.plugin.version>
<docker.plugin.version>0.43.4</docker.plugin.version>
<download.plugin.version>1.2.1</download.plugin.version>
<enforcer.plugin.version>3.4.1</enforcer.plugin.version>
<failsafe.plugin.version>2.22.0</failsafe.plugin.version>
Expand Down Expand Up @@ -386,10 +374,10 @@
<jaxb2.version>0.15.3</jaxb2.version>
<jaxb2-basics.version>0.13.1</jaxb2-basics.version>
<jaxbutil.version>2.1.0</jaxbutil.version>
<netty.version>4.1.94.Final</netty.version>
<netty.version>4.1.105.Final</netty.version>
<slf4j.version>2.0.9</slf4j.version>
<log4j.version>2.22.0</log4j.version>
<logback.version>1.2.9</logback.version>
<logback.version>1.4.14</logback.version>
<protobuf.version>3.16.3</protobuf.version>
<hamcrest.version>2.2</hamcrest.version>
<reflections.version>0.10.2</reflections.version>
Expand Down
2 changes: 1 addition & 1 deletion streams-contrib/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<!-- <module>streams-persist-elasticsearch</module>-->
<module>streams-persist-filebuffer</module>
<module>streams-persist-hbase</module>
<!-- <module>streams-persist-hdfs</module>-->
<module>streams-persist-hdfs</module>
<module>streams-persist-graph</module>
<module>streams-persist-kafka</module>
<module>streams-persist-mongo</module>
Expand Down
18 changes: 18 additions & 0 deletions streams-contrib/streams-persist-cassandra/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@
<artifactId>cassandra-all</artifactId>
<version>${cassandra.version}</version>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
</exclusion>
<exclusion>
<groupId>com.datastax.cassandra</groupId>
<artifactId>*</artifactId>
Expand All @@ -85,8 +89,22 @@
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</exclusion>
<exclusion>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
<version>1.1.10.5</version>
</dependency>
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
Expand Down
27 changes: 27 additions & 0 deletions streams-contrib/streams-persist-hbase/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,10 @@
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.kerby</groupId>
<artifactId>kerb-simplekdc</artifactId>
Expand All @@ -121,12 +125,30 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.jline</groupId>
<artifactId>jline</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.25.0</version>
</dependency>
<dependency>
<groupId>org.jline</groupId>
<artifactId>jline</artifactId>
<version>3.25.0</version>
</dependency>
<dependency>
<groupId>org.apache.kerby</groupId>
<artifactId>kerb-simplekdc</artifactId>
Expand All @@ -138,6 +160,11 @@
<version>9.4.53.v20231009</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
<version>1.1.10.5</version>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-client</artifactId>
Expand Down
58 changes: 54 additions & 4 deletions streams-contrib/streams-persist-hdfs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,11 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.25.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
Expand All @@ -96,6 +101,16 @@
<artifactId>jetty-webapp</artifactId>
<version>9.4.53.v20231009</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
<version>9.4.53.v20231009</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>9.4.53.v20231009</version>
</dependency>
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
Expand All @@ -105,13 +120,31 @@
<artifactId>kerb-simplekdc</artifactId>
<version>2.0.3</version>
</dependency>
<dependency>
<groupId>org.jline</groupId>
<artifactId>jline</artifactId>
<version>3.25.0</version>
</dependency>
<dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
<version>1.1.10.5</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>${hdfs.version}</version>
<scope>compile</scope>
<type>jar</type>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
Expand All @@ -132,22 +165,35 @@
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
</exclusion>
<exclusion>
<groupId>org.jline</groupId>
<artifactId>jline</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
</exclusion>
<!-- not possible to exclude this and preserve module function -->
<!-- <exclusion>-->
<!-- <groupId>commons-collections</groupId>-->
<!-- <artifactId>commons-collections</artifactId>-->
<!-- </exclusion>-->
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand All @@ -165,6 +211,10 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>org.jline</groupId>
<artifactId>jline</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
Expand Down
14 changes: 1 addition & 13 deletions streams-dist/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ under the License.
<groupId>org.apache.streams</groupId>
<artifactId>apache-streams</artifactId>
<version>0.6.2-SNAPSHOT</version>
<relativePath>..</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>streams-dist</artifactId>
Expand Down Expand Up @@ -92,18 +92,6 @@ under the License.
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.streams</groupId>
<artifactId>streams-persist-elasticsearch</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<artifactId>snakeyaml</artifactId>
<groupId>org.yaml</groupId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.streams</groupId>
<artifactId>streams-persist-filebuffer</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion streams-examples/streams-examples-local/elasticsearch-hdfs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<groupId>org.apache.streams.examples</groupId>
<artifactId>streams-examples-local</artifactId>
<version>0.6.2-SNAPSHOT</version>
<relativePath>..</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion streams-examples/streams-examples-local/elasticsearch-reindex/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<groupId>org.apache.streams.examples</groupId>
<artifactId>streams-examples-local</artifactId>
<version>0.6.2-SNAPSHOT</version>
<relativePath>..</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion streams-examples/streams-examples-local/mongo-elasticsearch-sync/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<groupId>org.apache.streams.examples</groupId>
<artifactId>streams-examples-local</artifactId>
<version>0.6.2-SNAPSHOT</version>
<relativePath>..</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion streams-examples/streams-examples-local/twitter-follow-neo4j/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<groupId>org.apache.streams.examples</groupId>
<artifactId>streams-examples-local</artifactId>
<version>0.6.2-SNAPSHOT</version>
<relativePath>..</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion streams-plugins/streams-plugin-cassandra/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<groupId>org.apache.streams.plugins</groupId>
<artifactId>streams-plugins</artifactId>
<version>0.6.2-SNAPSHOT</version>
<relativePath>..</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion streams-plugins/streams-plugin-elasticsearch/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<groupId>org.apache.streams.plugins</groupId>
<artifactId>streams-plugins</artifactId>
<version>0.6.2-SNAPSHOT</version>
<relativePath>..</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion streams-plugins/streams-plugin-hbase/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<groupId>org.apache.streams.plugins</groupId>
<artifactId>streams-plugins</artifactId>
<version>0.6.2-SNAPSHOT</version>
<relativePath>..</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>

<properties>
Expand Down
Loading

0 comments on commit 7f31d35

Please sign in to comment.