Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New itools packager #31

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

New itools packager #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8525f4a
Update dependency versions
May 7, 2020
4b8a99e
Change the way itools-packager tutorial is organized
May 7, 2020
0600456
Merge branch 'master' into new-itools-packager
Sep 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions itools-packager/complete/logback-itools.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2016, All partners of the iTesla project (http://www.itesla-project.eu/consortium)
This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at http://mozilla.org/MPL/2.0/.

-->
<!--Configuration of the command line process log-->
<configuration>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<Pattern>%d{yyyy-MM-dd_HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>
</encoder>
</appender>
<root level="INFO">
<appender-ref ref="STDOUT" />
</root>
</configuration>
34 changes: 23 additions & 11 deletions itools-packager/pom.xml → itools-packager/complete/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,17 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.powsybl.tutorials</groupId>
<artifactId>powsybl-tutorials</artifactId>
<version>1.3.0-SNAPSHOT</version>
</parent>

<groupId>com.powsybl.tutorials</groupId>
<artifactId>powsybl-itools-packager</artifactId>
<version>1.0.0</version>
<packaging>pom</packaging>

<properties>
<logback.version>1.1.8</logback.version>
<powsybl.core.version>3.3.0</powsybl.core.version>
<slf4j.version>1.7.22</slf4j.version>
</properties>

<build>
<plugins>
<plugin>
Expand All @@ -36,8 +38,13 @@
</execution>
</executions>
<configuration>
<packageName>powsybl</packageName>
<javaXmx>512M</javaXmx>
<packageName>itools-1.0.0</packageName>
<archiveName>itools</archiveName>
<copyToEtc>
<files>
<file>logback-itools.xml</file>
</files>
</copyToEtc>
</configuration>
</plugin>
</plugins>
Expand All @@ -50,16 +57,21 @@
<version>${logback.version}</version>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>${slf4j.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-computation-local</artifactId>
<artifactId>powsybl-config-classic</artifactId>
<version>${powsybl.core.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-config-classic</artifactId>
<artifactId>powsybl-computation-local</artifactId>
<version>${powsybl.core.version}</version>
<scope>runtime</scope>
</dependency>
Expand Down
21 changes: 21 additions & 0 deletions itools-packager/initial/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2020, RTE (http://www.rte-france.com)
This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at http://mozilla.org/MPL/2.0/.

-->
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>com.powsybl.tutorials</groupId>
<artifactId>powsybl-itools-packager</artifactId>
<version>1.0.0</version>
<packaging>pom</packaging>

</project>

2 changes: 2 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
<module>csv-exporter</module>
<module>csv-importer</module>
<module>itools-packager</module>
<module>loadflow</module>
<module>sensitivity</module>
<module>topology</module>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have removed the modules corresponding to new tutorials otherwise maven fails during the checks

</modules>

Expand Down