Skip to content
This repository has been archived by the owner on Nov 18, 2022. It is now read-only.

Commit

Permalink
Add version template (#24)
Browse files Browse the repository at this point in the history
* Add Version template file
* Fix pom: remove javadoc aggregate

Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
  • Loading branch information
flo-dup authored Dec 13, 2021
1 parent 166f4d1 commit 5a4d34d
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 28 deletions.
43 changes: 16 additions & 27 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,33 +56,18 @@
<maven.compiler.target>11</maven.compiler.target>
</properties>

<profiles>
<profile>
<id>release</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven.javadoc.version}</version>
<executions>
<execution>
<id>javadoc-aggregate-jar</id>
<phase>package</phase>
<inherited>false</inherited>
<goals>
<goal>aggregate-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>templating-maven-plugin</artifactId>
</plugin>
</plugins>
</build>

<dependencyManagement>
<dependencies>
Expand Down Expand Up @@ -110,6 +95,10 @@
<groupId>com.powsybl</groupId>
<artifactId>powsybl-commons</artifactId>
</dependency>
<dependency>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-tools</artifactId>
</dependency>

<!-- Test dependencies -->
<dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/**
* Copyright (c) 2021, 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/.
*/
package com.powsybl.nad.util;

import com.google.auto.service.AutoService;
import com.powsybl.tools.*;

/**
* @author Florian Dupuy <florian.dupuy at rte-france.com>
*/
@AutoService(Version.class)
public class PowsyblNetworkAreaDiagramVersion extends AbstractVersion {

public PowsyblNetworkAreaDiagramVersion() {
super("powsybl-network-area-diagram", "${project.version}", "${buildNumber}", "${scmBranch}", Long.parseLong("${timestamp}"));
}
}
2 changes: 1 addition & 1 deletion src/main/java/com/powsybl/nad/NetworkAreaDiagram.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

import com.powsybl.iidm.network.Network;
import com.powsybl.iidm.network.VoltageLevel;
import com.powsybl.nad.build.iidm.VoltageLevelFilter;
import com.powsybl.nad.build.iidm.IdProvider;
import com.powsybl.nad.build.iidm.IntIdProvider;
import com.powsybl.nad.build.iidm.NetworkGraphBuilder;
import com.powsybl.nad.build.iidm.VoltageLevelFilter;
import com.powsybl.nad.layout.BasicForceLayoutFactory;
import com.powsybl.nad.layout.LayoutFactory;
import com.powsybl.nad.layout.LayoutParameters;
Expand Down

0 comments on commit 5a4d34d

Please sign in to comment.