From 591d41c9c4d816f22e8cf6a4e8167a3da014f893 Mon Sep 17 00:00:00 2001 From: nitram509 Date: Tue, 19 Jan 2016 22:23:56 +0100 Subject: [PATCH] remove parent pom construct to reduce deps when deploying --- jbrotli-native/darwin/pom.xml | 27 ++------------------------ jbrotli-native/linux-x86-amd64/pom.xml | 16 ++++++++------- jbrotli-native/linux-x86/pom.xml | 15 +++++++------- jbrotli-native/pom.xml | 9 ++------- jbrotli-native/win32-x86-amd64/pom.xml | 16 ++++++++------- jbrotli-native/win32-x86/pom.xml | 16 ++++++++------- jbrotli-performance/pom.xml | 8 ++------ jbrotli/pom.xml | 23 +++++++++++----------- pom.xml | 24 +---------------------- 9 files changed, 53 insertions(+), 101 deletions(-) diff --git a/jbrotli-native/darwin/pom.xml b/jbrotli-native/darwin/pom.xml index 3c78107..e430ac7 100644 --- a/jbrotli-native/darwin/pom.xml +++ b/jbrotli-native/darwin/pom.xml @@ -4,15 +4,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - com.meteogroup.jbrotli - jbrotli-native - 0.2.1-SNAPSHOT - ../pom.xml - - + com.meteogroup.jbrotli jbrotli-native-darwin jar + 0.2.1-SNAPSHOT 1.8 @@ -20,24 +15,6 @@ UTF-8 - - - - org.scijava - native-lib-loader - test - - - - org.testng - testng - - - org.assertj - assertj-core - - - diff --git a/jbrotli-native/linux-x86-amd64/pom.xml b/jbrotli-native/linux-x86-amd64/pom.xml index d9ed48c..29b99d6 100644 --- a/jbrotli-native/linux-x86-amd64/pom.xml +++ b/jbrotli-native/linux-x86-amd64/pom.xml @@ -4,14 +4,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - com.meteogroup.jbrotli - jbrotli-native - 0.2.1-SNAPSHOT - ../pom.xml - - + com.meteogroup.jbrotli jbrotli-native-linux-x86-amd64 + jar + 0.2.1-SNAPSHOT 1.8 @@ -24,17 +20,23 @@ org.scijava native-lib-loader + 2.1.3 test org.testng testng + 6.9.10 + test org.assertj assertj-core + 3.2.0 + test + diff --git a/jbrotli-native/linux-x86/pom.xml b/jbrotli-native/linux-x86/pom.xml index d281de4..c3eaebe 100644 --- a/jbrotli-native/linux-x86/pom.xml +++ b/jbrotli-native/linux-x86/pom.xml @@ -4,15 +4,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - com.meteogroup.jbrotli - jbrotli-native - 0.2.1-SNAPSHOT - ../pom.xml - - + com.meteogroup.jbrotli jbrotli-native-linux-x86 jar + 0.2.1-SNAPSHOT 1.8 @@ -25,17 +20,23 @@ org.scijava native-lib-loader + 2.1.3 test org.testng testng + 6.9.10 + test org.assertj assertj-core + 3.2.0 + test + diff --git a/jbrotli-native/pom.xml b/jbrotli-native/pom.xml index 407fc9b..ad9567a 100644 --- a/jbrotli-native/pom.xml +++ b/jbrotli-native/pom.xml @@ -4,15 +4,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - com.meteogroup.jbrotli - jbrotli-parent - 0.2.1-SNAPSHOT - ../pom.xml - - + com.meteogroup.jbrotli jbrotli-native pom + 0.2.1-SNAPSHOT diff --git a/jbrotli-native/win32-x86-amd64/pom.xml b/jbrotli-native/win32-x86-amd64/pom.xml index 4488780..56e8509 100644 --- a/jbrotli-native/win32-x86-amd64/pom.xml +++ b/jbrotli-native/win32-x86-amd64/pom.xml @@ -4,14 +4,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - com.meteogroup.jbrotli - jbrotli-native - 0.2.1-SNAPSHOT - ../pom.xml - - + com.meteogroup.jbrotli jbrotli-native-win32-x86-amd64 + jar + 0.2.1-SNAPSHOT 1.8 @@ -24,17 +20,23 @@ org.scijava native-lib-loader + 2.1.3 test org.testng testng + 6.9.10 + test org.assertj assertj-core + 3.2.0 + test + diff --git a/jbrotli-native/win32-x86/pom.xml b/jbrotli-native/win32-x86/pom.xml index cbcda4b..022a791 100644 --- a/jbrotli-native/win32-x86/pom.xml +++ b/jbrotli-native/win32-x86/pom.xml @@ -4,14 +4,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - com.meteogroup.jbrotli - jbrotli-native - 0.2.1-SNAPSHOT - ../pom.xml - - + com.meteogroup.jbrotli jbrotli-native-win32-x86 + jar + 0.2.1-SNAPSHOT 1.8 @@ -24,17 +20,23 @@ org.scijava native-lib-loader + 2.1.3 test org.testng testng + 6.9.10 + test org.assertj assertj-core + 3.2.0 + test + diff --git a/jbrotli-performance/pom.xml b/jbrotli-performance/pom.xml index 61c5384..c327db6 100644 --- a/jbrotli-performance/pom.xml +++ b/jbrotli-performance/pom.xml @@ -4,13 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - com.meteogroup.jbrotli - jbrotli-parent - 0.2.1-SNAPSHOT - - + com.meteogroup.jbrotli jbrotli-performance + jar 0.2.1-SNAPSHOT diff --git a/jbrotli/pom.xml b/jbrotli/pom.xml index ad01f55..c33358c 100644 --- a/jbrotli/pom.xml +++ b/jbrotli/pom.xml @@ -4,20 +4,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - com.meteogroup.jbrotli - jbrotli-parent - 0.2.1-SNAPSHOT - ../pom.xml - - + com.meteogroup.jbrotli jbrotli jar + 0.2.1-SNAPSHOT 1.8 1.8 UTF-8 + 0.2.1-SNAPSHOT @@ -33,7 +29,7 @@ com.meteogroup.jbrotli jbrotli-native-win32-x86-amd64 - 0.2.1-SNAPSHOT + ${version.jbrotli.native} @@ -50,7 +46,7 @@ com.meteogroup.jbrotli jbrotli-native-win32-x86 - 0.2.1-SNAPSHOT + ${version.jbrotli.native} @@ -66,7 +62,7 @@ com.meteogroup.jbrotli jbrotli-native-darwin - 0.2.1-SNAPSHOT + ${version.jbrotli.native} @@ -83,7 +79,7 @@ com.meteogroup.jbrotli jbrotli-native-linux-x86-amd64 - 0.2.1-SNAPSHOT + ${version.jbrotli.native} @@ -100,7 +96,7 @@ com.meteogroup.jbrotli jbrotli-native-linux-x86 - 0.2.1-SNAPSHOT + ${version.jbrotli.native} @@ -112,16 +108,19 @@ org.scijava native-lib-loader + 2.1.3 org.testng testng + 6.9.10 test org.assertj assertj-core + 3.2.0 test diff --git a/pom.xml b/pom.xml index ecc297b..6c4fddb 100644 --- a/pom.xml +++ b/pom.xml @@ -3,6 +3,7 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 + com.meteogroup.jbrotli jbrotli-parent 0.2.1-SNAPSHOT @@ -22,28 +23,6 @@ UTF-8 - - - - org.scijava - native-lib-loader - 2.1.2 - - - org.testng - testng - 6.9.9 - test - - - org.assertj - assertj-core - 3.2.0 - test - - - - @@ -56,7 +35,6 @@ -