Skip to content

Commit

Permalink
95: Migrate java10 demos to java12 demos, java12 to java13
Browse files Browse the repository at this point in the history
Task-Url: #95
  • Loading branch information
keilw committed Sep 21, 2020
1 parent beaba95 commit e45a975
Show file tree
Hide file tree
Showing 35 changed files with 49 additions and 49 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package tech.uom.demo;
package tech.uom.demo.basic;

import static tech.units.indriya.unit.Units.*;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package tech.uom.demo;
package tech.uom.demo.basic;

import static javax.measure.MetricPrefix.KILO;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package tech.uom.demo;
package tech.uom.demo.basic;

import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package tech.uom.demo;
package tech.uom.demo.basic;

import static javax.measure.MetricPrefix.*;
import static tech.units.indriya.unit.Units.*;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package tech.uom.demo;
package tech.uom.demo.basic;

import static javax.measure.MetricPrefix.NANO;
import static tech.units.indriya.unit.Units.LITRE;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tech.uom.demo;
package tech.uom.demo.basic;

import static javax.measure.MetricPrefix.NANO;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tech.uom.demo.format;
package tech.uom.demo.basic.format;

import javax.measure.Unit;
import javax.measure.format.UnitFormat;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package tech.uom.demo.format;
package tech.uom.demo.basic.format;

import static tech.units.indriya.unit.Units.LITRE;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package tech.uom.demo.planet;
package tech.uom.demo.basic.planet;

import javax.measure.Quantity;
import javax.measure.quantity.Length;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package tech.uom.demo.planet;
package tech.uom.demo.basic.planet;

import static javax.measure.MetricPrefix.*;
import static tech.units.indriya.unit.Units.*;
import static tech.uom.demo.planet.SolarSystem.*;
import static tech.uom.demo.basic.planet.SolarSystem.*;

import javax.measure.Quantity;
import javax.measure.quantity.Acceleration;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package tech.uom.demo.planet;
package tech.uom.demo.basic.planet;

import static tech.units.indriya.unit.Units.*;
import static tech.uom.demo.planet.SolarSystem.*;
import static tech.uom.demo.basic.planet.SolarSystem.*;

import javax.measure.Quantity;
import javax.measure.quantity.Acceleration;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package tech.uom.demo.planet;
package tech.uom.demo.basic.planet;

import javax.measure.Unit;
import javax.measure.quantity.Length;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package tech.uom.demo.spi;
package tech.uom.demo.basic.spi;

import tech.uom.lib.common.util.SystemOfUnitsReporter;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package tech.uom.demo.spi;
package tech.uom.demo.basic.spi;

import javax.measure.Unit;
import javax.measure.spi.SystemOfUnits;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package space.uom.demo.planet;
package space.uom.demo.basic.planet;

import static org.junit.Assert.*;

Expand All @@ -22,9 +22,9 @@

import org.junit.Test;

import tech.uom.demo.planet.Celestial;
import tech.uom.demo.planet.DwarfPlanet;
import tech.uom.demo.planet.Planet;
import tech.uom.demo.basic.planet.Celestial;
import tech.uom.demo.basic.planet.DwarfPlanet;
import tech.uom.demo.basic.planet.Planet;

