Skip to content

Commit f0c9770

Browse files
highsourcehighsource
committed
Fixed working on the next release.
1 parent f75443c commit f0c9770

File tree

4 files changed

+68
-27
lines changed

4 files changed

+68
-27
lines changed

‎pom.xml‎

Lines changed: 33 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,6 @@
6060
<email>[email protected]</email>
6161
</developer>
6262
</developers>
63-
<contributors>
64-
<!--contributor>
65-
<name></name>
66-
<email></email>
67-
<organization></organization>
68-
<organizationUrl></organizationUrl>
69-
<timezone></timezone>
70-
</contributor-->
71-
</contributors>
7263
<licenses>
7364
<license>
7465
<name>BSD 2-Clause License</name>
@@ -86,7 +77,6 @@
8677
</modules>
8778
<profiles>
8879
<profile>
89-
<!-- Disable syntax validation for javadoc in Java8 -->
9080
<id>disable-java8-doclint</id>
9181
<activation>
9282
<jdk>[1.8,)</jdk>
@@ -178,15 +168,12 @@
178168
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
179169
<jaxb.version>2.3.0</jaxb.version>
180170
<jaxb-api.version>2.3.0</jaxb-api.version>
171+
<activation.version>1.2.0</activation.version>
181172
<maven-jaxb2-plugin.version>0.14.0</maven-jaxb2-plugin.version>
182173
<annox.version>1.0.2</annox.version>
183174
<jaxb2-basics.version>0.12.0</jaxb2-basics.version>
184175
</properties>
185-
<prerequisites>
186-
<maven>3.1</maven>
187-
</prerequisites>
188176
<dependencies>
189-
<!-- JUnit -->
190177
<dependency>
191178
<groupId>junit</groupId>
192179
<artifactId>junit</artifactId>
@@ -278,6 +265,11 @@
278265
<artifactId>jaxb-xjc</artifactId>
279266
<version>${jaxb.version}</version>
280267
</dependency>
268+
<dependency>
269+
<groupId>com.sun.activation</groupId>
270+
<artifactId>javax.activation</artifactId>
271+
<version>${activation.version}</version>
272+
</dependency>
281273
<!-- JUnit -->
282274
<dependency>
283275
<groupId>junit</groupId>
@@ -356,6 +348,11 @@
356348
<defaultGoal>install</defaultGoal>
357349
<pluginManagement>
358350
<plugins>
351+
<plugin>
352+
<groupId>org.apache.maven.plugins</groupId>
353+
<artifactId>maven-enforcer-plugin</artifactId>
354+
<version>3.0.0-M1</version>
355+
</plugin>
359356
<plugin>
360357
<groupId>org.apache.maven.plugins</groupId>
361358
<artifactId>maven-release-plugin</artifactId>
@@ -486,6 +483,28 @@
486483
</plugins>
487484
</pluginManagement>
488485
<plugins>
486+
<plugin>
487+
<groupId>org.apache.maven.plugins</groupId>
488+
<artifactId>maven-enforcer-plugin</artifactId>
489+
<executions>
490+
<execution>
491+
<id>enforce-java-maven</id>
492+
<goals>
493+
<goal>enforce</goal>
494+
</goals>
495+
<configuration>
496+
<rules>
497+
<requireJavaVersion>
498+
<version>9</version>
499+
</requireJavaVersion>
500+
<requireMavenVersion>
501+
<version>3.0</version>
502+
</requireMavenVersion>
503+
</rules>
504+
</configuration>
505+
</execution>
506+
</executions>
507+
</plugin>
489508
<plugin>
490509
<artifactId>maven-source-plugin</artifactId>
491510
<executions>

