Skip to content

Commit 1d243cd

Browse files
authored
Updated plugin versions and schema package (#469)
* Updated org.dozer.schema to com.github.dozermapper.schema * Updated plugin versions
1 parent c63cc63 commit 1d243cd

File tree

9 files changed

+41
-21
lines changed

9 files changed

+41
-21
lines changed

core/src/main/java/org/dozer/loader/xml/DozerResolver.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@
2222
import org.xml.sax.EntityResolver;
2323
import org.xml.sax.InputSource;
2424

25+
import com.github.dozermapper.schema.DefaultSchemaResolver;
26+
import com.github.dozermapper.schema.SchemaResolver;
27+
2528
import org.dozer.MappingException;
2629
import org.dozer.config.BeanContainer;
27-
import org.dozer.schema.DefaultSchemaResolver;
28-
import org.dozer.schema.SchemaResolver;
2930
import org.dozer.util.DozerClassLoader;
3031
import org.dozer.util.DozerConstants;
3132
import org.slf4j.Logger;

plugins-parent/pom.xml

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,18 @@
3434

3535
<properties>
3636
<!-- Maven Plugins versions; alphabetical order -->
37-
<alta-maven-plugin.version>0.5</alta-maven-plugin.version>
37+
<alta-maven-plugin.version>0.6.1</alta-maven-plugin.version>
3838
<maven-checkstyle-plugin.version>2.17</maven-checkstyle-plugin.version>
39-
<maven-compiler-plugin.version>3.6.1</maven-compiler-plugin.version>
40-
<maven-javadoc-plugin.version>2.10.4</maven-javadoc-plugin.version>
39+
<maven-clean-plugin.version>3.0.0</maven-clean-plugin.version>
40+
<maven-compiler-plugin.version>3.6.2</maven-compiler-plugin.version>
41+
<maven-install-plugin.version>2.5.2</maven-install-plugin.version>
42+
<maven-javadoc-plugin.version>3.0.0-M1</maven-javadoc-plugin.version>
4143
<maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
44+
<maven-resources-plugin.version>3.0.2</maven-resources-plugin.version>
4245
<maven-shade-plugin.version>3.0.0</maven-shade-plugin.version>
4346
<maven-source-plugin.version>3.0.1</maven-source-plugin.version>
44-
<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
45-
<maven-surefire-report-plugin.version>2.19.1</maven-surefire-report-plugin.version>
47+
<maven-surefire-plugin.version>2.20</maven-surefire-plugin.version>
48+
<maven-surefire-report-plugin.version>2.20</maven-surefire-report-plugin.version>
4649

4750
<!-- Codehaus Plugins versions; alphabetical order -->
4851
<build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
@@ -52,11 +55,12 @@
5255
<xmlbeans-maven-plugin.version>2.3.3</xmlbeans-maven-plugin.version>
5356

5457
<!-- OSGi Plugins versions; alphabetical order -->
55-
<maven-bundle-plugin.version>3.2.0</maven-bundle-plugin.version>
56-
<depends-maven-plugin.version>1.3.1</depends-maven-plugin.version>
58+
<maven-bundle-plugin.version>3.3.0</maven-bundle-plugin.version>
59+
<depends-maven-plugin.version>1.4.0</depends-maven-plugin.version>
5760

5861
<!-- Protobuf Plugins versions; alphabetical order -->
59-
<protoc-jar-maven-plugin.version>3.3.0</protoc-jar-maven-plugin.version>
62+
<protoc-jar-maven-plugin.version>3.3.0.1</protoc-jar-maven-plugin.version>
63+
<protoc.version>3.3.0</protoc.version>
6064
</properties>
6165

6266
<dependencyManagement>
@@ -114,11 +118,21 @@
114118
<artifactId>maven-checkstyle-plugin</artifactId>
115119
<version>${maven-checkstyle-plugin.version}</version>
116120
</plugin>
121+
<plugin>
122+
<groupId>org.apache.maven.plugins</groupId>
123+
<artifactId>maven-clean-plugin</artifactId>
124+
<version>${maven-clean-plugin.version}</version>
125+
</plugin>
117126
<plugin>
118127
<groupId>org.apache.maven.plugins</groupId>
119128
<artifactId>maven-compiler-plugin</artifactId>
120129
<version>${maven-compiler-plugin.version}</version>
121130
</plugin>
131+
<plugin>
132+
<groupId>org.apache.maven.plugins</groupId>
133+
<artifactId>maven-install-plugin</artifactId>
134+
<version>${maven-install-plugin.version}</version>
135+
</plugin>
122136
<plugin>
123137
<groupId>org.apache.maven.plugins</groupId>
124138
<artifactId>maven-javadoc-plugin</artifactId>
@@ -129,6 +143,11 @@
129143
<artifactId>maven-jar-plugin</artifactId>
130144
<version>${maven-jar-plugin.version}</version>
131145
</plugin>
146+
<plugin>
147+
<groupId>org.apache.maven.plugins</groupId>
148+
<artifactId>maven-resources-plugin</artifactId>
149+
<version>${maven-resources-plugin.version}</version>
150+
</plugin>
132151
<plugin>
133152
<groupId>org.apache.maven.plugins</groupId>
134153
<artifactId>maven-shade-plugin</artifactId>

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,11 @@
9494
<license.failIfUnknown>true</license.failIfUnknown>
9595

9696
<!-- Top level versions; alphabetical order -->
97-
<maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
97+
<maven-enforcer-plugin.version>3.0.0-M1</maven-enforcer-plugin.version>
9898
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
9999
<license-maven-plugin.version>3.0</license-maven-plugin.version>
100-
<nexus-staging-maven-plugin.version>1.6.7</nexus-staging-maven-plugin.version>
101-
<versions-maven-plugin.version>2.3</versions-maven-plugin.version>
100+
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
101+
<versions-maven-plugin.version>2.4</versions-maven-plugin.version>
102102

103103
<building-tools.version>6.2.0-SNAPSHOT</building-tools.version>
104104
</properties>

proto/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
<goal>run</goal>
8484
</goals>
8585
<configuration>
86-
<protocVersion>${protoc-jar-maven-plugin.version}</protocVersion>
86+
<protocVersion>${protoc.version}</protocVersion>
8787
<inputDirectories>
8888
<include>src/test/proto</include>
8989
</inputDirectories>

schema/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
<instructions>
5757
<Bundle-Name>${project.name}</Bundle-Name>
5858
<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
59-
<Bundle-Activator>org.dozer.schema.osgi.Activator</Bundle-Activator>
60-
<Export-Package>org.dozer.schema.*;version=${project.version}</Export-Package>
59+
<Bundle-Activator>com.github.dozermapper.schema.osgi.Activator</Bundle-Activator>
60+
<Export-Package>com.github.dozermapper.schema.*;version=${project.version}</Export-Package>
6161
<Import-Package>*</Import-Package>
6262
<Implementation-Title>${project.name}</Implementation-Title>
6363
<Implementation-Version>${project.version}</Implementation-Version>

schema/src/main/java/org/dozer/schema/DefaultSchemaResolver.java renamed to schema/src/main/java/com/github/dozermapper/schema/DefaultSchemaResolver.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.dozer.schema;
16+
package com.github.dozermapper.schema;
1717

1818
import java.net.URL;
1919

20-
import org.dozer.schema.osgi.Activator;
20+
import com.github.dozermapper.schema.osgi.Activator;
2121
import org.osgi.framework.Bundle;
2222
import org.slf4j.Logger;
2323
import org.slf4j.LoggerFactory;

schema/src/main/java/org/dozer/schema/SchemaResolver.java renamed to schema/src/main/java/com/github/dozermapper/schema/SchemaResolver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.dozer.schema;
16+
package com.github.dozermapper.schema;
1717

1818
import java.net.URL;
1919

schema/src/main/java/org/dozer/schema/osgi/Activator.java renamed to schema/src/main/java/com/github/dozermapper/schema/osgi/Activator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.dozer.schema.osgi;
16+
package com.github.dozermapper.schema.osgi;
1717

1818
import org.osgi.framework.Bundle;
1919
import org.osgi.framework.BundleActivator;

schema/src/test/java/org/dozer/schema/DefaultSchemaResolverTest.java renamed to schema/src/test/java/com/github/dozermapper/schema/DefaultSchemaResolverTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.dozer.schema;
16+
package com.github.dozermapper.schema;
1717

1818
import org.junit.Test;
1919

0 commit comments

Comments
 (0)