/**
* @author Werner Keil
Expand Down
2 changes: 1 addition & 1 deletion console/java12/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<!-- Build Settings -->
<!-- ======================================================= -->
<properties>
<jdkVersion>10</jdkVersion>
<jdkVersion>12</jdkVersion>
<project.build.javaVersion>${jdkVersion}</project.build.javaVersion>
<maven.compile.targetLevel>${jdkVersion}</maven.compile.targetLevel>
<maven.compile.sourceLevel>${jdkVersion}</maven.compile.sourceLevel>
Expand Down
10 changes: 5 additions & 5 deletions console/java12/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
requires tech.uom.lib.common;
requires jdk.jshell;

exports tech.uom.demo.java10;
exports tech.uom.demo.java10.format;
exports tech.uom.demo.java10.jshell;
exports tech.uom.demo.java10.spi;
exports tech.uom.demo.java10.planet;
exports tech.uom.demo.java12;
exports tech.uom.demo.java12.format;
exports tech.uom.demo.java12.jshell;
exports tech.uom.demo.java12.spi;
exports tech.uom.demo.java12.planet;
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package tech.uom.demo.java10;
package tech.uom.demo.java12;

import static tech.units.indriya.unit.Units.*;
import static javax.measure.MetricPrefix.*;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package tech.uom.demo.java10;
package tech.uom.demo.java12;

import static tech.units.indriya.unit.Units.SECOND;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package tech.uom.demo.java10;
package tech.uom.demo.java12;

import static javax.measure.MetricPrefix.KILO;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package tech.uom.demo.java10;
package tech.uom.demo.java12;

import tech.units.indriya.quantity.Quantities;
import tech.units.indriya.unit.Units;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package tech.uom.demo.java10;
package tech.uom.demo.java12;

import javax.measure.quantity.Force;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package tech.uom.demo.java10;
package tech.uom.demo.java12;

import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package tech.uom.demo.java10;
package tech.uom.demo.java12;

import static javax.measure.MetricPrefix.*;
import static tech.units.indriya.unit.Units.*;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package tech.uom.demo.java10;
package tech.uom.demo.java12;

import static javax.measure.MetricPrefix.NANO;
import static tech.units.indriya.unit.Units.LITRE;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package tech.uom.demo.java10;
package tech.uom.demo.java12;

import static javax.measure.MetricPrefix.NANO;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package tech.uom.demo.java10.format;
package tech.uom.demo.java12.format;


import javax.measure.BinaryPrefix;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package tech.uom.demo.java10.format;
package tech.uom.demo.java12.format;

import javax.measure.spi.ServiceProvider;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package tech.uom.demo.java10.jshell;
package tech.uom.demo.java12.jshell;

import jdk.jshell.JShell;
import jdk.jshell.SnippetEvent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package tech.uom.demo.java10.planet;
package tech.uom.demo.java12.planet;

import javax.measure.Quantity;
import javax.measure.quantity.Length;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package tech.uom.demo.java10.planet;
package tech.uom.demo.java12.planet;

import static javax.measure.MetricPrefix.*;
import static tech.units.indriya.unit.Units.*;
import static tech.uom.demo.java10.planet.SolarSystem.*;
import static tech.uom.demo.java12.planet.SolarSystem.*;

import javax.measure.Quantity;
import javax.measure.quantity.Acceleration;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package tech.uom.demo.java10.planet;
package tech.uom.demo.java12.planet;

import static tech.units.indriya.unit.Units.*;
import static tech.uom.demo.java10.planet.SolarSystem.*;
import static tech.uom.demo.java12.planet.SolarSystem.*;

import javax.measure.Quantity;
import javax.measure.quantity.Acceleration;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package tech.uom.demo.java10.planet;
package tech.uom.demo.java12.planet;

import javax.measure.Unit;
import javax.measure.quantity.Length;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package tech.uom.demo.java10.spi;
package tech.uom.demo.java12.spi;

import tech.uom.lib.common.util.SystemOfUnitsReporter;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package tech.uom.demo.java10.planet;
package tech.uom.demo.java12.planet;

import static org.junit.Assert.*;

Expand All @@ -22,9 +22,9 @@

import org.junit.Test;

import tech.uom.demo.java10.planet.Celestial;
import tech.uom.demo.java10.planet.DwarfPlanet;
import tech.uom.demo.java10.planet.Planet;
import tech.uom.demo.java12.planet.Celestial;
import tech.uom.demo.java12.planet.DwarfPlanet;
import tech.uom.demo.java12.planet.Planet;

/**
* @author Werner Keil
Expand Down

0 comments on commit e45a975

Please sign in to comment.