Skip to content

Commit de98368

Browse files
highsourcehighsource
committed
Fixed builds, added a few ignores.
1 parent 1faa141 commit de98368

File tree

9 files changed

+34
-86
lines changed

9 files changed

+34
-86
lines changed

‎compiler/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@
3535
</dependencies>
3636
<build>
3737
<plugins>
38-
<plugin>
39-
<groupId>com.mycila.maven-license-plugin</groupId>
40-
<artifactId>maven-license-plugin</artifactId>
41-
</plugin>
4238
<plugin>
4339
<groupId>org.apache.maven.plugins</groupId>
4440
<artifactId>maven-shade-plugin</artifactId>

‎install.bat

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
11
setlocal
22
echo Setting JAVA_HOME to %JAVA6_HOME%.
33
set JAVA_HOME=%JAVA6_HOME%
4-
54
echo Performing a short clean build.
6-
pause
75
call mvn clean install -DperformRelease
86
echo Short clean build completed.
9-
pause
10-
117
echo Performing a full clean build.
12-
pause
138
call mvn clean install -DperformRelease -Ptests
149
echo Full clean build completed.
15-
pause
16-
1710
endlocal

‎pom.xml

Lines changed: 17 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
</mailingLists>
7171
<properties>
7272
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
73-
<jsonix.version>2.0.1</jsonix.version>
73+
<jsonix-scripts.version>2.0.1</jsonix-scripts.version>
7474
<jaxb2-basics.version>0.7.0</jaxb2-basics.version>
7575
<js-codemodel.version>1.1</js-codemodel.version>
7676
<jaxb-ri.version>2.1.13</jaxb-ri.version>
@@ -99,7 +99,7 @@
9999
<dependency>
100100
<groupId>org.hisrc.jsonix</groupId>
101101
<artifactId>jsonix-scripts</artifactId>
102-
<version>${jsonix.version}</version>
102+
<version>${jsonix-scripts.version}</version>
103103
</dependency>
104104
<dependency>
105105
<groupId>junit</groupId>
@@ -258,43 +258,6 @@
258258
</dependency>
259259
</dependencies>
260260
</plugin>
261-
<plugin>
262-
<groupId>com.mycila.maven-license-plugin</groupId>
263-
<artifactId>maven-license-plugin</artifactId>
264-
<version>1.8.0</version>
265-
<configuration>
266-
<header>${basedir}/src/etc/header.txt</header>
267-
<failIfMissing>true</failIfMissing>
268-
<strictCheck>true</strictCheck>
269-
<aggregate>true</aggregate>
270-
<excludes>
271-
<exclude>target-eclipse/**</exclude>
272-
<exclude>src/test/resources/**</exclude>
273-
<exclude>src/site/naturaldocs/**</exclude>
274-
<exclude>**/*.scripts</exclude>
275-
<exclude>**/*pom.xml</exclude>
276-
<exclude>**/*.bat</exclude>
277-
<exclude>**/*.gitignore</exclude>
278-
</excludes>
279-
<properties>
280-
<license.year>2010 - 2014</license.year>
281-
<license.description>Jsonix is a JavaScript library which allows you to convert between XML
282-
and JavaScript object structures.</license.description>
283-
<license.vendorInformation>Alexey Valikov, Highsource.org</license.vendorInformation>
284-
<license.copyrightHolder>Alexey Valikov</license.copyrightHolder>
285-
<license.COPYRIGHTHOLDER>ALEXEY VALIKOV</license.COPYRIGHTHOLDER>
286-
</properties>
287-
</configuration>
288-
<executions>
289-
<execution>
290-
<id>license-checkheaders</id>
291-
<phase>validate</phase>
292-
<goals>
293-
<goal>check</goal>
294-
</goals>
295-
</execution>
296-
</executions>
297-
</plugin>
298261
<plugin>
299262
<groupId>org.apache.maven.plugins</groupId>
300263
<artifactId>maven-shade-plugin</artifactId>
@@ -328,37 +291,6 @@ and JavaScript object structures.</license.description>
328291
<configuration>
329292
<lifecycleMappingMetadata>
330293
<pluginExecutions>
331-
<pluginExecution>
332-
<pluginExecutionFilter>
333-
<groupId>com.mycila.maven-license-plugin</groupId>
334-
<artifactId>maven-license-plugin</artifactId>
335-
<versionRange>[1.0,)</versionRange>
336-
<!--groupId>org.codehaus.mojo</groupId>
337-
<artifactId>aspectj-maven-plugin</artifactId>
338-
<versionRange>[1.0,)</versionRange-->
339-
<goals>
340-
<goal>remove</goal>
341-
<goal>format</goal>
342-
<goal>check</goal>
343-
</goals>
344-
</pluginExecutionFilter>
345-
<action>
346-
<ignore />
347-
</action>
348-
</pluginExecution>
349-
<pluginExecution>
350-
<pluginExecutionFilter>
351-
<groupId>org.jvnet.jaxb2.maven2</groupId>
352-
<artifactId>maven-jaxb2-plugin</artifactId>
353-
<versionRange>[0.8.1-SNAPSHOT,)</versionRange>
354-
<goals>
355-
<goal>generate</goal>
356-
</goals>
357-
</pluginExecutionFilter>
358-
<action>
359-
<ignore />
360-
</action>
361-
</pluginExecution>
362294
<pluginExecution>
363295
<pluginExecutionFilter>
364296
<groupId>org.apache.maven.plugins</groupId>
@@ -394,6 +326,21 @@ and JavaScript object structures.</license.description>
394326
<artifactId>maven-deploy-plugin</artifactId>
395327
<version>2.8.1</version>
396328
</plugin>
329+
<plugin>
330+
<groupId>org.apache.maven.plugins</groupId>
331+
<artifactId>maven-javadoc-plugin</artifactId>
332+
<version>2.9.1</version>
333+
</plugin>
334+
<plugin>
335+
<groupId>org.apache.maven.plugins</groupId>
336+
<artifactId>maven-source-plugin</artifactId>
337+
<version>2.3</version>
338+
</plugin>
339+
<plugin>
340+
<groupId>org.apache.maven.plugins</groupId>
341+
<artifactId>maven-jar-plugin</artifactId>
342+
<version>2.5</version>
343+
</plugin>
397344
</plugins>
398345
</pluginManagement>
399346
<plugins>

‎tests/filter/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/target

‎tests/filter/pom.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
22
<modelVersion>4.0.0</modelVersion>
3-
<artifactId>jsonix-schema-compiler-test-zero</artifactId>
3+
<artifactId>jsonix-schema-compiler-test-filter</artifactId>
44
<packaging>jar</packaging>
5-
<name>Jsonix Schema Compiler Tests [filter]</name>
5+
<name>Jsonix Schema Compiler Test [filter]</name>
66
<parent>
77
<groupId>org.hisrc.jsonix</groupId>
88
<artifactId>jsonix-schema-compiler-tests</artifactId>
99
<version>2.0.11-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212
<dependencies>
13+
<dependency>
14+
<groupId>org.jvnet.jaxb2_commons</groupId>
15+
<artifactId>jaxb2-basics-runtime</artifactId>
16+
</dependency>
1317
<dependency>
1418
<groupId>org.hisrc.jsonix</groupId>
1519
<artifactId>jsonix-scripts</artifactId>

‎tests/pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@
22
<modelVersion>4.0.0</modelVersion>
33
<artifactId>jsonix-schema-compiler-tests</artifactId>
44
<packaging>pom</packaging>
5-
<name>Jsonix Tests</name>
5+
<name>Jsonix Schema Compiler Tests</name>
66
<parent>
77
<groupId>org.hisrc.jsonix</groupId>
88
<artifactId>jsonix-schema-compiler-project</artifactId>
99
<version>2.0.11-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212
<modules>
13+
<module>filter</module>
14+
<module>wps</module>
1315
<module>zero</module>
1416
</modules>
1517
<build>

‎tests/wps/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/target

‎tests/wps/pom.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
22
<modelVersion>4.0.0</modelVersion>
3-
<artifactId>jsonix-schema-compiler-test-zero</artifactId>
3+
<artifactId>jsonix-schema-compiler-test-wps</artifactId>
44
<packaging>jar</packaging>
55
<name>Jsonix Schema Compiler Test [wps]</name>
66
<parent>
@@ -15,6 +15,10 @@
1515
<artifactId>jsonix-scripts</artifactId>
1616
<version>${project.version}</version>
1717
</dependency>
18+
<dependency>
19+
<groupId>org.jvnet.jaxb2_commons</groupId>
20+
<artifactId>jaxb2-basics-runtime</artifactId>
21+
</dependency>
1822
<dependency>
1923
<groupId>com.sun.xml.bind</groupId>
2024
<artifactId>jaxb-impl</artifactId>

‎tests/zero/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<artifactId>jsonix-schema-compiler-test-zero</artifactId>
44
<packaging>jar</packaging>
5-
<name>Jsonix Tests [zero]</name>
5+
<name>Jsonix Schema Compiler Test [zero]</name>
66
<parent>
77
<groupId>org.hisrc.jsonix</groupId>
88
<artifactId>jsonix-schema-compiler-tests</artifactId>

0 commit comments

Comments
 (0)