diff --git a/org.adempiere.install/install.app.launch b/org.adempiere.install/install.app.launch index a679191f08..8aa2002c82 100644 --- a/org.adempiere.install/install.app.launch +++ b/org.adempiere.install/install.app.launch @@ -24,8 +24,8 @@ - - + + diff --git a/org.adempiere.server-feature/feature.xml b/org.adempiere.server-feature/feature.xml index 8f0684c25b..4e4581b15f 100644 --- a/org.adempiere.server-feature/feature.xml +++ b/org.adempiere.server-feature/feature.xml @@ -89,13 +89,6 @@ version="0.0.0" unpack="false"/> - - - - - - + + + + diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index c934321719..11e55d29d5 100644 --- a/org.adempiere.server-feature/server.product.launch +++ b/org.adempiere.server-feature/server.product.launch @@ -22,13 +22,13 @@ - + - - + + diff --git a/org.adempiere.server-feature/setup/configuration/config.ini b/org.adempiere.server-feature/setup/configuration/config.ini index 14adee3d87..000a8a39d3 100644 --- a/org.adempiere.server-feature/setup/configuration/config.ini +++ b/org.adempiere.server-feature/setup/configuration/config.ini @@ -43,9 +43,8 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\ javax.transaction,\ org.eclipse.jetty.osgi-servlet-api,\ javax.annotation-api,\ - org.slf4j.api,\ - org.slf4j.jcl,\ - org.slf4j.jdk14,\ + slf4j.api,\ + slf4j.jcl,\ org.apache.commons.codec,\ org.eclipse.osgi.compatibility.state,\ org.eclipse.osgi.compatibility.plugins,\ diff --git a/org.idempiere.hazelcast.service-feature/feature.xml b/org.idempiere.hazelcast.service-feature/feature.xml index 2ceb533610..3dd8644621 100644 --- a/org.idempiere.hazelcast.service-feature/feature.xml +++ b/org.idempiere.hazelcast.service-feature/feature.xml @@ -23,20 +23,6 @@ version="0.0.0" unpack="false"/> - - - - 1.1.0.Final 5.0.3 20171018 + 1.7.25 @@ -289,6 +290,21 @@ org.idempiere.org.conscrypt.openjdk-uber + + org.slf4j:slf4j-api:jar:${slf4j.version} + true + false + + + org.slf4j:slf4j-jdk14:jar:${slf4j.version} + true + false + + + org.slf4j:slf4j-jcl:jar:${slf4j.version} + true + false + - - - - - - - - - - - - - - diff --git a/org.slf4j.jdk14/build.properties b/org.slf4j.jdk14/build.properties deleted file mode 100644 index 4f2dec414f..0000000000 --- a/org.slf4j.jdk14/build.properties +++ /dev/null @@ -1,2 +0,0 @@ -bin.includes = META-INF/,\ - lib/slf4j-jdk14.jar diff --git a/org.slf4j.jdk14/copyjars.xml b/org.slf4j.jdk14/copyjars.xml deleted file mode 100644 index c7b46d1e1c..0000000000 --- a/org.slf4j.jdk14/copyjars.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/org.slf4j.jdk14/pom.xml b/org.slf4j.jdk14/pom.xml deleted file mode 100644 index 266f925169..0000000000 --- a/org.slf4j.jdk14/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - 4.0.0 - - org.idempiere - org.idempiere.parent - 5.1.0-SNAPSHOT - ../org.idempiere.parent/pom.xml - - org.slf4j.jdk14 - eclipse-plugin - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - validate - - copy - - - - - org.slf4j - slf4j-jdk14 - 1.7.2 - - - lib - true - true - true - - - - - - - \ No newline at end of file diff --git a/org.slf4j.jdk14/readme.txt b/org.slf4j.jdk14/readme.txt deleted file mode 100644 index 88b8741f09..0000000000 --- a/org.slf4j.jdk14/readme.txt +++ /dev/null @@ -1,2 +0,0 @@ -Need to repackage the slf4j-jdk14 bundle from maven here since the slf4j api bundle from orbit is with the org.slf4j.api -symbolic name but the slf4j-jdk14 expect the slf4j.api symbolic name. diff --git a/pom.xml b/pom.xml index f010093fb5..03dfd1e482 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,6 @@ org.idempiere.ui.zk.selenium org.idempiere.webservices org.idempiere.zk.extra - org.slf4j.jdk14 org.adempiere.report.jasper-feature org.adempiere.bundles.external-feature org.adempiere.base-feature @@ -74,4 +73,4 @@ ${idempiere.target} - \ No newline at end of file +