Skip to content

Commit

Permalink
New version with upload efficiency issues addressed
Browse files Browse the repository at this point in the history
  • Loading branch information
@mondain
mondain committed Jan 12, 2021
1 parent 92c1f8d commit a9668a3
Show file tree
Hide file tree
Showing 8 changed files with 46 additions and 119 deletions.
18 changes: 1 addition & 17 deletions cockpit/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.jets3t</groupId>
<artifactId>parent</artifactId>
<version>0.9.6-SNAPSHOT</version>
<version>0.9.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cockpit</artifactId>
Expand All @@ -22,7 +22,6 @@
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<configuration>
<archive>
<manifestEntries>
Expand Down Expand Up @@ -71,21 +70,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
Expand Down
18 changes: 1 addition & 17 deletions cockpitlite/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.jets3t</groupId>
<artifactId>parent</artifactId>
<version>0.9.6-SNAPSHOT</version>
<version>0.9.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cockpitlite</artifactId>
Expand All @@ -22,7 +22,6 @@
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<configuration>
<archive>
<manifestEntries>
Expand Down Expand Up @@ -71,21 +70,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
Expand Down
18 changes: 1 addition & 17 deletions gatekeeper/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.jets3t</groupId>
<artifactId>parent</artifactId>
<version>0.9.5-SNAPSHOT</version>
<version>0.9.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jets3t</artifactId>
Expand All @@ -22,7 +22,6 @@
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<configuration>
<archive>
<manifestEntries>
Expand Down Expand Up @@ -61,21 +60,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
Expand Down
9 changes: 6 additions & 3 deletions jets3t-gui/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.jets3t</groupId>
<artifactId>parent</artifactId>
<version>0.9.6-SNAPSHOT</version>
<version>0.9.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jets3t-gui</artifactId>
Expand All @@ -22,7 +22,6 @@
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<configuration>
<archive>
<manifestEntries>
Expand All @@ -48,7 +47,11 @@
<groupId>org.jets3t</groupId>
<artifactId>jets3t</artifactId>
<version>${parent.version}</version>
</dependency>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down
15 changes: 1 addition & 14 deletions jets3t/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.jets3t</groupId>
<artifactId>parent</artifactId>
<version>0.9.6</version>
<version>0.9.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jets3t</artifactId>
Expand All @@ -22,7 +22,6 @@
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<configuration>
<archive>
<manifestEntries>
Expand Down Expand Up @@ -71,18 +70,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
Expand Down
51 changes: 34 additions & 17 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<artifactId>parent</artifactId>
<packaging>pom</packaging>
<name>parent</name>
<version>0.9.6</version>
<version>0.9.7</version>
<url>https://github.com/mondain/jets3t</url>
<description>JetS3t</description>
<inceptionYear>2006</inceptionYear>
Expand Down Expand Up @@ -82,17 +82,17 @@
<maven.compiler.target>1.8</maven.compiler.target>
<maven.build.timestamp.format>MM.dd.yyyy HH:mm</maven.build.timestamp.format>
<timestamp>${maven.build.timestamp}</timestamp>
<bc.version>1.59</bc.version>
<commons-codec.version>1.11</commons-codec.version>
<httpclient.version>4.5.3</httpclient.version>
<bc.version>1.62</bc.version>
<commons-codec.version>1.15</commons-codec.version>
<httpclient.version>4.5.9</httpclient.version>
<jackson.version>2.9.7</jackson.version>
<jaf.version>1.1.1</jaf.version>
<javamail.version>1.6.2</javamail.version>
<junit.version>[4.13.1,)</junit.version>
<logback.version>1.2.3</logback.version>
<mx4j.version>3.0.2</mx4j.version>
<tomcat.version>8.5.32</tomcat.version> <!-- used for servlet-api -->
<slf4j.version>1.7.25</slf4j.version>
<tomcat.version>8.5.61</tomcat.version> <!-- used for servlet-api -->
<slf4j.version>1.7.30</slf4j.version>
<xmlbuilder.version>1.1</xmlbuilder.version>
</properties>
<repositories>
Expand Down Expand Up @@ -163,16 +163,6 @@
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
Expand Down Expand Up @@ -201,9 +191,32 @@
<defaultGoal>package</defaultGoal>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M2</version>
<executions>
<execution>
<id>enforce-maven</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireJavaVersion>
<version>[1.8,)</version>
</requireJavaVersion>
<requireMavenVersion>
<version>[3.6.0,)</version>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.1</version>
<version>3.8.1</version>
<configuration>
<fork>true</fork>
<source>${maven.compiler.source}</source>
Expand Down Expand Up @@ -252,6 +265,10 @@
</tags>
</configuration>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
Expand Down
18 changes: 1 addition & 17 deletions synchronize/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.jets3t</groupId>
<artifactId>parent</artifactId>
<version>0.9.6-SNAPSHOT</version>
<version>0.9.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>synchronize</artifactId>
Expand All @@ -22,7 +22,6 @@
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<configuration>
<archive>
<manifestEntries>
Expand Down Expand Up @@ -71,21 +70,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
Expand Down
18 changes: 1 addition & 17 deletions uploader/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.jets3t</groupId>
<artifactId>parent</artifactId>
<version>0.9.6-SNAPSHOT</version>
<version>0.9.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>uploader</artifactId>
Expand All @@ -22,7 +22,6 @@
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<configuration>
<archive>
<manifestEntries>
Expand Down Expand Up @@ -71,21 +70,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
Expand Down

0 comments on commit a9668a3

Please sign in to comment.