Skip to content

Commit

Permalink
Merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@foal
foal committed Dec 11, 2020
2 parents 409f3ff + c2932ab commit aff2c41
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 8 deletions.
12 changes: 7 additions & 5 deletions pom/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jresearch</groupId>
Expand Down Expand Up @@ -342,11 +344,11 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<linkXRef>false</linkXRef>
<tz.database.version>2020b</tz.database.version> -->
<gwt-typedarrays.ver>1.2</gwt-typedarrays.ver>
<gwt-nio.ver>1.1</gwt-nio.ver>
<gwt-xhr.ver>1.1</gwt-xhr.ver>
<gwt-typedarrays.ver>1.3-SNAPSHOT</gwt-typedarrays.ver>
<gwt-nio.ver>0.9</gwt-nio.ver>
<gwt-xhr.ver>1.2-SNAPSHOT</gwt-xhr.ver>
<gwt-slf4j.ver>1.0.1</gwt-slf4j.ver>
<time.apt.ver>2.0.4</time.apt.ver>
<gwt-locale.ver>1.0.1</gwt-locale.ver>
<gwt-locale.ver>1.0.1-SNAPSHOT</gwt-locale.ver>
</properties>
</project>
1 change: 1 addition & 0 deletions target/variable
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
commit = true
4 changes: 3 additions & 1 deletion test/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jresearch.gwt.time</groupId>
Expand Down
4 changes: 3 additions & 1 deletion time/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jresearch.gwt.time</groupId>
Expand Down
4 changes: 3 additions & 1 deletion tzdb/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jresearch.gwt.time</groupId>
Expand Down

0 comments on commit aff2c41

Please sign in to comment.