Skip to content

Commit 8317ed3

Browse files
highsourcehighsource
committed
Version 2.1.1
1 parent 6ff2e71 commit 8317ed3

File tree

18 files changed

+144
-24
lines changed

18 files changed

+144
-24
lines changed

‎demos/po/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@
7070
<id>move-generated-sources</id>
7171
<phase>process-sources</phase>
7272
<configuration>
73-
<tasks>
73+
<target>
7474
<copy file="${project.build.directory}/generated-sources/xjc/PO.js" tofile="${basedir}/src/main/webapp/js/PO.js" />
7575
<delete dir="${project.build.directory}/generated-sources" />
76-
</tasks>
76+
</target>
7777
</configuration>
7878
<goals>
7979
<goal>run</goal>

‎demos/wms/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@
8282
<id>move-generated-sources</id>
8383
<phase>process-sources</phase>
8484
<configuration>
85-
<tasks>
85+
<target>
8686
<copy file="${project.build.directory}/generated-sources/xjc/WMS_V_1_3_0.js" tofile="${basedir}/src/main/webapp/js/WMS_V_1_3_0.js" />
8787
<delete dir="${project.build.directory}/generated-sources" />
88-
</tasks>
88+
</target>
8989
</configuration>
9090
<goals>
9191
<goal>run</goal>

‎dist/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>org.hisrc.jsonix</groupId>
1010
<artifactId>jsonix-project</artifactId>
11-
<version>2.1.1-SNAPSHOT</version>
11+
<version>2.1.1</version>
1212
</parent>
1313
<build>
1414
<plugins>

‎formats/gml-geojson/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,23 +120,23 @@
120120
<goal>run</goal>
121121
</goals>
122122
<configuration>
123-
<tasks>
123+
<target>
124124
<taskdef name="jslint" classname="com.googlecode.jslint4java.ant.JSLintTask" classpathref="maven.plugin.classpath" />
125125
<jslint encoding="UTF-8">
126126
<formatter type="plain" />
127127
<fileset dir="${basedir}/src/main/javascript" includes="**/*.js" />
128128
</jslint>
129-
</tasks>
129+
</target>
130130
</configuration>
131131
</execution>
132132
<execution>
133133
<phase>process-sources</phase>
134134
<configuration>
135-
<tasks>
135+
<target>
136136
<delete>
137137
<fileset dir="${basedir}/target/generated-sources/xjc/net/opengis/gml" includes="**/*.java"/>
138138
</delete>
139-
</tasks>
139+
</target>
140140
</configuration>
141141
<goals>
142142
<goal>run</goal>

‎full-build-1.6.bat

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
setlocal
2+
echo Setting JAVA_HOME to %JAVA6_HOME%.
3+
set JAVA_HOME=%JAVA6_HOME%
4+
call mvn clean install -Pall -DperformRelease
5+
endlocal

‎nodejs/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.hisrc.jsonix</groupId>
88
<artifactId>jsonix-project</artifactId>
9-
<version>2.1.1-SNAPSHOT</version>
9+
<version>2.1.1</version>
1010
</parent>
1111
<modules>
1212
<module>scripts</module>

