Fix resources in containers
Signed-off-by: Jan Supol <jan.supol@oracle.com>
diff --git a/containers/grizzly2-http/pom.xml b/containers/grizzly2-http/pom.xml
index 1829b09..5fa5b88 100644
--- a/containers/grizzly2-http/pom.xml
+++ b/containers/grizzly2-http/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -61,19 +61,6 @@
<inherited>true</inherited>
</plugin>
</plugins>
-
- <resources>
- <resource>
- <directory>${basedir}/src/main/java</directory>
- <includes>
- <include>META-INF/**/*</include>
- </includes>
- </resource>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
</build>
</project>
diff --git a/containers/grizzly2-servlet/pom.xml b/containers/grizzly2-servlet/pom.xml
index d6205f4..7abc1a5 100644
--- a/containers/grizzly2-servlet/pom.xml
+++ b/containers/grizzly2-servlet/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -59,16 +59,6 @@
<build>
<resources>
<resource>
- <directory>${basedir}/src/main/java</directory>
- <includes>
- <include>META-INF/**/*</include>
- </includes>
- </resource>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- <resource>
<directory>${project.build.directory}/legal</directory>
</resource>
</resources>
diff --git a/containers/jdk-http/pom.xml b/containers/jdk-http/pom.xml
index 54a629e..0439fec 100644
--- a/containers/jdk-http/pom.xml
+++ b/containers/jdk-http/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -68,12 +68,6 @@
<resources>
<resource>
- <directory>${basedir}/src/main/java</directory>
- <includes>
- <include>META-INF/**/*</include>
- </includes>
- </resource>
- <resource>
<directory>${basedir}/src/main/resources</directory>
<filtering>true</filtering>
</resource>
diff --git a/containers/jetty-http/pom.xml b/containers/jetty-http/pom.xml
index 96defc9..ea444be 100644
--- a/containers/jetty-http/pom.xml
+++ b/containers/jetty-http/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -74,28 +74,10 @@
<resources>
<resource>
- <directory>${basedir}/src/main/java</directory>
- <includes>
- <include>META-INF/**/*</include>
- </includes>
- </resource>
- <resource>
<directory>${basedir}/src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
</build>
- <profiles>
- <profile>
- <id>testsSkipJdk6</id>
- <activation>
- <jdk>1.6</jdk>
- </activation>
- <properties>
- <skip.tests>true</skip.tests>
- </properties>
- </profile>
- </profiles>
-
</project>
diff --git a/containers/jetty-servlet/pom.xml b/containers/jetty-servlet/pom.xml
index 0848b4c..fb63d39 100644
--- a/containers/jetty-servlet/pom.xml
+++ b/containers/jetty-servlet/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -54,16 +54,6 @@
<build>
<resources>
<resource>
- <directory>${basedir}/src/main/java</directory>
- <includes>
- <include>META-INF/**/*</include>
- </includes>
- </resource>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- <resource>
<directory>${project.build.directory}/legal</directory>
</resource>
</resources>
diff --git a/containers/simple-http/pom.xml b/containers/simple-http/pom.xml
index 09a0792..b6ad3c3 100644
--- a/containers/simple-http/pom.xml
+++ b/containers/simple-http/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -72,12 +72,6 @@
<resources>
<resource>
- <directory>${basedir}/src/main/java</directory>
- <includes>
- <include>META-INF/**/*</include>
- </includes>
- </resource>
- <resource>
<directory>${basedir}/src/main/resources</directory>
<filtering>true</filtering>
</resource>
diff --git a/containers/simple-http/src/main/resources/org.glassfish.jersey.simple.internal/localization.properties b/containers/simple-http/src/main/resources/org/glassfish/jersey/simple/internal/localization.properties
similarity index 100%
rename from containers/simple-http/src/main/resources/org.glassfish.jersey.simple.internal/localization.properties
rename to containers/simple-http/src/main/resources/org/glassfish/jersey/simple/internal/localization.properties