‎samples/annotate/pom.xml‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,34 +44,44 @@
4444
</parent>
4545
<dependencies>
4646
<dependency>
47-
<groupId>junit</groupId>
48-
<artifactId>junit</artifactId>
47+
<groupId>org.glassfish.jaxb</groupId>
48+
<artifactId>jaxb-xjc</artifactId>
4949
</dependency>
5050
<dependency>
5151
<groupId>org.jvnet.jaxb2_commons</groupId>
5252
<artifactId>jaxb2-basics-annotate</artifactId>
5353
</dependency>
54+
<dependency>
55+
<groupId>commons-logging</groupId>
56+
<artifactId>commons-logging</artifactId>
57+
</dependency>
5458
<dependency>
5559
<groupId>org.jvnet.jaxb2_commons</groupId>
5660
<artifactId>jaxb2-basics-ant</artifactId>
5761
</dependency>
5862
<dependency>
59-
<groupId>org.glassfish.jaxb</groupId>
60-
<artifactId>jaxb-xjc</artifactId>
63+
<groupId>org.apache.logging.log4j</groupId>
64+
<artifactId>log4j-jcl</artifactId>
6165
</dependency>
66+
6267
<dependency>
6368
<groupId>org.glassfish.jaxb</groupId>
64-
<artifactId>jaxb-core</artifactId>
69+
<artifactId>jaxb-runtime</artifactId>
6570
</dependency>
6671
<dependency>
67-
<groupId>org.apache.logging.log4j</groupId>
68-
<artifactId>log4j-jcl</artifactId>
72+
<groupId>com.sun.activation</groupId>
73+
<artifactId>javax.activation</artifactId>
6974
</dependency>
75+
7076
<dependency>
7177
<groupId>org.hibernate</groupId>
7278
<artifactId>hibernate-search</artifactId>
7379
<version>4.1.1.Final</version>
7480
</dependency>
81+
<dependency>
82+
<groupId>junit</groupId>
83+
<artifactId>junit</artifactId>
84+
</dependency>
7585
</dependencies>
7686
<build>
7787
<defaultGoal>install</defaultGoal>

‎samples/annotate/project-build.xml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,10 @@
3939
</path>
4040
<path id="test-compile.path">
4141
<fileset dir="${basedir}/lib">
42-
<include name="activation-*.jar"/>
42+
<include name="javax.activation-*.jar"/>
4343
<include name="jaxb-api-*.jar"/>
44+
<include name="jaxb-impl-*.jar"/>
45+
<include name="jaxb-runtime-*.jar"/>
4446
<include name="jaxb-core-*.jar"/>
4547
<include name="stax-api-*.jar"/>
4648
<include name="jsr173_api-*.jar"/>
@@ -53,8 +55,10 @@
5355
</path>
5456
<path id="test.path">
5557
<fileset dir="${basedir}/lib">
56-
<include name="activation-*.jar"/>
58+
<include name="javax.activation-*.jar"/>
5759
<include name="jaxb-api-*.jar"/>
60+
<include name="jaxb-impl-*.jar"/>
61+
<include name="jaxb-runtime-*.jar"/>
5862
<include name="jaxb-core-*.jar"/>
5963
<include name="stax-api-*.jar"/>
6064
<include name="jsr173_api-*.jar"/>
@@ -74,11 +78,13 @@
7478
<!-- XJC2 Task classpath -->
7579
<classpath>
7680
<fileset dir="${basedir}/lib">
77-
<include name="activation-*.jar"/>
81+
<include name="javax.activation-*.jar"/>
7882
<include name="jaxb-api-*.jar"/>
83+
<include name="jaxb-impl-*.jar"/>
84+
<include name="jaxb-runtime-*.jar"/>
7985
<include name="jaxb-core-*.jar"/>
80-
<include name="jsr173_api-*.jar"/>
8186
<include name="stax-api-*.jar"/>
87+
<include name="jsr173_api-*.jar"/>
8288

8389
<include name="jaxb2-basics-jaxb-xjc-*.jar"/>
8490
<include name="jaxb-xjc-*.jar"/>
@@ -88,7 +94,7 @@
8894
</classpath>
8995
</taskdef>
9096
<mkdir dir="${basedir}/target/generated-sources/xjc"/>
91-
<xjc destdir="${basedir}/target/generated-sources/xjc" extension="true">
97+
<xjc destdir="${basedir}/target/generated-sources/xjc" extension="true" failonerror="false">
9298
<arg line="
9399
-Xannotate"/>
94100
<binding dir="${basedir}/src/main/resources">

‎tests/annotate/src/main/resources/schema.xsd‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,13 @@
5151
<xsd:annotation>
5252
<xsd:appinfo>
5353
<annox:annotate>@java.lang.SuppressWarnings({"unchecked","rawtypes"})</annox:annotate>
54-
<annox:annotate target="package">@javax.annotation.Generated({"XJC","JAXB2 Annotate Plugin"})</annox:annotate>
54+
<annox:annotate target="package">
55+
@javax.xml.bind.annotation.XmlSchema(
56+
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.UNQUALIFIED,
57+
xmlns = {
58+
@javax.xml.bind.annotation.XmlNs(prefix = "a", namespaceURI = "")
59+
})
60+
</annox:annotate>
5561
</xsd:appinfo>
5662
</xsd:annotation>
5763
<xsd:sequence>

0 commit comments

Comments
 (0)