‎nodejs/scripts/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name" : "jsonix",
3-
"version" : "2.1.1-SNAPSHOT",
3+
"version" : "2.1.1",
44
"description" : "Jsonix (JSON interfaces for XML) is a JavaScript library which allows converting between XML and JSON structures.",
55
"keywords" : [ "json", "xml", "unmarshal", "unmarshalling", "marshal",
66
"marshalling", "parse", "parsing", "serialize", "serializing",

‎nodejs/scripts/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.hisrc.jsonix</groupId>
88
<artifactId>jsonix-nodejs</artifactId>
9-
<version>2.1.1-SNAPSHOT</version>
9+
<version>2.1.1</version>
1010
</parent>
1111
<dependencies>
1212
<dependency>

‎nodejs/scripts/src/main/npm/package.json

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
{
2+
"name" : "jsonix",
3+
"version" : "${project.version}",
4+
"description" : "Jsonix (JSON interfaces for XML) is a JavaScript library which allows converting between XML and JSON structures.",
5+
"keywords" : [ "json", "xml", "unmarshal", "unmarshalling", "marshal",
6+
"marshalling", "parse", "parsing", "serialize", "serializing",
7+
"javascript objects", "dom", "util", "utility", "jaxb", "jsonix" ],
8+
"homepage" : "http://github.com/highsource/jsonix",
9+
"bugs" : {
10+
"url" : "http://github.com/highsource/jsonix/issues",
11+
"email" : "[email protected]"
12+
},
13+
"repository": {
14+
"type": "git",
15+
"url": "git://github.com/highsource/jsonix.git"
16+
},
17+
"licenses" : [ {
18+
"type" : "BSD-3-Clause",
19+
"url" : "http://github.com/highsource/jsonix/raw/master/LICENSE"
20+
} ],
21+
"author" : {
22+
"name" : "Alexey Valikov",
23+
"url" : "http://confluence.highsource.org"
24+
},
25+
"contributors" : [ {
26+
"name" : "Conrad Pankoff",
27+
"url" : "https://github.com/deoxxa"
28+
} ],
29+
"main" : "jsonix.js",
30+
"repository" : {
31+
"type" : "git",
32+
"url" : "http://github.com/highsource/jsonix.git"
33+
},
34+
"scripts" : {
35+
"test" : "nodeunit tests/tests.js"
36+
},
37+
"dependencies" : {
38+
"amdefine" : ">=0.1.0",
39+
"xmldom" : "~0.1.19",
40+
"xmlhttprequest" : "~1.6.0"
41+
},
42+
"devDependencies" : {
43+
"nodeunit" : "~0.8.6",
44+
"node-static" : "~0.7.3"
45+
},
46+
"engines" : [ "node >= 0.8.0" ]
47+
}

‎nodejs/tests/ar/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.hisrc.jsonix</groupId>
88
<artifactId>jsonix-nodejs-tests</artifactId>
9-
<version>2.1.1-SNAPSHOT</version>
9+
<version>2.1.1</version>
1010
</parent>
1111
<build>
1212
<plugins>

‎nodejs/tests/basic/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.hisrc.jsonix</groupId>
88
<artifactId>jsonix-nodejs-tests</artifactId>
9-
<version>2.1.1-SNAPSHOT</version>
9+
<version>2.1.1</version>
1010
</parent>
1111
<build>
1212
<plugins>

‎nodejs/tests/browserify/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.hisrc.jsonix</groupId>
88
<artifactId>jsonix-nodejs-tests</artifactId>
9-
<version>2.1.1-SNAPSHOT</version>
9+
<version>2.1.1</version>
1010
</parent>
1111
<build>
1212
<plugins>

‎nodejs/tests/po/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.hisrc.jsonix</groupId>
88
<artifactId>jsonix-nodejs-tests</artifactId>
9-
<version>2.1.1-SNAPSHOT</version>
9+
<version>2.1.1</version>
1010
</parent>
1111
<build>
1212
<plugins>

‎nodejs/tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.hisrc.jsonix</groupId>
88
<artifactId>jsonix-nodejs</artifactId>
9-
<version>2.1.1-SNAPSHOT</version>
9+
<version>2.1.1</version>
1010
</parent>
1111
<modules>
1212
<module>basic</module>

‎nodejs/tests/wps/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.hisrc.jsonix</groupId>
88
<artifactId>jsonix-nodejs-tests</artifactId>
9-
<version>2.1.1-SNAPSHOT</version>
9+
<version>2.1.1</version>
1010
</parent>
1111
<dependencies>
1212
<dependency>

‎pom.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<groupId>org.hisrc.jsonix</groupId>
44
<artifactId>jsonix-project</artifactId>
55
<packaging>pom</packaging>
6-
<version>2.1.1-SNAPSHOT</version>
6+
<version>2.1.1</version>
77
<name>Jsonix</name>
88
<description>Jsonix is a JavaScript library which allows you to convert between XML and JSON structures based on mappings.</description>
99
<url>https://github.com/highsource/jsonix</url>
@@ -277,6 +277,11 @@
277277
<artifactId>maven-clean-plugin</artifactId>
278278
<version>2.6.1</version>
279279
</plugin>
280+
<plugin>
281+
<groupId>org.apache.maven.plugins</groupId>
282+
<artifactId>maven-resources-plugin</artifactId>
283+
<version>2.7</version>
284+
</plugin>
280285
</plugins>
281286
</pluginManagement>
282287
<plugins>

‎qprerelease.bat

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
setlocal
2+
echo Setting JAVA_HOME to %JAVA6_HOME%.
3+
set JAVA_HOME=%JAVA6_HOME%
4+
5+
echo Performing a short clean build.
6+
rem pause
7+
call mvn clean install -DperformRelease
8+
echo Short clean build completed.
9+
rem pause
10+
11+
echo Performing a full clean build.
12+
rem pause
13+
call mvn clean install -DperformRelease -Pall
14+
echo Full clean build completed.
15+
rem pause
16+
17+
echo Setting new version to %1.
18+
rem pause
19+
call mvn versions:set -Pall -DnewVersion=%1
20+
echo Version was set to %1.
21+
rem pause
22+
call mvn versions:commit -Pall
23+
echo Version %1 committed.
24+
rem pause
25+
26+
echo Performing a short clean build.
27+
rem pause
28+
call mvn clean install -DperformRelease
29+
echo Short clean build completed.
30+
rem pause
31+
32+
echo Performing a full clean build.
33+
rem pause
34+
call mvn clean install -Pall -DperformRelease
35+
echo Full clean build completed.
36+
rem pause
37+
38+
echo Checking in version %1.
39+
rem pause
40+
git commit -a -m "Version %1"
41+
echo Version %1 was checked in.
42+
rem pause
43+
44+
echo Tagging version %1.
45+
rem pause
46+
git tag -a %1 -m "Version %1"
47+
echo Version %1 was tagged.
48+
rem pause
49+
50+
echo Pushing version %1.
51+
rem pause
52+
git push origin master
53+
git push --tags origin master
54+
echo Version %1 was pushed.
55+
rem pause
56+
57+
echo Performing full clean deploy.
58+
rem pause
59+
call mvn -DperformRelease -Psonatype-oss-release,all clean install
60+
echo Full clean deploy done.
61+
rem pause
62+
63+
endlocal

‎scripts/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.hisrc.jsonix</groupId>
88
<artifactId>jsonix-project</artifactId>
9-
<version>2.1.1-SNAPSHOT</version>
9+
<version>2.1.1</version>
1010
</parent>
1111
<dependencies>
1212
<dependency>
@@ -108,20 +108,20 @@
108108
<goal>run</goal>
109109
</goals>
110110
<configuration>
111-
<tasks>
111+
<target>
112112
<taskdef name="jslint" classname="com.googlecode.jslint4java.ant.JSLintTask" classpathref="maven.plugin.classpath" />
113113
<jslint encoding="UTF-8">
114114
<formatter type="plain" />
115115
<fileset dir="${basedir}/src/main/javascript" includes="**/*.js" />
116116
</jslint>
117-
</tasks>
117+
</target>
118118
</configuration>
119119
</execution>
120120
<execution>
121121
<id>copy-scripts</id>
122122
<phase>generate-sources</phase>
123123
<configuration>
124-
<tasks>
124+
<target>
125125
<mkdir dir="${project.build.directory}/scripts" />
126126
<copy todir="${project.build.directory}/scripts">
127127
<fileset dir="${basedir}/src/main/javascript">
@@ -135,7 +135,7 @@
135135
<include name="**/*.fragmentjs" />
136136
</fileset>
137137
</copy>
138-
</tasks>
138+
</target>
139139
</configuration>
140140
<goals>
141141
<goal>run</goal>

0 commit comments

Comments
 (0)