diff --git a/org.adempiere.report.jasper-feature/feature.xml b/org.adempiere.report.jasper-feature/feature.xml index 65535c0759..c274934dae 100644 --- a/org.adempiere.report.jasper-feature/feature.xml +++ b/org.adempiere.report.jasper-feature/feature.xml @@ -271,7 +271,7 @@ id="javax.validation.api" download-size="0" install-size="0" - version="0.0.0" + version="1.1.0.Final" unpack="false"/> + - - - - - + + + + + diff --git a/org.adempiere.server-feature/server.product.functionaltest.launch b/org.adempiere.server-feature/server.product.functionaltest.launch index 9984140045..450d410508 100644 --- a/org.adempiere.server-feature/server.product.functionaltest.launch +++ b/org.adempiere.server-feature/server.product.functionaltest.launch @@ -161,7 +161,6 @@ - @@ -176,7 +175,7 @@ - + diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index 4d32496d5e..41d299f756 100644 --- a/org.adempiere.server-feature/server.product.launch +++ b/org.adempiere.server-feature/server.product.launch @@ -22,6 +22,7 @@ + @@ -76,7 +77,7 @@ - + @@ -88,7 +89,7 @@ - + @@ -112,13 +113,13 @@ - - - - - - - + + + + + + + @@ -133,7 +134,8 @@ - + + @@ -180,7 +182,7 @@ - + @@ -229,7 +231,6 @@ - @@ -246,7 +247,7 @@ - + @@ -295,7 +296,7 @@ - + @@ -314,10 +315,10 @@ - + - + @@ -326,12 +327,12 @@ - - + + @@ -340,11 +341,6 @@ - - - - - @@ -356,7 +352,6 @@ - @@ -367,7 +362,7 @@ - + @@ -378,7 +373,7 @@ - + @@ -393,7 +388,7 @@ - + diff --git a/org.idempiere.eclipse.platform-feature/feature.xml b/org.idempiere.eclipse.platform-feature/feature.xml index 582a3344f2..20176bf33d 100644 --- a/org.idempiere.eclipse.platform-feature/feature.xml +++ b/org.idempiere.eclipse.platform-feature/feature.xml @@ -418,4 +418,18 @@ version="0.0.0" unpack="false"/> + + + + diff --git a/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml index 0820c0c996..322d601030 100644 --- a/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml +++ b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml @@ -16,9 +16,10 @@ 1.2.5 2.5.3 1.66 - 2.10.0 + 2.10.1 4.2 - 1.1.0.Final + 1.1.0.Final + 2.0.1.Final 6.0.1 20180813 1.7.25 @@ -949,6 +950,11 @@ true false + + javax.validation:validation-api:jar:${validation.api.jersey.version} + true + false + com.fasterxml.woodstox:woodstox-core:jar:${woodstox.core.version} true diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target index 7d211cac7d..696a67bc68 100644 --- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target +++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target @@ -1,9 +1,8 @@ - - + - + @@ -23,7 +22,7 @@ - + @@ -37,24 +36,24 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + @@ -87,6 +86,7 @@ + @@ -197,7 +197,6 @@ - @@ -215,9 +214,9 @@ - + - + @@ -304,7 +303,7 @@ - + @@ -330,6 +329,7 @@ + @@ -342,4 +342,4 @@ - + \ No newline at end of file diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd index c81683e143..964c6b4d55 100644 --- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd +++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd @@ -1,5 +1,5 @@ -target "idempiere-201030" +target "idempiere-201101" with source configurePhase allEnvironments @@ -37,7 +37,7 @@ location "https://idempiere.github.io/binary.file/p2.zk/9.5.0.1" { zweb-dsp } -location "https://idempiere.github.io/binary.file/p2.maven/maven-p2-R20201029" { +location "https://idempiere.github.io/binary.file/p2.maven/maven-p2-R20201101" { bcmail bcpkix bcprov @@ -86,7 +86,7 @@ location "https://idempiere.github.io/binary.file/p2.maven/maven-p2-R20201029" { javax.enterprise.cdi-api javax.interceptor-api javax.transaction-api - javax.validation.api + javax.validation.api [1.1.0.Final,1.1.0.Final] javax.websocket-api joda-time json @@ -197,7 +197,6 @@ location "https://idempiere.github.io/binary.file/p2.maven/maven-p2-R20201029" { org.eclipse.jetty.websocket.servlet org.eclipse.jetty.xml org.glassfish.hk2.osgi-resource-locator - org.glassfish.jersey.bundles.repackaged.jersey-guava org.jfree.chart org.jfree.jcommon org.krysalis.barcode4j @@ -340,6 +339,7 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/R202008312006 org.glassfish.hk2.api org.glassfish.hk2.locator org.glassfish.hk2.utils + org.glassfish.jersey.inject.jersey-hk2 org.glassfish.jersey.containers.servlet.core org.glassfish.jersey.core.jersey-client org.glassfish.jersey.core.jersey-common diff --git a/org.idempiere.p2/server.product b/org.idempiere.p2/server.product index 6f183a3e00..7e34544851 100644 --- a/org.idempiere.p2/server.product +++ b/org.idempiere.p2/server.product @@ -57,6 +57,7 @@ + diff --git a/org.idempiere.test/idempiere.unit.test.launch b/org.idempiere.test/idempiere.unit.test.launch index de462aeb16..2ab4979a1d 100644 --- a/org.idempiere.test/idempiere.unit.test.launch +++ b/org.idempiere.test/idempiere.unit.test.launch @@ -106,7 +106,8 @@ - + + @@ -301,7 +302,6 @@ - diff --git a/org.idempiere.webservices-feature/feature.xml b/org.idempiere.webservices-feature/feature.xml index 2eaeaf1629..22af640c9f 100644 --- a/org.idempiere.webservices-feature/feature.xml +++ b/org.idempiere.webservices-feature/feature.xml @@ -262,13 +262,6 @@ version="0.0.0" unpack="false"/> - -